Merge pull request #40 from mattatz/develop

0.1.42
mattatz · Dec 20, 2024 · 9a02904 · 9a02904
2 parents 2c834ea + a40623b
commit 9a02904
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "curvo"
-version = "0.1.41"
+version = "0.1.42"
 authors = ["Masatatsu Nakamura <[email protected]"]
 edition = "2021"
 keywords = ["nurbs", "modeling", "graphics", "3d"]
@@ -28,7 +28,7 @@ bevy = { version = "0.15.0", optional = true }
 bevy_egui = { version = "0.31.1", optional = true }
 bevy-inspector-egui = { version = "0.28.0", optional = true }
 bevy_infinite_grid = { version = "0.14.0", optional = true }
-bevy_normal_material = { version = "0.7.0", optional = true }
+bevy_normal_material = { version = "0.7.1", optional = true }
 bevy_panorbit_camera = { version = "0.21.1", optional = true }
 bevy_points = { version = "0.7.0", optional = true }
 argmin = "0.10.0"

diff --git a/examples/closest_point_on_surface.rs b/examples/closest_point_on_surface.rs
@@ -96,7 +96,7 @@ fn setup(
             );
 
             let vertices = tess.points().iter().map(|pt| (*pt).into()).collect();
-            let normals = tess.normals().iter().map(|n| (-n).into()).collect();
+            let normals = tess.normals().iter().map(|n| (*n).into()).collect();
             let uvs = tess.uvs().iter().map(|uv| (*uv).into()).collect();
             let indices = tess
                 .faces()
@@ -137,9 +137,9 @@ fn setup(
             (0..N)
                 .map(|j| {
                     let x = i as f64 - hn;
-                    let z = (rng.gen::<f64>() - 0.5) * 2.;
-                    let y = j as f64 - hn;
-                    Point4::new(x, z, y, 1.)
+                    let y = (rng.gen::<f64>() - 0.5) * 2.;
+                    let z = (j as f64) - hn;
+                    Point4::new(x, y, z, 1.)
                 })
                 .collect_vec()
         })

diff --git a/examples/intersect_surface_curve.rs b/examples/intersect_surface_curve.rs
@@ -1,5 +1,3 @@
-use std::f32::consts::FRAC_PI_2;
-
 use bevy::{
     color::palettes::css::TOMATO,
     prelude::*,
@@ -76,7 +74,7 @@ fn setup(
                 .map(|j| {
                     let x = i as f64 - hn;
                     let y = (rng.gen::<f64>() - 0.5) * 2.;
-                    let z = j as f64 - hn;
+                    let z = (j as f64) - hn;
                     Point4::new(x, y, z, 1.)
                 })
                 .collect_vec()
@@ -86,6 +84,7 @@ fn setup(
 
     commands.spawn((
         Mesh3d(meshes.add(surface_2_mesh(&surface, None))),
+        // Mesh3d(meshes.add(surface_2_regular_mesh(&surface, 64, 64))),
         MeshMaterial3d(normal_materials.add(NormalMaterial {
             opacity: 0.35,
             cull_mode: None,
@@ -201,7 +200,6 @@ fn setup(
             z_axis_color: Color::BLACK,
             ..Default::default()
         },
-        transform: Transform::from_rotation(Quat::from_rotation_x(FRAC_PI_2)),
         ..Default::default()
     });
 }

diff --git a/src/surface/nurbs_surface.rs b/src/surface/nurbs_surface.rs
@@ -376,8 +376,8 @@ where
                 let ioff = iu * (divs_v + 1);
                 (0..divs_v).flat_map(move |iv| {
                     [
-                        [ioff + iv, ioff + iv + 1, ioff + iv + divs_v + 2],
-                        [ioff + iv, ioff + iv + divs_v + 2, ioff + iv + divs_v + 1],
+                        [ioff + iv, ioff + iv + divs_v + 2, ioff + iv + 1],
+                        [ioff + iv, ioff + iv + divs_v + 1, ioff + iv + divs_v + 2],
                     ]
                 })
             })

diff --git a/src/tessellation/surface_tessellation.rs b/src/tessellation/surface_tessellation.rs
@@ -84,26 +84,19 @@ where
 
             match uvs.len() {
                 4 => {
-                    self.faces.push([ids[0], ids[3], ids[1]]);
-                    self.faces.push([ids[3], ids[2], ids[1]]);
+                    self.faces.push([ids[0], ids[1], ids[3]]);
+                    self.faces.push([ids[3], ids[1], ids[2]]);
                 }
                 5 => {
                     let il = ids.len();
-                    self.faces.push([
-                        ids[split_id],
-                        ids[(split_id + 2) % il],
-                        ids[(split_id + 1) % il],
-                    ]);
-                    self.faces.push([
-                        ids[(split_id + 4) % il],
-                        ids[(split_id + 3) % il],
-                        ids[split_id],
-                    ]);
-                    self.faces.push([
-                        ids[split_id],
-                        ids[(split_id + 3) % il],
-                        ids[(split_id + 2) % il],
-                    ]);
+                    let a = ids[split_id];
+                    let b = ids[(split_id + 1) % il];
+                    let c = ids[(split_id + 2) % il];
+                    let d = ids[(split_id + 3) % il];
+                    let e = ids[(split_id + 4) % il];
+                    self.faces.push([a, b, c]);
+                    self.faces.push([a, d, e]);
+                    self.faces.push([a, c, d]);
                 }
                 n => {
                     let center = node.center(surface);
@@ -115,7 +108,7 @@ where
                     let mut j = n - 1;
                     let mut i = 0;
                     while i < n {
-                        self.faces.push([center_index, ids[i], ids[j]]);
+                        self.faces.push([center_index, ids[j], ids[i]]);
                         j = i;
                         i += 1;
                     }