Merge pull request #267 from xyz-tools/fix/toggle-single-layer

Fix toggle single layer

Author: remcoder

demo/js/app.js

@@ -216,6 +216,9 @@ export const app = (window.app = createApp({
       watchEffect(() => {
         preview.startLayer = +settings.value.startLayer;
         preview.endLayer = +settings.value.endLayer;
+      });
+
+      watchEffect(() => {
         preview.singleLayerMode = settings.value.singleLayerMode;
       });
     });

src/webgl-preview.ts

@@ -97,6 +97,7 @@ export class WebGLPreview {
   private minPlane = new Plane(new Vector3(0, 1, 0), 0.6);
   private maxPlane = new Plane(new Vector3(0, -1, 0), 0.1);
   private clippingPlanes: Plane[] = [];
+  private prevStartLayer = 0;
 
   // colors
   private _backgroundColor = new Color(0xe0e0e0);
@@ -263,7 +264,7 @@ export class WebGLPreview {
     if (this.countLayers > 1 && value > 0) {
       this._endLayer = value;
       if (this._singleLayerMode === true) {
-        this.startLayer = this._endLayer;
+        this.startLayer = this._endLayer - 1;
       }
       if (value <= this.countLayers) {
         const layer = this.job.layers[value - 1];
@@ -276,10 +277,16 @@ export class WebGLPreview {
     }
   }
 
+  get singleLayerMode(): boolean {
+    return this._singleLayerMode;
+  }
   set singleLayerMode(value: boolean) {
     this._singleLayerMode = value;
     if (value) {
-      this.startLayer = this.endLayer - 1;
+      this.prevStartLayer = this._startLayer;
+      this.startLayer = this._endLayer - 1;
+    } else {
+      this.startLayer = this.prevStartLayer;
     }
   }
 
@@ -468,18 +475,24 @@ export class WebGLPreview {
   }
 
   private renderPathsAsLines(paths: Path[], color: Color): void {
-    console.log(this.clippingPlanes);
     const material = new LineMaterial({
       color: Number(color.getHex()),
       linewidth: this.lineWidth,
       clippingPlanes: this.clippingPlanes
     });
 
     const lineVertices: number[] = [];
+
+    // lines need to be offset.
+    // The gcode specifies the nozzle height which is the top of the extrusion.
+    // The line doesn't have a constant height in world coords so it should be rendered at horizontal midplane of the extrusion layer.
+    // Otherwise the line will be clipped by the clipping plane.
+    const offset = -this.lineHeight / 2;
+
     paths.forEach((path) => {
       for (let i = 0; i < path.vertices.length - 3; i += 3) {
-        lineVertices.push(path.vertices[i], path.vertices[i + 1], path.vertices[i + 2]);
-        lineVertices.push(path.vertices[i + 3], path.vertices[i + 4], path.vertices[i + 5]);
+        lineVertices.push(path.vertices[i], path.vertices[i + 1] - 0.1, path.vertices[i + 2] + offset);
+        lineVertices.push(path.vertices[i + 3], path.vertices[i + 4] - 0.1, path.vertices[i + 5] + offset);
       }
     });