From 7277eed1118c24836bd393b44a7048ad6f393b71 Mon Sep 17 00:00:00 2001
From: bakedpotatolord <jeffy9745@gmail.com>
Date: Sun, 21 Sep 2025 17:38:45 -0600
Subject: [PATCH] helical bugfixes

---
 src/kiri/mode/cam/op-helical.js | 34 +++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/kiri/mode/cam/op-helical.js b/src/kiri/mode/cam/op-helical.js
index 82fc7dbc..3c3aed6a 100644
--- a/src/kiri/mode/cam/op-helical.js
+++ b/src/kiri/mode/cam/op-helical.js
@@ -138,14 +138,17 @@ export class OpHelical extends CamOp {
               );
           // console.log({down,toBottom,ofFull,ofCircle,startAngle,finalAngle,finalEnd});
 
-          //circle down to final point
-          poly.addPoints(
-            arcToPath(startPoint.setZ(currentZ), finalEnd, numSegs , {
-              clockwise,
-              radius,
-              center,
-            })
-          );
+          //if not already very close to final point
+          if( ofCircle >= 0.001 ){
+            //circle down to final point
+            poly.addPoints(
+              arcToPath(startPoint.setZ(currentZ), finalEnd, numSegs , {
+                clockwise,
+                radius,
+                center,
+              })
+            );
+          }
 
           //if starting at the bottom, reverse poly
           if ( reverse ){
@@ -169,9 +172,9 @@ export class OpHelical extends CamOp {
                 let lineOut = radius - entryOffset;
                 let centerOffset = (entryOffset**2 + 2*entryOffset*lineOut) / (2*(entryOffset + lineOut));
                 //add entry points
-                entry.push(...
+                entry.push(
                   newPoint(0,-lineOut,0),
-                  arcToPath(
+                  ...arcToPath(
                     newPoint(0,-lineOut,0),
                     newPoint(radius,0,0),
                     128,
@@ -186,12 +189,15 @@ export class OpHelical extends CamOp {
               }
             }
             //for each point
+            //rotate by start angle
+            // add to hole center
+            let invert = ((clockwise && !reverse ) || (!clockwise && reverse) )  ? -1 : 1
+            let entryAngle = reverse ? finalAngle : startAngle
             entry = entry.map(p => {
-              //rotate by start angle
-              // add to hole center
               // TODO: there's totally a way to do this with a matrix
-              p.y *= clockwise ? 1 : -1
-              p.rotate(startAngle)
+              // logical XOR
+              p.y *= invert
+              p.rotate(entryAngle)
               return p.add(entryCenter)
             })
             //append to start of poly