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

Display Shape children by themselves

Browse Source 
Being able to go through the children of shape, seeing how each is added
one by one, was kinda neat, but not that useful in the end. Being able
to see each child in isolation instead, is about as useful and quite a
bit simpler.

And there is one way, in which the previous way started getting in the
way: When building up the shape child by child, sometimes the
construction of some children could not be observed, as other children
had already been constructed in front. This is the reason that I decided
to abandon the previous approach.
This commit is contained in:
Hanno Braun 2025-01-20 19:48:50 +01:00
parent e13d252b49
commit 012388fffc
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
experiments/2024-12-09/src/geometry/shape.rs
View File

@ -28,11 +28,13 @@ impl Operation for Shape {
}
fn tri_mesh(&self) -> TriMesh {
if let Some(op) = self.sequence.last() {
op.tri_mesh()
} else {
TriMesh::new()
let mut tri_mesh = TriMesh::new();
for op in &self.sequence {
tri_mesh = tri_mesh.merge(op.tri_mesh());
}
tri_mesh
}
fn children(&self) -> Vec<AnyOp> {
@ -46,7 +48,6 @@ impl Operation for Shape {
#[derive(Clone)]
struct OperationInSequence {
pub operation: AnyOp,
pub previous: Option<AnyOp>,
}
impl Operation for OperationInSequence {
@ -55,13 +56,7 @@ impl Operation for OperationInSequence {
}
fn tri_mesh(&self) -> TriMesh {
let mesh = if let Some(op) = &self.previous {
op.tri_mesh()
} else {
TriMesh::new()
};
mesh.merge(self.operation.tri_mesh())
self.operation.tri_mesh()
}
fn children(&self) -> Vec<AnyOp> {
@ -98,7 +93,6 @@ impl<'r, NewOps, T> ShapeExtender<'r, NewOps, T> {
self.sequence.push(OperationInSequence {
operation: op.to_any(),
previous: self.sequence.last().map(|op| AnyOp::new(op.clone())),
});
ShapeExtender {