From 6ad74047bc2f22d04be41b2d1079121890e1395d Mon Sep 17 00:00:00 2001
From: Leni Aniva <v@leni.sh>
Date: Fri, 30 May 2025 01:22:48 -0700
Subject: [PATCH] Simplify seat geometry

---
 nhf/touhou/yasaka_kanako/onbashira.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nhf/touhou/yasaka_kanako/onbashira.py b/nhf/touhou/yasaka_kanako/onbashira.py
index 08d2177..9a31af1 100644
--- a/nhf/touhou/yasaka_kanako/onbashira.py
+++ b/nhf/touhou/yasaka_kanako/onbashira.py
@@ -318,7 +318,7 @@ class Onbashira(Model):
     # Distance between bind point and motor's mount points
     motor_driver_radius: float = 110.0
     motor_seat_depth: float = 95.0
-    motor_seat_radius: float = 45.0
+    motor_seat_radius: float = 50.0
     motor_coupler_flange_thickness: float = 10.0
     motor_coupler_flange_radius: float = 8.0
     motor_coupler_height: float = 120.0
@@ -1047,11 +1047,12 @@ class Onbashira(Model):
         ring for mounting lights
         """
         bx, by = self.angle_joint_bind_pos.to2d_pos()
-        gap = 10
+        gap = 7
         t1 = 10
         base_w = 17.0
         theta = math.pi / self.n_side
         theta2 = theta * 0.5
+        theta1 = theta * 1.3
         track_width = 7.0
         r0 = self.bulk_radius
         r1 = self.rotation_radius + gap
@@ -1062,8 +1063,8 @@ class Onbashira(Model):
             .circle(r2, mode="s")
             .polygon([
                 (0, 0),
-                (r0 * math.cos(theta), r0 * math.sin(theta)),
-                (r0 * math.cos(theta), -r0 * math.sin(theta)),
+                (r0 * math.cos(theta1), r0 * math.sin(theta1)),
+                (r0 * math.cos(theta1), -r0 * math.sin(theta1)),
             ], mode="i")
         )
         profile_base = (
@@ -1117,8 +1118,8 @@ class Onbashira(Model):
             .circle(r2_5, mode="s")
             .polygon([
                 (0, 0),
-                (r0 * math.cos(theta), r0 * math.sin(theta)),
-                (r0 * math.cos(theta), -r0 * math.sin(theta)),
+                (r0 * math.cos(theta1), r0 * math.sin(theta1)),
+                (r0 * math.cos(theta1), -r0 * math.sin(theta1)),
             ], mode="i")
             .push([
                 (mount_x, mount_y),
@@ -1150,7 +1151,7 @@ class Onbashira(Model):
             .circle(self.rotation_radius+track_width/2, mode="s")
             .polygon([
                 (0, 0),
-                (r0 * math.cos(theta), r0 * math.sin(theta)),
+                (r0 * math.cos(theta1), r0 * math.sin(theta1)),
                 (r0 * math.cos(theta2), r0 * math.sin(theta2)),
             ], mode="i")
             .wires()
@@ -1163,7 +1164,7 @@ class Onbashira(Model):
             .circle(r2, mode="s")
             .polygon([
                 (0, 0),
-                (r0 * math.cos(theta), r0 * math.sin(theta)),
+                (r0 * math.cos(theta1), r0 * math.sin(theta1)),
                 (r0 * math.cos(theta2), r0 * math.sin(theta2)),
             ], mode="i")
             .wires()
@@ -1175,7 +1176,7 @@ class Onbashira(Model):
             .circle(r2, mode="s")
             .polygon([
                 (0, 0),
-                (r0 * math.cos(theta), r0 * math.sin(theta)),
+                (r0 * math.cos(theta1), r0 * math.sin(theta1)),
                 (r0 * math.cos(theta2), r0 * math.sin(theta2)),
             ], mode="i")
             .wires()