curvier example, fix pytest expected path

Author: cuttlefisch

solid/examples/hobby_splines_example.py

@@ -17,10 +17,10 @@
 def assembly():
     knot_points = [
         Point3(0, 0, -1),
-        Point3(1, 3, -2),
-        Point3(2, 1, 1),
+        Point3(1, -2, -2),
+        Point3(2, 0, 1),
         Point3(3, -1, 2),
-        Point3(0, -4, 0),
+        Point3(3, 1, -2),
     ]
     knot_points = [kp * SCALE for kp in knot_points]
     path = splines.hobby_points(knot_points, OMEGA, close_loop=True)

solid/test/test_splines.py

@@ -124,6 +124,9 @@ def test_hobby_points(self):
             Point3(1.00, 1.00, 0.00),
             Point3(1.33, 1.12, 0.00),
             Point3(1.71, 1.19, 0.00),
+            Point3(2.00, 1.00, 0.00),
+            Point3(2.63, 0.60, 0.00),
+            Point3(2.35, -0.28, 0.00),
             Point3(2.00, -1.00, 0.00),
         ]
 
@@ -133,11 +136,19 @@ def test_hobby_points(self):
     def test_hobby_points_raw(self):
         expected = [
             Point3(0.00, 0.00, 0.00),
-            Point3(-0.10, 0.54, 0.00),
-            Point3(0.43, 0.91, 0.00),
+            Point3(0.07, 0.50, 0.00),
+            Point3(0.52, 0.82, 0.00),
+            Point3(1.00, 1.00, 0.00),
+            Point3(1.33, 1.12, 0.00),
+            Point3(1.71, 1.19, 0.00),
             Point3(2.00, 1.00, 0.00),
+            Point3(2.63, 0.60, 0.00),
+            Point3(2.35, -0.28, 0.00),
+            Point3(2.00, -1.00, 0.00),
         ]
-        actual = hobby_points(self.points_raw, self.hobby_omega, close_loop=False)
+        actual = hobby_points(
+            self.bezier_controls_raw, self.hobby_omega, close_loop=False
+        )
         self.assertPointsListsEqual(expected, actual)
 
     def test_hobby_points_3d(self):
@@ -154,6 +165,9 @@ def test_hobby_points_3d(self):
             Point3(-0.50, -0.50, 1.00),
             Point3(-0.12, -0.22, 1.10),
             Point3(0.11, 0.24, 1.13),
+            Point3(0.50, 0.50, 1.00),
+            Point3(1.01, 0.84, 0.83),
+            Point3(1.55, 0.88, 0.44),
             Point3(2.00, 1.00, 0.00),
         ]