session-py 0.201.0__tar.gz → 0.202.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (142) hide show
  1. {session_py-0.201.0 → session_py-0.202.0}/PKG-INFO +1 -1
  2. {session_py-0.201.0 → session_py-0.202.0}/pyproject.toml +1 -1
  3. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbssurface.py +132 -101
  4. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbssurface_test.py +20 -7
  5. {session_py-0.201.0 → session_py-0.202.0}/.github/FUNDING.yml +0 -0
  6. {session_py-0.201.0 → session_py-0.202.0}/.github/workflows/publish.yml +0 -0
  7. {session_py-0.201.0 → session_py-0.202.0}/.github/workflows/test.yml +0 -0
  8. {session_py-0.201.0 → session_py-0.202.0}/.gitignore +0 -0
  9. {session_py-0.201.0 → session_py-0.202.0}/.gitmodules +0 -0
  10. {session_py-0.201.0 → session_py-0.202.0}/AGENTS.md +0 -0
  11. {session_py-0.201.0 → session_py-0.202.0}/CLAUDE.md +0 -0
  12. {session_py-0.201.0 → session_py-0.202.0}/README.md +0 -0
  13. {session_py-0.201.0 → session_py-0.202.0}/conftest.py +0 -0
  14. {session_py-0.201.0 → session_py-0.202.0}/examples/bvh_demo.py +0 -0
  15. {session_py-0.201.0 → session_py-0.202.0}/examples/loft_holes.py +0 -0
  16. {session_py-0.201.0 → session_py-0.202.0}/examples/nurbsurface.py +0 -0
  17. {session_py-0.201.0 → session_py-0.202.0}/serialization/.gitkeep +0 -0
  18. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/__init__.py +0 -0
  19. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/aabb.py +0 -0
  20. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/aabb_test.py +0 -0
  21. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/boolean_polyline.py +0 -0
  22. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/boolean_polyline_test.py +0 -0
  23. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/brep.py +0 -0
  24. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/brep_test.py +0 -0
  25. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/closest.py +0 -0
  26. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/closest_test.py +0 -0
  27. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/color.py +0 -0
  28. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/color_test.py +0 -0
  29. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/convex_hull.py +0 -0
  30. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/convex_hull_test.py +0 -0
  31. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/element.py +0 -0
  32. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/element_test.py +0 -0
  33. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/file_encoders.py +0 -0
  34. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/file_encoders_test.py +0 -0
  35. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/file_obj.py +0 -0
  36. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/file_obj_test.py +0 -0
  37. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/file_step.py +0 -0
  38. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/file_step_test.py +0 -0
  39. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/graph.py +0 -0
  40. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/graph_test.py +0 -0
  41. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/history.py +0 -0
  42. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/history_test.py +0 -0
  43. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/instance_ref.py +0 -0
  44. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/instance_ref_test.py +0 -0
  45. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/intersection.py +0 -0
  46. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/intersection_test.py +0 -0
  47. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/io_xyz.py +0 -0
  48. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/io_xyz_test.py +0 -0
  49. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/line.py +0 -0
  50. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/line_test.py +0 -0
  51. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/matrix.py +0 -0
  52. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/matrix_test.py +0 -0
  53. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/mesh.py +0 -0
  54. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/mesh_offset.py +0 -0
  55. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/mesh_offset_test.py +0 -0
  56. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/mesh_test.py +0 -0
  57. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/mini_test.py +0 -0
  58. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbscurve.py +0 -0
  59. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbscurve_test.py +0 -0
  60. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbsknot.py +0 -0
  61. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbsknot_test.py +0 -0
  62. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbssurface_trimmed.py +0 -0
  63. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/nurbssurface_trimmed_test.py +0 -0
  64. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/obb.py +0 -0
  65. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/obb_test.py +0 -0
  66. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/objects.py +0 -0
  67. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/objects_test.py +0 -0
  68. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/plane.py +0 -0
  69. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/plane_test.py +0 -0
  70. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/point.py +0 -0
  71. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/point_test.py +0 -0
  72. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/pointcloud.py +0 -0
  73. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/pointcloud_test.py +0 -0
  74. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/polyline.py +0 -0
  75. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/polyline_test.py +0 -0
  76. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/primitives.py +0 -0
  77. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/primitives_test.py +0 -0
  78. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/.gitattributes +0 -0
  79. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/__init__.py +0 -0
  80. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/boundingbox_pb2.py +0 -0
  81. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/brep_pb2.py +0 -0
  82. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/color_pb2.py +0 -0
  83. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/edge_pb2.py +0 -0
  84. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/element_pb2.py +0 -0
  85. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/file_encoders_pb2.py +0 -0
  86. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/graph_pb2.py +0 -0
  87. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/instance_ref_pb2.py +0 -0
  88. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/line_pb2.py +0 -0
  89. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/matrix_pb2.py +0 -0
  90. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/mesh_pb2.py +0 -0
  91. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/nurbscurve_pb2.py +0 -0
  92. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/nurbssurface_pb2.py +0 -0
  93. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/nurbssurface_trimmed_pb2.py +0 -0
  94. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/objects_pb2.py +0 -0
  95. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/plane_pb2.py +0 -0
  96. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/point_pb2.py +0 -0
  97. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/pointcloud_pb2.py +0 -0
  98. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/polyline_pb2.py +0 -0
  99. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/quaternion_pb2.py +0 -0
  100. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/session_pb2.py +0 -0
  101. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/sheet_pb2.py +0 -0
  102. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/tolerance_pb2.py +0 -0
  103. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/tree_pb2.py +0 -0
  104. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/treenode_pb2.py +0 -0
  105. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/vector_pb2.py +0 -0
  106. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/vertex_pb2.py +0 -0
  107. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/proto/xform_pb2.py +0 -0
  108. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/py.typed +0 -0
  109. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/quaternion.py +0 -0
  110. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/quaternion_test.py +0 -0
  111. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/reload.py +0 -0
  112. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/remesh_cdt.py +0 -0
  113. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/remesh_cdt_test.py +0 -0
  114. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/remesh_nurbssurface_adaptive.py +0 -0
  115. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/remesh_nurbssurface_adaptive_test.py +0 -0
  116. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/remesh_nurbssurface_grid.py +0 -0
  117. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/remesh_nurbssurface_grid_test.py +0 -0
  118. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/session.py +0 -0
  119. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/session_config.py +0 -0
  120. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/session_config_test.py +0 -0
  121. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/session_test.py +0 -0
  122. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/simple_split.py +0 -0
  123. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/simple_split_test.py +0 -0
  124. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_aabbtree.py +0 -0
  125. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_aabbtree_test.py +0 -0
  126. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_bvh.py +0 -0
  127. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_bvh_test.py +0 -0
  128. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_kdtree.py +0 -0
  129. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_kdtree_test.py +0 -0
  130. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_octree.py +0 -0
  131. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_octree_test.py +0 -0
  132. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_rtree.py +0 -0
  133. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/spatial_rtree_test.py +0 -0
  134. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/tolerance.py +0 -0
  135. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/tolerance_test.py +0 -0
  136. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/tree.py +0 -0
  137. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/tree_test.py +0 -0
  138. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/vector.py +0 -0
  139. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/vector_test.py +0 -0
  140. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/xform.py +0 -0
  141. {session_py-0.201.0 → session_py-0.202.0}/src/session_py/xform_test.py +0 -0
  142. {session_py-0.201.0 → session_py-0.202.0}/uv.lock +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: session_py
