diff --git a/fj/src/syntax.rs b/fj/src/syntax.rs index bfc0b05c0..2a206821e 100644 --- a/fj/src/syntax.rs +++ b/fj/src/syntax.rs @@ -71,7 +71,7 @@ where } pub trait Union { - fn union(&self, other: &Other) -> crate::Group + fn group(&self, other: &Other) -> crate::Group where Other: Clone + Into; } @@ -80,7 +80,7 @@ impl Union for T where T: Clone + Into, { - fn union(&self, other: &Other) -> crate::Group + fn group(&self, other: &Other) -> crate::Group where Other: Clone + Into, { diff --git a/models/csg-union-disjoint/src/lib.rs b/models/csg-union-disjoint/src/lib.rs index bda316c43..44787073d 100644 --- a/models/csg-union-disjoint/src/lib.rs +++ b/models/csg-union-disjoint/src/lib.rs @@ -15,7 +15,7 @@ pub extern "C" fn model(_: &HashMap) -> fj::Shape { let cube_a = fj::Sketch::from_points(vertices).sweep(1.0); let cube_b = cube_a.clone().translate([1.5, 0., 0.5]); - let disjoint_union = cube_a.union(&cube_b); + let disjoint_union = cube_a.group(&cube_b); disjoint_union.into() }