rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-04 09:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
Hanno Braun 2024-11-06 18:27:13 +01:00
parent f1112f9d49
commit 7dcd55fd8f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
experiments/2024-10-30/src/geometry.rs
View File

@ -51,8 +51,8 @@ pub trait Operation {
}
pub struct OperationInSequence {
pub operation: Box<dyn Operation>,
pub previous: Option<Box<dyn Operation>>,
pub operation: Box<ClonedOperation>,
pub previous: Option<Box<ClonedOperation>>,
}
impl Operation for OperationInSequence {
@ -60,9 +60,9 @@ impl Operation for OperationInSequence {
let mut vertices = self
.previous
.as_ref()
.map(|op| op.vertices())
.map(|op| op.vertices.clone())
.unwrap_or_default();
vertices.extend(self.operation.vertices());
vertices.extend(self.operation.vertices.clone());
vertices
}
@ -71,10 +71,15 @@ impl Operation for OperationInSequence {
let mut triangles = self
.previous
.as_ref()
.map(|op| op.triangles())
.map(|op| op.triangles.clone())
.unwrap_or_default();
triangles.extend(self.operation.triangles());
triangles.extend(self.operation.triangles.clone());
triangles
}
}
pub struct ClonedOperation {
pub vertices: Vec<Vertex>,
pub triangles: Vec<Triangle>,
}