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

Simplify construction of Sketch in test

Browse Source
This commit is contained in:
Hanno Braun 2024-06-05 21:04:18 +02:00
parent 7fd69cbac5
commit e4817f4c93
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/fj-core/src/validate/sketch.rs
View File

@ -114,12 +114,12 @@ mod tests {
use crate::{ use crate::{
assert_contains_err, assert_contains_err,
operations::{ operations::{
build::{BuildCycle, BuildHalfEdge, BuildRegion, BuildSketch}, build::{BuildCycle, BuildRegion, BuildSketch},
insert::Insert, insert::Insert,
reverse::Reverse, reverse::Reverse,
update::{UpdateRegion, UpdateSketch}, update::{UpdateRegion, UpdateSketch},
}, },
topology::{Cycle, HalfEdge, Region, Sketch}, topology::{Cycle, Region, Sketch},
validate::{SketchValidationError, Validate, ValidationError}, validate::{SketchValidationError, Validate, ValidationError},
Core, Core,
}; };
@ -156,12 +156,6 @@ mod tests {
let surface = core.layers.topology.surfaces.space_2d(); let surface = core.layers.topology.surfaces.space_2d();
let outer_circle =
HalfEdge::circle([0., 0.], 2., surface.clone(), &mut core);
let inner_circle =
HalfEdge::circle([0., 0.], 1., surface.clone(), &mut core);
let exterior = Cycle::new(vec![outer_circle.clone()]).insert(&mut core);
let region = Region::circle([0., 0.], 2., surface.clone(), &mut core) let region = Region::circle([0., 0.], 2., surface.clone(), &mut core)
.add_interiors( .add_interiors(
[Cycle::circle([0., 0.], 1., surface.clone(), &mut core) [Cycle::circle([0., 0.], 1., surface.clone(), &mut core)
@ -172,12 +166,16 @@ mod tests {
let valid = Sketch::new(surface.clone(), vec![region]); let valid = Sketch::new(surface.clone(), vec![region]);
valid.validate_and_return_first_error(&core.layers.geometry)?; valid.validate_and_return_first_error(&core.layers.geometry)?;
let invalid_interior = let invalid_sketch = valid.update_region(
Cycle::new(vec![inner_circle.clone()]).insert(&mut core); valid.regions().first(),
let invalid_sketch = Sketch::new( |region, core| {
surface, [region.update_interior(
vec![Region::new(exterior.clone(), vec![invalid_interior]) region.interiors().first(),
.insert(&mut core)], |cycle, core| [cycle.reverse(core)],
core,
)]
},
&mut core,
); );
assert_contains_err!( assert_contains_err!(
core, core,