aniva
/
Cosplay
1
1
Fork 0
Code Issues 3 Pull Requests 3 Packages Projects Releases Wiki Activity

Remove conflict with base geometry

This commit is contained in:
Leni Aniva 2025-05-30 01:54:19 -07:00
parent 758b51c9db
commit 6777033383
Signed by: aniva
GPG Key ID: D5F96287843E8DFB
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nhf/touhou/yasaka_kanako/onbashira.py
View File

@ -1071,24 +1071,17 @@ class Onbashira(Model):
profile_base = ( profile_base = (
profile_arc profile_arc
.reset() .reset()
.polygon([
(bx - base_w/2, by),
(bx + base_w/2, by),
(bx + base_w/2, -by),
(bx - base_w/2, -by),
])
.reset()
.polygon([ .polygon([
(r1 * math.cos(theta1), r1 * math.sin(theta1)), (r1 * math.cos(theta1), r1 * math.sin(theta1)),
(r1 * math.cos(theta2), r1 * math.sin(theta2)), (r1 * math.cos(theta2), r1 * math.sin(theta2)),
(r0 * math.cos(theta2), r0 * math.sin(theta2)), (bx, by - base_w/2),
(r0 * math.cos(theta), r0 * math.sin(theta)), (bx, by + base_w/2),
]) ])
.polygon([ .polygon([
(r1 * math.cos(theta1), -r1 * math.sin(theta1)), (r1 * math.cos(theta1), -r1 * math.sin(theta1)),
(r1 * math.cos(theta2), -r1 * math.sin(theta2)), (r1 * math.cos(theta2), -r1 * math.sin(theta2)),
(r0 * math.cos(theta2), -r0 * math.sin(theta2)), (bx, -by + base_w/2),
(r0 * math.cos(theta), -r0 * math.sin(theta)), (bx, -by - base_w/2),
]) ])
.reset() .reset()
.push([ .push([
@ -1155,13 +1148,23 @@ class Onbashira(Model):
# Construct the connection between the front and back # Construct the connection between the front and back
x11 = r1 * math.cos(theta1)
y11 = r1 * math.sin(theta1)
x21 = r1 * math.cos(theta2)
y21 = r1 * math.sin(theta2)
x12 = bx + base_w/2 * math.sin(-math.pi * 0.3)
y12 = by + base_w/2 * math.cos(-math.pi * 0.3)
x22 = bx
y22 = by - base_w/2
a1 = .8
a2 = .95
profile_bridge_outer_base = ( profile_bridge_outer_base = (
Cq.Sketch() Cq.Sketch()
.polygon([ .polygon([
(bx - base_w/2, by - base_w/2), ((1 - a1) * x11 + a1 * x12, (1 - a1) * y11 + a1 * y12),
(bx + base_w/2, by - base_w/2), ((1 - a1) * x21 + a1 * x22, (1 - a1) * y21 + a1 * y22),
(bx + base_w/2, by - base_w*1.5), ((1 - a2) * x21 + a2 * x22, (1 - a2) * y21 + a2 * y22),
(bx - base_w/2, by - base_w*1.5), ((1 - a2) * x11 + a2 * x12, (1 - a2) * y11 + a2 * y12),
]) ])
.wires() .wires()
.val() .val()