wip2

Author: remcoder

src/__tests__/bounding-box.ts

@@ -10,16 +10,16 @@ describe('BoundingBox', () => {
 
   it('should calculate the correct center coordinates', () => {
     const bbox = new BoundingBox();
-    bbox.update(0, 0, 0);
-    bbox.update(10, 10, 10);
+    bbox.update(new GCodeVector3(0, 0, 0));
+    bbox.update(new GCodeVector3(10, 10, 10));
 
     const center = bbox.center as GCodeVector3;
     expect(center).toBeInstanceOf(GCodeVector3);
     expect(center.x).toBe(5);
     expect(center.y).toBe(5);
     expect(center.z).toBe(5);
 
-    bbox.update(-5, -5, -5);
+    bbox.update(new GCodeVector3(-5, -5, -5));
     const newCenter = bbox.center as GCodeVector3;
     expect(newCenter.x).toBe(2.5);
     expect(newCenter.y).toBe(2.5);

src/__tests__/job.ts

@@ -3,6 +3,7 @@ import { Job } from '../job';
 import { PathType, Path } from '../path';
 import { State } from '../state';
 import { LayersIndexer } from '../indexers';
+import { GCodeVector3 } from '../types';
 
 test('it has an initial state', () => {
   const job = new Job();
@@ -367,7 +368,7 @@ describe('.finishPath', () => {
     const job = new Job();
     const path = new Path(PathType.Extrusion, 0.6, 0.2, 0);
 
-    path.addPoint(0, 0, 0);
+    path.addPoint(new GCodeVector3(0, 0, 0));
 
     job.inprogressPath = path;
     job.finishPath();
@@ -389,7 +390,7 @@ describe('.finishPath', () => {
     const job = new Job();
     const path = new Path(PathType.Extrusion, 0.6, 0.2, 0);
 
-    path.addPoint(0, 0, 0);
+    path.addPoint(new GCodeVector3(0, 0, 0));
 
     job.inprogressPath = path;
     job.finishPath();
@@ -431,7 +432,7 @@ describe('.resumeLastPath', () => {
 
 function append_path(job: Job, travelType, points: [number, number, number][], tool: number = 0): Path {
   const path = new Path(travelType, 0.6, 0.2, tool || job.state.tool);
-  points.forEach((point: [number, number, number]) => path.addPoint(...point));
+  points.forEach((point: [number, number, number]) => path.addPoint(new GCodeVector3(point[0], point[1], point[2])));
   job.addPath(path);
   return path;
 }

src/bounding-box.ts

@@ -9,9 +9,9 @@ export class BoundingBox {
    * @param y - The Y coordinate.
    * @param z - The Z coordinate.
    */
-  public update(x: number, y: number, z: number): void {
-    this.min.min(new GCodeVector3(x, y, z));
-    this.max.max(new GCodeVector3(x, y, z));
+  public update(point: GCodeVector3): void {
+    this.min.min(point);
+    this.max.max(point);
   }
 
   /**

src/interpreter.ts

@@ -1,6 +1,7 @@
 import { Path, PathType } from './path';
 import { GCodeCommand } from './gcode-parser';
 import { Job } from './job';
+import { GCodeVector3 } from './types';
 
 // eslint-disable-next-line no-unused-vars
 type Method = (...args: unknown[]) => unknown;
@@ -113,9 +114,9 @@ export class Interpreter {
     state.y = y ?? state.y;
     state.z = z ?? state.z;
 
-    currentPath.addPoint(state.x, state.y, state.z);
+    currentPath.addPoint(state.toGCodeVector3());
     if (pathType === PathType.Extrusion) {
-      job.boundingBox.update(state.x, state.y, state.z);
+      job.boundingBox.update(state.toGCodeVector3());
     }
   }
 
@@ -220,19 +221,19 @@ export class Interpreter {
       px = centerX + arcRadius * Math.cos(currentAngle);
       py = centerY + arcRadius * Math.sin(currentAngle);
       pz += zStep;
-      currentPath.addPoint(px, py, pz);
+      currentPath.addPoint(new GCodeVector3(px, py, pz));
       if (pathType === PathType.Extrusion) {
-        job.boundingBox.update(px, py, pz);
+        job.boundingBox.update(new GCodeVector3(px, py, pz));
       }
     }
 
     state.x = x || state.x;
     state.y = y || state.y;
     state.z = z || state.z;
 
-    currentPath.addPoint(state.x, state.y, state.z);
+    currentPath.addPoint(state.toGCodeVector3());
     if (pathType === PathType.Extrusion) {
-      job.boundingBox.update(state.x, state.y, state.z);
+      job.boundingBox.update(state.toGCodeVector3());
     }
   }
 
@@ -371,7 +372,7 @@ export class Interpreter {
   private breakPath(job: Job, newType: PathType): Path {
     job.finishPath();
     const currentPath = new Path(newType, 0.6, 0.2, job.state.tool);
-    currentPath.addPoint(job.state.x, job.state.y, job.state.z);
+    currentPath.addPoint(job.state.toGCodeVector3());
     job.inprogressPath = currentPath;
     return currentPath;
   }

src/path.ts

@@ -2,6 +2,7 @@
 import { BufferGeometry, Vector3 } from 'three';
 import { ExtrusionGeometry } from './extrusion-geometry';
 import { LineSegmentsGeometry } from 'three/examples/jsm/lines/LineSegmentsGeometry.js';
+import { GCodeVector3 } from './types';
 
 /**
  * Type of path movement
@@ -64,8 +65,8 @@ export class Path {
    * @param y - Y coordinate
    * @param z - Z coordinate
    */
-  addPoint(x: number, y: number, z: number): void {
-    this._vertices.push(x, y, z);
+  addPoint(point: GCodeVector3): void {
+    this._vertices.push(point.x, point.y, point.z);
   }
 
   /**
@@ -75,7 +76,7 @@ export class Path {
    * @param z - Z coordinate to check
    * @returns True if the point matches the last point in the path
    */
-  checkLineContinuity(x: number, y: number, z: number): boolean {
+  checkLineContinuity(point: GCodeVector3): boolean {
     if (this._vertices.length < 3) {
       return false;
     }
@@ -84,7 +85,7 @@ export class Path {
     const lastY = this._vertices[this._vertices.length - 2];
     const lastZ = this._vertices[this._vertices.length - 1];
 
-    return x === lastX && y === lastY && z === lastZ;
+    return point.x === lastX && point.y === lastY && point.z === lastZ;
   }
 
   /**

src/state.ts

@@ -1,3 +1,5 @@
+import { GCodeVector3 } from './types';
+
 /**
  * Represents the current state of the print job
  * @remarks
@@ -26,4 +28,8 @@ export class State {
     Object.assign(state, { x: 0, y: 0, z: 0, e: 0, tool: 0, units: 'mm' });
     return state;
   }
+
+  public toGCodeVector3(): GCodeVector3 {
+    return new GCodeVector3(this.x, this.y, this.z);
+  }
 }