rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-03-12 08:02:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on Shape::faces in 2D diff operation

Browse Source
This commit is contained in:
Hanno Braun 2022-06-28 15:11:35 +02:00
parent 79ccdefbd8
commit c14212c89d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/fj-operations/src/difference_2d.rs
View File

@ -1,6 +1,7 @@
use fj_interop::debug::DebugInfo; use fj_interop::debug::DebugInfo;
use fj_kernel::{ use fj_kernel::{
algorithms::Tolerance, algorithms::Tolerance,
iter::ObjectIters,
objects::{Cycle, Edge, Face}, objects::{Cycle, Edge, Face},
shape::{LocalForm, Shape}, shape::{LocalForm, Shape},
validation::{validate, Validated, ValidationConfig, ValidationError}, validation::{validate, Validated, ValidationConfig, ValidationError},
@ -32,13 +33,12 @@ impl ToShape for fj::Difference2d {
[a, b].map(|shape| shape.to_shape(config, tolerance, debug_info)); [a, b].map(|shape| shape.to_shape(config, tolerance, debug_info));
let [a, b] = [a?, b?]; let [a, b] = [a?, b?];
if let Some(face) = a.faces().next() { if let Some(face) = a.face_iter().next() {
// If there's at least one face to subtract from, we can proceed. // If there's at least one face to subtract from, we can proceed.
let surface = face.get().brep().surface.clone(); let surface = face.brep().surface.clone();
for face in a.faces() { for face in a.face_iter() {
let face = face.get();
let face = face.brep(); let face = face.brep();
assert_eq!( assert_eq!(
@ -57,8 +57,7 @@ impl ToShape for fj::Difference2d {
} }
} }
for face in b.faces() { for face in b.face_iter() {
let face = face.get();
let face = face.brep(); let face = face.brep();
assert_eq!( assert_eq!(