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

fix: Wing s1 tangent to shoulder

This commit is contained in:
Leni Aniva 2024-07-18 11:08:34 -07:00
parent e73c6c0fed
commit 9795f7b714
Signed by: aniva
GPG Key ID: 4D9B1C8D10EA4C50
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nhf/touhou/houjuu_nue/__init__.py
View File

@ -131,7 +131,7 @@ class Parameters(Model):
.add(self.wing_l2.assembly(parts), name="wing_l2") .add(self.wing_l2.assembly(parts), name="wing_l2")
.add(self.wing_l3.assembly(parts), name="wing_l3") .add(self.wing_l3.assembly(parts), name="wing_l3")
) )
for tag, offset in [("r1", 10), ("r2", 8), ("r3", 6), ("l1", 6), ("l2", 7), ("l3", 8)]: for tag, offset in [("r1", 9), ("r2", 7), ("r3", 6), ("l1", 7), ("l2", 8), ("l3", 9)]:
self.harness.hs_hirth_joint.add_constraints( self.harness.hs_hirth_joint.add_constraints(
result, result,
f"harness/{tag}", f"harness/{tag}",

13
nhf/touhou/houjuu_nue/wing.py
View File

@ -711,10 +711,10 @@ class WingR(WingProfile):
Right side wings Right side wings
""" """
elbow_bot_loc: Cq.Location = Cq.Location.from2d(285.0, 5.0, 25.0) elbow_bot_loc: Cq.Location = Cq.Location.from2d(290.0, 30.0, 27.0)
elbow_height: float = 111.0 elbow_height: float = 111.0
wrist_bot_loc: Cq.Location = Cq.Location.from2d(403.0, 253.0, 40.0) wrist_bot_loc: Cq.Location = Cq.Location.from2d(403.0, 289.0, 45.0)
wrist_height: float = 60.0 wrist_height: float = 60.0
# Extends from the wrist to the tip of the arrow # Extends from the wrist to the tip of the arrow
@ -824,15 +824,16 @@ class WingR(WingProfile):
@dataclass(kw_only=True) @dataclass(kw_only=True)
class WingL(WingProfile): class WingL(WingProfile):
elbow_bot_loc: Cq.Location = Cq.Location.from2d(230.0, 110.0, -10.0) elbow_bot_loc: Cq.Location = Cq.Location.from2d(250.0, 110.0, 10.0)
elbow_height: float = 80.0 elbow_height: float = 80.0
wrist_angle: float = -45.0 wrist_angle: float = -45.0
wrist_bot_loc: Cq.Location = Cq.Location.from2d(480.0, 0.0, -45.0) wrist_bot_loc: Cq.Location = Cq.Location.from2d(480.0, 0.0, -45.0)
wrist_height: float = 43.0 wrist_height: float = 43.0
shoulder_bezier_ext: float = 80.0 shoulder_bezier_ext: float = 120.0
elbow_bezier_ext: float = 100.0 shoulder_bezier_drop: float = 15.0
elbow_bezier_ext: float = 80.0
wrist_bezier_ext: float = 30.0 wrist_bezier_ext: float = 30.0
arrow_length: float = 135.0 arrow_length: float = 135.0
@ -859,7 +860,7 @@ class WingL(WingProfile):
) )
.bezier([ .bezier([
(0, 0), (0, 0),
(self.shoulder_bezier_ext, 0), (self.shoulder_bezier_ext, -self.shoulder_bezier_drop),
(self.elbow_bot_loc * Cq.Location.from2d(-self.elbow_bezier_ext, 0)).to2d_pos(), (self.elbow_bot_loc * Cq.Location.from2d(-self.elbow_bezier_ext, 0)).to2d_pos(),
self.elbow_bot_loc.to2d_pos(), self.elbow_bot_loc.to2d_pos(),
]) ])