Merge pull request #1131 from ramox81/codex/thicken-surface-grips

src/scene/convert/acis_kernel.rs

@@ -24,7 +24,8 @@ pub fn tessellate_sat(
     color: [f32; 4],
     facet_res: f64,
     chordal_deflection: Option<f64>,
-    isolines: usize,
+    isolines: [usize; 2],
+    planar_isolines: bool,
 ) -> Option<MeshLodSet> {
     let (bodies, loss) = lift(document);
     if bodies.is_empty() {
@@ -114,7 +115,8 @@ pub fn tessellate_sat(
             max_angle,
             source_fit * placement_scale,
         )
-        .with_isolines(isolines);
+        .with_uv_isolines(isolines[0], isolines[1])
+        .with_planar_isolines(planar_isolines);
         if let Some(deflection) = chordal_deflection {
             tolerance = tolerance.with_chordal_deflection(deflection);
         }

src/scene/convert/solid3d_tess.rs

@@ -10,7 +10,8 @@ fn tessellate_acis(
     color: [f32; 4],
     facet_res: f64,
     chordal_deflection: Option<f64>,
-    isolines: usize,
+    isolines: [usize; 2],
+    planar_isolines: bool,
 ) -> Option<MeshLodSet> {
     crate::scene::convert::acis_kernel::tessellate_sat(
         sat,
@@ -19,6 +20,7 @@ fn tessellate_acis(
         facet_res,
         chordal_deflection,
         isolines,
+        planar_isolines,
     )
 }
 
@@ -218,7 +220,8 @@ fn finish(
     color: [f32; 4],
     facet_res: f64,
     chordal_deflection: Option<f64>,
-    isolines: usize,
+    isolines: [usize; 2],
+    planar_isolines: bool,
     acis: &acadrust::entities::AcisData,
 ) -> Option<MeshLodSet> {
     let mut set = tessellate_acis(
@@ -228,6 +231,7 @@ fn finish(
         facet_res,
         chordal_deflection,
         isolines,
+        planar_isolines,
     )?;
     remap_acis_material_bindings(&mut set, acis);
     Some(set)
@@ -251,7 +255,8 @@ pub fn tessellate_region(
         color,
         facet_res,
         chordal_deflection,
-        isolines,
+        [isolines; 2],
+        false,
         &region.acis_data,
     )
 }
@@ -274,7 +279,8 @@ pub fn tessellate_body(
         color,
         facet_res,
         chordal_deflection,
-        isolines,
+        [isolines; 2],
+        false,
         &body.acis_data,
     )
 }
@@ -284,7 +290,8 @@ pub fn tessellate_surface(
     color: [f32; 4],
     facet_res: f64,
     chordal_deflection: Option<f64>,
-    isolines: usize,
+    isolines: [usize; 2],
+    planar_isolines: bool,
 ) -> Option<MeshLodSet> {
     let sat = parse_acis(
         || surface.parse_sat(),
@@ -298,6 +305,7 @@ pub fn tessellate_surface(
         facet_res,
         chordal_deflection,
         isolines,
+        planar_isolines,
         &surface.acis_data,
     )
 }
@@ -320,7 +328,8 @@ pub fn tessellate_solid3d(
         color,
         facet_res,
         chordal_deflection,
-        isolines,
+        [isolines; 2],
+        false,
         &solid.acis_data,
     )
 }