3
- Version: 0.201.0
3
+ Version: 0.202.0
4
4
  Summary: A minimal Python geometry library
5
5
  Project-URL: Homepage, https://github.com/petrasvestartas/session_py
6
6
  Project-URL: Repository, https://github.com/petrasvestartas/session_py
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "session_py"
7
- version = "0.201.0"
7
+ version = "0.202.0"
8
8
  description = "A minimal Python geometry library"
9
9
  authors = [{name = "Petras Vestartas", email = "petrasvestartas@gmail.com"}]
10
10
  license = {text = "MIT"}
@@ -48,6 +48,94 @@ def _binomial(n: int, k: int) -> float:
48
48
  return r
49
49
 
50
50
 
51
+ def _is_rational_weights(weights: list[list[float]]) -> bool:
52
+ """True when any weight differs from one."""
53
+
54
+ for row in weights:
55
+ for w in row:
56
+ if abs(w - 1.0) > Tolerance.ZERO_TOLERANCE:
57
+ return True
58
+
59
+ return False
60
+
61
+
62
+ def _basis_table(knot, degree: int, base: int, t: float) -> list[list[float]]:
63
+ """Triangular table of basis values and knot differences (Piegl & Tiller A2.3)."""
64
+
65
+ order = degree + 1
66
+ ndu = [[0.0] * order for _ in range(order)]
67
+ ndu[0][0] = 1.0
68
+ left = [0.0] * order
69
+ right = [0.0] * order
70
+
71
+ for j in range(1, degree + 1):
72
+ left[j] = t - knot[base - j]
73
+ right[j] = knot[base + j - 1] - t
74
+ saved = 0.0
75
+
76
+ for r in range(j):
77
+ ndu[j][r] = right[r + 1] + left[j - r]
78
+ temp = ndu[r][j - 1] / ndu[j][r]
79
+ ndu[r][j] = saved + right[r + 1] * temp
80
+ saved = left[j - r] * temp
81
+
82
+ ndu[j][j] = saved
83
+
84
+ return ndu
85
+
86
+
87
+ def _basis_table_derivatives(
88
+ ndu: list[list[float]], degree: int, deriv_order: int
89
+ ) -> list[list[float]]:
90
+ """Basis derivatives ders[k][j] from the triangular table (Piegl & Tiller A2.3)."""
91
+
92
+ order = degree + 1
93
+ ders = [[0.0] * order for _ in range(deriv_order + 1)]
94
+
95
+ for j in range(degree + 1):
96
+ ders[0][j] = ndu[j][degree]
97
+
98
+ a = [[0.0] * order for _ in range(2)]
99
+
100
+ for r in range(degree + 1):
101
+ s1 = 0
102
+ s2 = 1
103
+ a[0][0] = 1.0
104
+
105
+ for k in range(1, deriv_order + 1):
106
+ d = 0.0
107
+ rk = r - k
108
+ pk = degree - k
109
+
110
+ if r >= k:
111
+ a[s2][0] = a[s1][0] / ndu[pk + 1][rk]
112
+ d = a[s2][0] * ndu[rk][pk]
113
+
114
+ j1 = 1 if rk >= -1 else -rk
115
+ j2 = k - 1 if r - 1 <= pk else degree - r
116
+
117
+ for j in range(j1, j2 + 1):
118
+ a[s2][j] = (a[s1][j] - a[s1][j - 1]) / ndu[pk + 1][rk + j]
119
+ d += a[s2][j] * ndu[rk + j][pk]
120
+
121
+ if r <= pk:
122
+ a[s2][k] = -a[s1][k - 1] / ndu[pk + 1][r]
123
+ d += a[s2][k] * ndu[r][pk]
124
+
125
+ ders[k][r] = d
126
+ s1, s2 = s2, s1
127
+
128
+ factor = float(degree)
129
+
130
+ for k in range(1, deriv_order + 1):
131
+ for j in range(degree + 1):
132
+ ders[k][j] *= factor
133
+
134
+ factor *= degree - k
135
+
136
+ return ders
137
+
138
+
51
139
  def _surface_aabb(srf: NurbsSurface) -> tuple[list[float], list[float]]:
