moved neck bend to bottom assembly to avoid issues with cadquery

bguan · Nov 4, 2024 · ce5c4cc · ce5c4cc
1 parent bc8682f
commit ce5c4cc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/pylele2/pylele_bottom_assembly.py b/pylele2/pylele_bottom_assembly.py
@@ -26,6 +26,7 @@
 from pylele2.pylele_tuners import LeleTuners
 from pylele2.pylele_fretboard_assembly import pylele_fretboard_assembly_parser
 from pylele2.pylele_worm import pylele_worm_parser
+from pylele2.pylele_neck_bend import LeleNeckBend
 
 
 class LeleBottomAssembly(LeleBase):
@@ -54,6 +55,14 @@ def gen(self) -> Shape:
             body -= LeleNeckJoint(cli=self.cli, isCut=True)\
                 .mv(-self.api.getJoinCutTol(), 0, self.api.getJoinCutTol())
 
+        ## Neck Bend
+        if self.cli.body_type in [
+            LeleBodyType.FLAT,
+            LeleBodyType.HOLLOW,
+            LeleBodyType.TRAVEL
+        ]:
+            body += LeleNeckBend(cli=self.cli)
+
         ## Fretboard Spines
         if (self.cli.separate_fretboard or
             self.cli.separate_neck or

diff --git a/pylele2/pylele_neck_assembly.py b/pylele2/pylele_neck_assembly.py
@@ -24,7 +24,7 @@
 from pylele2.pylele_head import LeleHead
 from pylele2.pylele_neck_joint import LeleNeckJoint
 from pylele2.pylele_neck import LeleNeck
-from pylele2.pylele_neck_bend import LeleNeckBend
+# from pylele2.pylele_neck_bend import LeleNeckBend
 from pylele2.pylele_spines import LeleSpines
 
 class LeleNeckAssembly(LeleBase):
@@ -58,14 +58,16 @@ def gen(self) -> Shape:
         ## Spines
         if self.cli.num_spines > 0:
             neck -= LeleSpines(cli=self.cli, isCut=True).mv(0, 0, self.api.getJoinCutTol())
-
+
+        """
         ## Neck Bend
         if self.cli.body_type in [
             LeleBodyType.FLAT,
             LeleBodyType.HOLLOW,
             LeleBodyType.TRAVEL
         ]:
             neck += LeleNeckBend(cli=self.cli)
+        """
 
         ## Fretboard Spines
         if (self.cli.separate_fretboard or self.cli.separate_top or self.cli.separate_neck) and self.cli.num_spines > 0: