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

Move derive_from to lower-level operation

Browse Source
This commit is contained in:
Hanno Braun 2024-03-23 00:16:47 +01:00
parent 69bc394a03
commit 2162af6238
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/fj-core/src/operations/split/edge.rs
View File

@ -3,7 +3,7 @@ use fj_math::Point;
use crate::{ use crate::{
objects::{HalfEdge, Shell}, objects::{HalfEdge, Shell},
operations::{ operations::{
derive::DeriveFrom, geometry::UpdateHalfEdgeGeometry, insert::Insert, geometry::UpdateHalfEdgeGeometry, insert::Insert,
replace::ReplaceHalfEdge, split::SplitHalfEdge, update::UpdateHalfEdge, replace::ReplaceHalfEdge, split::SplitHalfEdge, update::UpdateHalfEdge,
}, },
queries::SiblingOfHalfEdge, queries::SiblingOfHalfEdge,
@ -42,7 +42,7 @@ impl SplitEdge for Shell {
let [half_edge_a, half_edge_b] = half_edge let [half_edge_a, half_edge_b] = half_edge
.split_half_edge(point, core) .split_half_edge(point, core)
.map(|half_edge_part| half_edge_part.derive_from(half_edge, core)); .map(|half_edge_part| half_edge_part);
let siblings = { let siblings = {
let [sibling_a, sibling_b] = sibling.split_half_edge(point, core); let [sibling_a, sibling_b] = sibling.split_half_edge(point, core);
@ -53,7 +53,7 @@ impl SplitEdge for Shell {
) )
.insert(core); .insert(core);
[sibling_a, sibling_b].map(|half_edge| { [sibling_a, sibling_b].map(|half_edge| {
half_edge.derive_from(&sibling, core).set_path( half_edge.set_path(
core.layers.geometry.of_half_edge(&sibling).path, core.layers.geometry.of_half_edge(&sibling).path,
&mut core.layers.geometry, &mut core.layers.geometry,
) )

8
crates/fj-core/src/operations/split/half_edge.rs
View File

@ -3,7 +3,7 @@ use fj_math::Point;
use crate::{ use crate::{
geometry::HalfEdgeGeometry, geometry::HalfEdgeGeometry,
objects::{HalfEdge, Vertex}, objects::{HalfEdge, Vertex},
operations::insert::Insert, operations::{derive::DeriveFrom, insert::Insert},
storage::Handle, storage::Handle,
Core, Core,
}; };
@ -48,13 +48,15 @@ impl SplitHalfEdge for Handle<HalfEdge> {
self.curve().clone(), self.curve().clone(),
self.start_vertex().clone(), self.start_vertex().clone(),
) )
.insert(core); .insert(core)
.derive_from(self, core);
let b = HalfEdge::new( let b = HalfEdge::new(
[point, end], [point, end],
self.curve().clone(), self.curve().clone(),
Vertex::new().insert(core), Vertex::new().insert(core),
) )
.insert(core); .insert(core)
.derive_from(self, core);
core.layers.geometry.define_half_edge( core.layers.geometry.define_half_edge(
a.clone(), a.clone(),