Skip to content

Commit 6a93889

Browse files
committed
Merge branch 'update-to-spline-round' of github.com:LasseHolch/classy_blocks into development
2 parents dab2146 + 2d6b316 commit 6a93889

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/classy_blocks/construct/flat/sketches/spline_round.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,15 @@ def outer_spline(
184184

185185
def add_outer_spline_edges(self, center: Optional[NPPointType] = None) -> None:
186186
"""Add curved edge as spline to outside of sketch"""
187-
sides = [self.side_1, self.side_2, self.side_2, self.side_1]
188-
radi = [self.radius_1, self.radius_2, self.radius_2, self.radius_1]
187+
sides = [self.side_1, self.side_2]
188+
radi = [self.radius_1, self.radius_2]
189189
for i, face in enumerate(self.shell):
190190
p_0 = face.point_array[(i % 2) + 1] # Outer point on radius
191191
p_1 = face.point_array[((i + 1) % 2) + 1] # Outer point on diagonal
192192

193193
spline_curve_0_1 = self.outer_spline(
194-
p_0, p_1, radi[i % 4], sides[i % 4], radi[(i + 1) % 4], sides[(i + 1) % 4], center, reverse=i % 2 == 1
194+
p_0, p_1, radi[int((i + 1) / 2) % 2], sides[int((i + 1) / 2) % 2],
195+
radi[int((i + 3) / 2) % 2], sides[int((i + 3) / 2) % 2], center, reverse=i % 2 == 1
195196
)
196197
face.add_edge(1, Spline(spline_curve_0_1))
197198

0 commit comments

Comments
 (0)