52
140
  """Bounding box of a 7 x 7 sample of the surface."""
53
141
 
@@ -251,13 +339,7 @@ class NurbsSurface:
251
339
  if len(knots_u) != len(mults_u) or len(knots_v) != len(mults_v):
252
340
  return NurbsSurface()
253
341
 
254
- rational = False
255
-
256
- for row in weights:
257
- for w in row:
258
- if abs(w - 1.0) > Tolerance.ZERO_TOLERANCE:
259
- rational = True
260
-
342
+ rational = _is_rational_weights(weights)
261
343
  full_u = _expand_nurbsknots(knots_u, mults_u)
262
344
  full_v = _expand_nurbsknots(knots_v, mults_v)
263
345
  kc_u = order_u + nu - 2
@@ -1163,7 +1245,7 @@ class NurbsSurface:
1163
1245
  return results
1164
1246
 
1165
1247
  def evaluate(self, u: float, v: float, num_derivs: int = 0) -> list[Vector]:
1166
- """Return the point and partials up to num_derivs (max 2) in (k, l) loop order: [S, Sv, Svv, Su, Suv, Suu]."""
1248
+ """Return the point and partials up to num_derivs (max 2) in (k, m) loop order: [S, Sv, Svv, Su, Suv, Suu]."""
1167
1249
 
