rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-03-01 10:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite surface selection with merge

Browse Source
This commit is contained in:
Hanno Braun 2022-11-12 17:42:23 +01:00
parent 9c2b67c9bf
commit fe2fa1b8b7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/fj-kernel/src/builder/edge.rs
View File

@ -5,8 +5,9 @@ use crate::{
insert::Insert, insert::Insert,
objects::{Curve, Objects, Surface, Vertex, VerticesInNormalizedOrder}, objects::{Curve, Objects, Surface, Vertex, VerticesInNormalizedOrder},
partial::{ partial::{
MaybePartial, PartialCurve, PartialGlobalEdge, PartialGlobalVertex, MaybePartial, MergeWith, PartialCurve, PartialGlobalEdge,
PartialHalfEdge, PartialSurfaceVertex, PartialVertex, PartialGlobalVertex, PartialHalfEdge, PartialSurfaceVertex,
PartialVertex,
}, },
storage::Handle, storage::Handle,
validate::ValidationError, validate::ValidationError,
@ -135,8 +136,8 @@ impl HalfEdgeBuilder for PartialHalfEdge {
let surface = self let surface = self
.curve() .curve()
.surface() .surface()
.or_else(|| from_surface.surface()) .merge_with(from_surface.surface())
.or_else(|| to_surface.surface()) .merge_with(to_surface.surface())
.expect("Can't infer line segment without a surface"); .expect("Can't infer line segment without a surface");
let points = [&from_surface, &to_surface].map(|vertex| { let points = [&from_surface, &to_surface].map(|vertex| {
vertex vertex