diff --git a/nhf/touhou/houjuu_nue/__init__.py b/nhf/touhou/houjuu_nue/__init__.py index f0c996a..aa327fb 100644 --- a/nhf/touhou/houjuu_nue/__init__.py +++ b/nhf/touhou/houjuu_nue/__init__.py @@ -131,7 +131,7 @@ class Parameters(Model): .add(self.wing_l2.assembly(parts), name="wing_l2") .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( result, f"harness/{tag}", diff --git a/nhf/touhou/houjuu_nue/wing.py b/nhf/touhou/houjuu_nue/wing.py index e122c58..587fd51 100644 --- a/nhf/touhou/houjuu_nue/wing.py +++ b/nhf/touhou/houjuu_nue/wing.py @@ -711,10 +711,10 @@ class WingR(WingProfile): 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 - 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 # Extends from the wrist to the tip of the arrow @@ -824,15 +824,16 @@ class WingR(WingProfile): @dataclass(kw_only=True) 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 wrist_angle: float = -45.0 wrist_bot_loc: Cq.Location = Cq.Location.from2d(480.0, 0.0, -45.0) wrist_height: float = 43.0 - shoulder_bezier_ext: float = 80.0 - elbow_bezier_ext: float = 100.0 + shoulder_bezier_ext: float = 120.0 + shoulder_bezier_drop: float = 15.0 + elbow_bezier_ext: float = 80.0 wrist_bezier_ext: float = 30.0 arrow_length: float = 135.0 @@ -859,7 +860,7 @@ class WingL(WingProfile): ) .bezier([ (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.to2d_pos(), ])