Fix curvatures calculation

Christoffel symbols calculation depends on this.
nortikin · Sep 9, 2024 · f72695c · f72695c
1 parent 343d117
commit f72695c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/utils/surface/algorithms.py b/utils/surface/algorithms.py
@@ -1666,12 +1666,12 @@ def nurbs_surface_from_curve(curve, samples, degree_u, degree_v, num_cpts_u, num
     """
 
     if implementation is None:
-        implementation = curve.get_nurbs_implementation()
+        implementation = SvNurbsMaths.NATIVE
 
     t_min, t_max = curve.get_u_bounds()
-    ts = np.linspace(t_min, t_max, num=samples)
+    ts = np.linspace(t_min, t_max, num=samples, endpoint = not curve.is_closed())
     points = curve.evaluate_array(ts)
-    surface = nurbs_surface_from_points(points, degree_u, degere_v, num_cpts_u, num_cpts_v, implementation = implementation)
+    surface, uv_points = nurbs_surface_from_points(points, degree_u, degree_v, num_cpts_u, num_cpts_v, implementation = implementation)
     trim_curve = SvNurbsMaths.interpolate_curve(implementation, curve.get_degree(), uv_points)
     return surface, trim_curve
 
diff --git a/utils/surface/nurbs.py b/utils/surface/nurbs.py
@@ -752,15 +752,15 @@ def curvature_calculator(self, us, vs, order=True):
 
         normal = np.cross(fu, fv)
         norm = np.linalg.norm(normal, axis=1, keepdims=True)
-        normal = normal / norm
+        normal1 = normal / norm
 
         fuu = derivatives[:,2,0]
         fvv = derivatives[:,0,2]
         fuv = derivatives[:,1,1]
 
-        nuu = (fuu * normal).sum(axis=1)
-        nvv = (fvv * normal).sum(axis=1)
-        nuv = (fuv * normal).sum(axis=1)
+        nuu = (fuu * normal1).sum(axis=1)
+        nvv = (fvv * normal1).sum(axis=1)
+        nuv = (fuv * normal1).sum(axis=1)
 
         duu = np.linalg.norm(fu, axis=1) **2
         dvv = np.linalg.norm(fv, axis=1) **2