1168
1250
  result = []
1169
1251
 
@@ -1179,12 +1261,12 @@ class NurbsSurface:
1179
1261
  skl = []
1180
1262
 
1181
1263
  for k in range(n + 1):
1182
- for l in range(n - k + 1):
1264
+ for m in range(n - k + 1):
1183
1265
  total = [0.0] * size
1184
1266
 
1185
1267
  for i in range(self.m_order[0]):
1186
1268
  for j in range(self.m_order[1]):
1187
- c = ders_u[k][i] * ders_v[l][j]
1269
+ c = ders_u[k][i] * ders_v[m][j]
1188
1270
  cv_ptr = self.cv(span_u + i, span_v + j)
1189
1271
 
1190
1272
  for d in range(size):
@@ -1577,7 +1659,7 @@ class NurbsSurface:
1577
1659
  if key not in data:
1578
1660
  return surface
1579
1661
 
1580
- surface.create_raw(
1662
+ created = surface.create_raw(
1581
1663
  int(data["dimension"]),
1582
1664
  bool(data.get("is_rational", False)),
1583
1665
  int(data["order_u"]),
@@ -1586,15 +1668,6 @@ class NurbsSurface:
1586
1668
  int(data["cv_count_v"]),
1587
1669
  )
1588
1670
 
1589
- if "nurbsknots_u" in data:
1590
- surface.m_nurbsknot[0] = np.array(data["nurbsknots_u"], dtype=np.float64)
1591
-
1592
- if "nurbsknots_v" in data:
1593
- surface.m_nurbsknot[1] = np.array(data["nurbsknots_v"], dtype=np.float64)
1594
-
1595
- if "control_points" in data:
1596
- surface.m_cv = np.array(data["control_points"], dtype=np.float64)
1597
-
1598
1671
  surface.guid = guid if guid is not None else data.get("guid", str(uuid.uuid4()))
1599
1672
  surface.name = name if name is not None else data.get("name", "my_nurbssurface")
1600
1673
  surface.width = data.get("width", 1.0)
@@ -1605,6 +1678,18 @@ class NurbsSurface:
1605
1678
  if data.get("mesh"):
1606
1679
  surface.m_mesh = Mesh.__jsonload__(data["mesh"])
1607
1680
 
1681
+ if not created:
1682
+ return surface
1683
+
1684
+ if "nurbsknots_u" in data:
1685
+ surface.m_nurbsknot[0] = np.array(data["nurbsknots_u"], dtype=np.float64)
1686
+
1687
+ if "nurbsknots_v" in data:
1688
+ surface.m_nurbsknot[1] = np.array(data["nurbsknots_v"], dtype=np.float64)
1689
+
1690
+ if "control_points" in data:
1691
+ surface.m_cv = np.array(data["control_points"], dtype=np.float64)
1692
+
1608
1693
  return surface
1609
1694
 
1610
1695
  def file_json_dumps(self) -> str:
@@ -1670,7 +1755,8 @@ class NurbsSurface:
1670
1755
  def from_proto(cls, proto: nurbssurface_pb2.NurbsSurface) -> NurbsSurface:
1671
1756
  """Construct from the protobuf message."""
1672
1757
 
1673
- surface = cls(
1758
+ surface = cls()
1759
+ created = surface.create_raw(
1674
1760
  proto.dimension,
1675
1761
  proto.is_rational,
1676
1762
  proto.order_u,
@@ -1683,6 +1769,16 @@ class NurbsSurface:
1683
1769
  surface.guid = proto.guid
1684
1770
 
1685
1771
  surface.name = proto.name
1772
+ surface.width = proto.width
1773
+ surface.pointcolors = _colors_from_proto(proto.pointcolors)
1774
+ surface.facecolors = _colors_from_proto(proto.facecolors)
1775
+ surface.linecolors = _colors_from_proto(proto.linecolors)
1776
+
1777
+ if proto.HasField("cached_mesh") and len(proto.cached_mesh.vertices) > 0:
1778
+ surface.m_mesh = Mesh.from_proto(proto.cached_mesh)
1779
+
1780
+ if not created:
1781
+ return surface
1686
1782
 
1687
1783
  for i in range(min(len(proto.nurbsknots_u), len(surface.m_nurbsknot[0]))):
1688
1784
  surface.m_nurbsknot[0][i] = proto.nurbsknots_u[i]
@@ -1703,14 +1799,6 @@ class NurbsSurface:
1703
1799
  if src + d < len(proto.cvs):
1704
1800
  dst[d] = proto.cvs[src + d]
1705
1801
 
1706
- surface.width = proto.width
1707
- surface.pointcolors = _colors_from_proto(proto.pointcolors)
1708
- surface.facecolors = _colors_from_proto(proto.facecolors)
1709
- surface.linecolors = _colors_from_proto(proto.linecolors)
1710
-
1711
- if proto.HasField("cached_mesh") and len(proto.cached_mesh.vertices) > 0:
1712
- surface.m_mesh = Mesh.from_proto(proto.cached_mesh)
1713
-
1714
1802
  return surface
1715
1803
 
1716
1804
  def pb_dumps(self) -> bytes:
@@ -1852,76 +1940,16 @@ class NurbsSurface:
1852
1940
  degree = order - 1
1853
1941
  knot = self.m_nurbsknot[dir]
1854
1942
  base = span + degree
1855
- ders = [[0.0] * order for _ in range(deriv_order + 1)]
1856
1943
 
1857
1944
  if knot[base - 1] == knot[base]:
1858
- return ders
1859
-
1860
- ndu = [[0.0] * order for _ in range(order)]
1861
- ndu[0][0] = 1.0
1862
- left = [0.0] * order
1863
- right = [0.0] * order
1945
+ return [[0.0] * order for _ in range(deriv_order + 1)]
1864
1946
 
1865
- for j in range(1, degree + 1):
1866
- left[j] = t - knot[base - j]
1867
- right[j] = knot[base + j - 1] - t
1868
- saved = 0.0
1869
-
1870
- for r in range(j):
1871
- ndu[j][r] = right[r + 1] + left[j - r]
1872
- temp = ndu[r][j - 1] / ndu[j][r]
1873
- ndu[r][j] = saved + right[r + 1] * temp
1874
- saved = left[j - r] * temp
1875
-
1876
- ndu[j][j] = saved
1877
-
1878
- for j in range(degree + 1):
1879
- ders[0][j] = ndu[j][degree]
1880
-
1881
- a = [[0.0] * order for _ in range(2)]
1882
-
1883
- for r in range(degree + 1):
1884
- s1 = 0
1885
- s2 = 1
1886
- a[0][0] = 1.0
1887
-
1888
- for k in range(1, deriv_order + 1):
1889
- d = 0.0
1890
- rk = r - k
1891
- pk = degree - k
1892
-
1893
- if r >= k:
1894
- a[s2][0] = a[s1][0] / ndu[pk + 1][rk]
1895
- d = a[s2][0] * ndu[rk][pk]
1896
-
1897
- j1 = 1 if rk >= -1 else -rk
1898
- j2 = k - 1 if r - 1 <= pk else degree - r
1899
-
1900
- for j in range(j1, j2 + 1):
1901
- a[s2][j] = (a[s1][j] - a[s1][j - 1]) / ndu[pk + 1][rk + j]
1902
- d += a[s2][j] * ndu[rk + j][pk]
1903
-
1904
- if r <= pk:
1905
- a[s2][k] = -a[s1][k - 1] / ndu[pk + 1][r]
1906
- d += a[s2][k] * ndu[r][pk]
1907
-
1908
- ders[k][r] = d
1909
- s1, s2 = s2, s1
1910
-
1911
- factor = float(degree)
1912
-
1913
- for k in range(1, deriv_order + 1):
1914
- for j in range(degree + 1):
1915
- ders[k][j] *= factor
1916
-
1917
- factor *= degree - k
1918
-
1919
- return ders
1947
+ return _basis_table_derivatives(_basis_table(knot, degree, base, t), degree, deriv_order)
1920
1948
 
1921
1949
  def _rational_derivatives(
1922
1950
  self, skl: list[list[float]], num_derivs: int
1923
1951
  ) -> list[Vector]:
1924
- """Apply the rational quotient rule to homogeneous partials in (k, l) loop order (Piegl & Tiller A4.4)."""
1952
+ """Apply the rational quotient rule to homogeneous partials in (k, m) loop order (Piegl & Tiller A4.4)."""
1925
1953
 
1926
1954
  result = []
1927
1955
  n = num_derivs
@@ -1931,8 +1959,8 @@ class NurbsSurface:
1931
1959
  return [Vector(0, 0, 0) for _ in range(len(skl))]
1932
1960
 
1933
1961
  for k in range(n + 1):
1934
- for l in range(n - k + 1):
1935
- s = skl[k * (n + 1) - k * (k - 1) // 2 + l]
1962
+ for m in range(n - k + 1):
1963
+ s = skl[k * (n + 1) - k * (k - 1) // 2 + m]
1936
1964
  a = Vector(
1937
1965
  s[0],
1938
1966
  s[1] if self.m_dim > 1 else 0.0,
@@ -1940,18 +1968,18 @@ class NurbsSurface:
1940
1968
  )
1941
1969
 
1942
1970
  for i in range(k + 1):
1943
- for j in range(l + 1):
1971
+ for j in range(m + 1):
1944
1972
  if i == 0 and j == 0:
1945
1973
  continue
1946
1974
 
1947
1975
  c = (
1948
1976
  _binomial(k, i)
1949
- * _binomial(l, j)
1977
+ * _binomial(m, j)
1950
1978
  * skl[i * (n + 1) - i * (i - 1) // 2 + j][self.m_dim]
1951
1979
  )
1952
1980
  a -= (
1953
1981
  result[
1954
- (k - i) * (n + 1) - (k - i) * (k - i - 1) // 2 + (l - j)
1982
+ (k - i) * (n + 1) - (k - i) * (k - i - 1) // 2 + (m - j)
1955
1983
  ]
1956
1984
  * c
1957
1985
  )
@@ -2090,8 +2118,7 @@ class NurbsSurface:
2090
2118
  return False
2091
2119
 
2092
2120
  srf = NurbsSurface()
2093
-
2094
- if dir == 0:
2121
+ created = (
2095
2122
  srf.create_raw(
2096
2123
  self.m_dim,
2097
2124
  self.m_is_rat != 0,
@@ -2100,8 +2127,8 @@ class NurbsSurface:
2100
2127
  crv.m_cv_count,
2101
2128
  self.m_cv_count[1],
2102
2129
  )
2103
- else:
2104
- srf.create_raw(
2130
+ if dir == 0
2131
+ else srf.create_raw(
2105
2132
  self.m_dim,
2106
2133
  self.m_is_rat != 0,
2107
2134
  self.m_order[0],
@@ -2109,6 +2136,10 @@ class NurbsSurface:
2109
2136
  self.m_cv_count[0],
2110
2137
  crv.m_cv_count,
2111
2138
  )
2139
+ )
2140
+
2141
+ if not created:
2142
+ return False
2112
2143
 
2113
2144
  srf.m_nurbsknot[dir] = crv.m_nurbsknot.copy()
2114
2145
  srf.m_nurbsknot[other] = self.m_nurbsknot[other].copy()
@@ -30,8 +30,6 @@ def test_nurbssurface_constructor():
30
30
 
31
31
  s = NurbsSurface.create(False, False, 3, 3, 4, 4, points)
32
32
 
33
- m = s.mesh()
34
-
35
33
  p, v, uv = s.divide_by_count_points(4, 6)
36
34
 
37
35
  sstr = str(s)
@@ -40,7 +38,7 @@ def test_nurbssurface_constructor():
40
38
  scopy = s.duplicate()
41
39
  sother = NurbsSurface.create(False, False, 3, 3, 4, 4, points)
42
40
 
43
- MINI_CHECK(s.is_valid() == True)
41
+ MINI_CHECK(s.is_valid())
44
42
  MINI_CHECK(s.cv_count(0) == 4)
45
43
  MINI_CHECK(s.cv_count(1) == 4)
46
44
  MINI_CHECK(s.cv_count() == 16)
@@ -115,12 +113,15 @@ def test_nurbssurface_create_from_parameters():
115
113
  s = NurbsSurface.create_from_parameters(
116
114
  grid, w, [0, 1], [0, 1], [4, 4], [4, 4], 3, 3
117
115
  )
116
+
118
117
  MINI_CHECK(s.is_valid())
119
118
  MINI_CHECK(s.degree(0) == 3 and s.degree(1) == 3)
120
119
  MINI_CHECK(s.cv_count(0) == 4 and s.cv_count(1) == 4)
121
120
  MINI_CHECK(not s.is_rational())
121
+
122
122
  u0, u1 = s.domain(0)
123
123
  v0, v1 = s.domain(1)
124
+
124
125
  MINI_CHECK(abs(u0) < 1e-12 and abs(u1 - 1.0) < 1e-12)
125
126
  MINI_CHECK(abs(v0) < 1e-12 and abs(v1 - 1.0) < 1e-12)
126
127
  MINI_CHECK(TOLERANCE.is_point_close(s.point_at(0.0, 0.0), Point(0, 0, 0)))
@@ -129,14 +130,18 @@ def test_nurbssurface_create_from_parameters():
129
130
  MINI_CHECK(TOLERANCE.is_point_close(s.point_at(0.37, 0.41), Point(1.11, 1.23, 1.01496402)))
130
131
 
131
132
  fr = s.frame_at(0.3, 0.4)
133
+
132
134
  MINI_CHECK(TOLERANCE.is_point_close(fr.origin, s.point_at(0.3, 0.4)))
135
+
133
136
  n = s.normal_at(0.3, 0.4)
134
137
  za = fr.z_axis
138
+
135
139
  MINI_CHECK(abs(za[0] - n[0]) < 1e-9 and abs(za[1] - n[1]) < 1e-9 and abs(za[2] - n[2]) < 1e-9)
136
140
 
137
141
  from session_py import Line
138
142
 
139
143
  hits = s.intersections_with_line(Line(1.5, 1.5, -5, 1.5, 1.5, 5))
144
+
140
145
  MINI_CHECK(len(hits) == 1)
141
146
  MINI_CHECK(TOLERANCE.is_point_close(hits[0], Point(1.5, 1.5, 1.125)))
142
147
 
@@ -155,7 +160,7 @@ def test_booleans_queries():
155
160
 
156
161
  is_rational = s.is_rational()
157
162
 
158
- is_closed = s.is_closed(0) == True and s.is_closed(1) == False
163
+ is_closed = s.is_closed(0) and not s.is_closed(1)
159
164
 
160
165
  is_periodic = s.is_periodic(0) and s.is_periodic(1)
161
166
 
@@ -263,16 +268,19 @@ def test_control_vertices_access():
263
268
  cv_arr = s.cv(0, 0)
264
269
 
265
270
  MINI_CHECK(cv_arr[2] == 0)
271
+
266
272
  cv_arr[2] = 10.0
267
273
  MINI_CHECK(cv_arr[2] == 10)
268
274
 
269
275
  cv = s.get_cv(0, 0)
270
276
  MINI_CHECK(cv == Point(0, 0, 10))
277
+
271
278
  ok, x, y, z, w = s.get_cv_4d(0, 0)
272
279
  MINI_CHECK(x == 0 and y == 0 and z == 10 and w == 1)
273
280
 
274
281
  s.set_cv(0, 0, Point(0, 0, 5))
275
282
  MINI_CHECK(s.get_cv(0, 0) == Point(0, 0, 5))
283
+
276
284
  s.set_cv_4d(0, 0, 0, 0, 4, 0.5)
277
285
  MINI_CHECK(s.get_cv(0, 0) == Point(0, 0, 8))
278
286
  MINI_CHECK(s.cv(0, 0)[2] == 4)
@@ -324,6 +332,7 @@ def test_nurbsknot_access():
324
332
  is_set = s.set_nurbsknot(0, 2, 0.5)
325
333
  MINI_CHECK(is_set)
326
334
  MINI_CHECK(s.nurbsknot(0, 2) == 0.5)
335
+
327
336
  is_set = s.set_nurbsknot(0, 2, 0.0)
328
337
  MINI_CHECK(is_set)
329
338
 
@@ -624,6 +633,7 @@ def test_modification():
624
633
  s_rat.make_rational()
625
634
  s_rat.set_weight(2, 2, 3.0)
626
635
  MINI_CHECK(s.point_at(0.5, 0.5) != s_rat.point_at(0.5, 0.5))
636
+
627
637
  s_rat.make_non_rational()
628
638
  MINI_CHECK(s.point_at(0.5, 0.5) == s_rat.point_at(0.5, 0.5))
629
639
 
@@ -891,8 +901,9 @@ def test_nurbssurface_split_by_plane():
891
901
  MINI_CHECK(len(parts) == 2)
892
902
 
893
903
  for ts in parts:
894
- MINI_CHECK(ts.is_trimmed())
895
904
  m = ts.mesh_q(20.0, 0.005)
905
+
906
+ MINI_CHECK(ts.is_trimmed())
896
907
  MINI_CHECK(m.number_of_faces() > 0)
897
908
 
898
909
  sphere = Primitives.sphere_surface(0.0, 0.0, 0.0, 1.0)
@@ -980,8 +991,9 @@ def test_nurbssurface_split_by_surface():
980
991
  MINI_CHECK(len(parts) == 2)
981
992
 
982
993
  for ts in parts:
983
- MINI_CHECK(ts.is_trimmed())
984
994
  m = ts.mesh_q(20.0, 0.005)
995
+
996
+ MINI_CHECK(ts.is_trimmed())
985
997
  MINI_CHECK(m.number_of_faces() > 0)
986
998
 
987
999
 
@@ -1012,8 +1024,9 @@ def test_nurbssurface_split_by_brep():
1012
1024
  MINI_CHECK(len(parts) == 2)
1013
1025
 
1014
1026
  for ts in parts:
1015
- MINI_CHECK(ts.is_trimmed())
1016
1027
  m = ts.mesh_q(20.0, 0.005)
1028
+
1029
+ MINI_CHECK(ts.is_trimmed())
1017
1030
  MINI_CHECK(m.number_of_faces() > 0)
1018
1031
 
1019
1032
 
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes