@duet3d/gcodeviewer 3.7.0-alpha.1 → 3.7.0-alpha.2

package/dist/lineshader.d.ts

@@ -7,7 +7,7 @@ export default class LineShaderMaterial {
     toolBuffer: UniformBuffer;
     renderMode: number;
     isLineMesh: boolean;
-    static readonly vertexShader = "\n   #define THIN_INSTANCES\n   precision highp float;\n   \n\n   attribute vec3 position;\n   attribute vec3 normal;\n\n   attribute float filePosition;\n   attribute vec3 pickColor;\n   attribute float tool;\n   attribute float feedRate;\n   attribute float filePositionEnd;\n   attribute float isPerimeter;\n   attribute vec3 baseColor;\n\n   uniform mat4 viewProjection;\n   uniform mat4 worldView;\n   uniform mat4 view;\n\n   uniform float animationLength;\n   uniform float currentPosition;\n   uniform vec4 toolColors[20];\n   uniform vec3 focusedPickColor;\n   uniform float maxFeedRate;\n   uniform float minFeedRate;\n   uniform bool progressMode;\n   uniform vec4 progressColor;\n   uniform bool showSupports;\n   uniform bool showTravels;\n   uniform float utime;\n   uniform int renderMode;\n\n   uniform bool alphaMode;\n   uniform bool lineMesh;\n\n   varying vec3 eye_normal;\n   flat out vec3 vDiffColor;\n   flat out float fIsPerimeter;\n   flat out float bDiscard;\n   flat out float fShow;\n   flat out float focused;\n\n #include<instancesDeclaration>\n\n   void main()\n   {\n      #include<instancesVertex>\n  \n      fIsPerimeter = isPerimeter;\n\n      switch(renderMode){\n            case 0: \n               vDiffColor = baseColor.rgb; \n            break; // use default diffuse color;\n            case 1:\n               if(tool < 255.0)\n               {\n                  vDiffColor = toolColors[int(tool)].rgb;\n               }\n               else\n               {\n                  vDiffColor = vec3(1,0,0); //Travel Color Make Configurable at some point\n               }\n            break;\n            case 2:\n               float m = (feedRate - minFeedRate) / (maxFeedRate - minFeedRate);\n               vDiffColor = mix(vec3(0,0,1), vec3(1,0,0), m); \n               break;\n            case 5:\n               vDiffColor = pickColor.rgb;\n               break;\n         }\n\n         fShow = currentPosition - filePosition;\n         focused = 0.;\n\n         if(focusedPickColor == pickColor && !(currentPosition >= filePosition && currentPosition <= filePositionEnd)) \n         {\n            vDiffColor = vec3(1, 1, 1) - vDiffColor.rgb;\n            focused = 1.;\n         }\n         else if (tool >= 254.0)  //Travel\n         {\n            if(fShow >= 0.0 && fShow < animationLength / 8.0)\n            {\n                  vDiffColor = mix(vec3(1.0, 0.0, 0.0), vec3(0.5,0.0,0.0), fShow / animationLength / 2.0);\n            }\n            else if (showTravels && fShow >= 0.0)\n            {\n               vDiffColor = vec3(0.3, 0.5, 0.8); // persistent travel lines\n            }\n            else\n            {\n               bDiscard = 1.;\n            }\n         }\n         else //Extrusion\n         {\n            if (fShow >= 0.0  && fShow < animationLength) \n            { \n               if(currentPosition < filePositionEnd){\n                  // float animation = smoothstep(0.0, 1.0, fract(utime / 50.0));\n                  float animation = sin(2.0 * 3.1415 * utime / 1000.0) * 0.5 + 0.5;\n                  vDiffColor = mix(vec3(0, 0, 1), vec3(0,1,0), animation);\n               }\n               else \n               {\n                  vDiffColor = mix(vec3(1, 1, 1) - vDiffColor.rgb, vDiffColor.rgb, fShow / animationLength);\n               }\n            }\n            else if (fShow >= 0.0 && progressMode) \n            {\n               vDiffColor = progressColor.rgb;\n            }\n            else if(fShow < 0.0 && !alphaMode && !progressMode)\n            {\n               bDiscard = 1.;\n            }\n         }\n\n         //Final Results\n         gl_Position = viewProjection * finalWorld *  vec4(position, 1.0);\n         mat4 n =transpose(inverse(worldView * finalWorld));\n         eye_normal = (n * (vec4(normal , 1.0) * vec4(position,1.)) ).xyz;\n   }";
+    static readonly vertexShader = "\n   #define THIN_INSTANCES\n   precision highp float;\n   \n\n   attribute vec3 position;\n   attribute vec3 normal;\n\n   attribute float filePosition;\n   attribute vec3 pickColor;\n   attribute float tool;\n   attribute float feedRate;\n   attribute float filePositionEnd;\n   attribute float isPerimeter;\n   attribute vec3 baseColor;\n\n   uniform mat4 viewProjection;\n   uniform mat4 worldView;\n   uniform mat4 view;\n\n   uniform float animationLength;\n   uniform float currentPosition;\n   uniform vec4 toolColors[20];\n   uniform vec3 focusedPickColor;\n   uniform float maxFeedRate;\n   uniform float minFeedRate;\n   uniform bool progressMode;\n   uniform vec4 progressColor;\n   uniform bool showSupports;\n   uniform bool showTravels;\n   uniform float utime;\n   uniform int renderMode;\n\n   uniform bool alphaMode;\n   uniform bool lineMesh;\n   uniform bool perimeterOnly;\n\n   varying vec3 eye_normal;\n   flat out vec3 vDiffColor;\n   flat out float fIsPerimeter;\n   flat out float bDiscard;\n   flat out float fShow;\n   flat out float focused;\n\n #include<instancesDeclaration>\n\n   void main()\n   {\n      #include<instancesVertex>\n\n      fIsPerimeter = isPerimeter;\n      bDiscard = 0.;\n\n      // Non-perimeter geometry (infill, travels) is dropped entirely in perimeter-only mode\n      if(perimeterOnly && isPerimeter < 1.0)\n      {\n         bDiscard = 1.;\n      }\n\n      switch(renderMode){\n            case 0: \n               vDiffColor = baseColor.rgb; \n            break; // use default diffuse color;\n            case 1:\n               if(tool < 255.0)\n               {\n                  vDiffColor = toolColors[int(tool)].rgb;\n               }\n               else\n               {\n                  vDiffColor = vec3(1,0,0); //Travel Color Make Configurable at some point\n               }\n            break;\n            case 2:\n               float m = (feedRate - minFeedRate) / (maxFeedRate - minFeedRate);\n               vDiffColor = mix(vec3(0,0,1), vec3(1,0,0), m); \n               break;\n            case 5:\n               vDiffColor = pickColor.rgb;\n               break;\n         }\n\n         fShow = currentPosition - filePosition;\n         focused = 0.;\n\n         if(focusedPickColor == pickColor && !(currentPosition >= filePosition && currentPosition <= filePositionEnd)) \n         {\n            vDiffColor = vec3(1, 1, 1) - vDiffColor.rgb;\n            focused = 1.;\n         }\n         else if (tool >= 254.0)  //Travel\n         {\n            if(fShow >= 0.0 && fShow < animationLength / 8.0)\n            {\n                  vDiffColor = mix(vec3(1.0, 0.0, 0.0), vec3(0.5,0.0,0.0), fShow / animationLength / 2.0);\n            }\n            else if (showTravels && fShow >= 0.0)\n            {\n               vDiffColor = vec3(0.3, 0.5, 0.8); // persistent travel lines\n            }\n            else\n            {\n               bDiscard = 1.;\n            }\n         }\n         else //Extrusion\n         {\n            if (fShow >= 0.0  && fShow < animationLength) \n            { \n               if(currentPosition < filePositionEnd){\n                  // float animation = smoothstep(0.0, 1.0, fract(utime / 50.0));\n                  float animation = sin(2.0 * 3.1415 * utime / 1000.0) * 0.5 + 0.5;\n                  vDiffColor = mix(vec3(0, 0, 1), vec3(0,1,0), animation);\n               }\n               else \n               {\n                  vDiffColor = mix(vec3(1, 1, 1) - vDiffColor.rgb, vDiffColor.rgb, fShow / animationLength);\n               }\n            }\n            else if (fShow >= 0.0 && progressMode) \n            {\n               vDiffColor = progressColor.rgb;\n            }\n            else if(fShow < 0.0 && !alphaMode && !progressMode)\n            {\n               bDiscard = 1.;\n            }\n         }\n\n         //Final Results\n         gl_Position = viewProjection * finalWorld *  vec4(position, 1.0);\n         mat4 n =transpose(inverse(worldView * finalWorld));\n         eye_normal = (n * (vec4(normal , 1.0) * vec4(position,1.)) ).xyz;\n   }";
     static readonly fragmentShader = "\n   precision highp float;\n   #include<helperFunctions>\n\n   const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);\n   const vec3 LIGHT_FRONT_DIR = vec3(0.0, 0.0, 1.0);\n   \n   // x = ambient, y = top diffuse, z = front diffuse, w = global\n   const vec4 light_intensity = vec4(0.45, 0.7, 0.75, 0.75);\n   varying vec3 eye_normal;\n\n   uniform bool lineMesh;\n   uniform bool alphaMode;\n   uniform bool progressMode;\n   uniform float alphaValue;\n\n   flat in vec3 vDiffColor;\n   flat in float fIsPerimeter;\n   flat in float bDiscard;\n   flat in float fShow;\n   flat in float focused;\n   const vec3 lowerBound = vec3(0.3,0.3,0.3);\n\n   void main(){\n\n         if( bDiscard > 0.0) {\n            discard;\n         }\n\n         vec4 diffuseColor = vec4(vDiffColor, 1);\n\n         if(focused > 0.) \n         {\n            diffuseColor.a = 1.0;\n         }\n         else\n         {\n            diffuseColor.a = fShow >= 0.0 || !alphaMode ? 0.99 : alphaValue;\n         }\n         \n        if(lineMesh) {\n            if(fIsPerimeter < 1.0)\n            {\n               if(all(lessThan(diffuseColor.rgb,lowerBound.rgb))) {\n                  diffuseColor = vec4(diffuseColor.rgb + lowerBound, diffuseColor.a);\n               }\n               else {\n                  diffuseColor = vec4(diffuseColor.rgb - lowerBound, diffuseColor.a);\n               }\n            }\n            else\n            {\n            diffuseColor = vec4(diffuseColor.rgb, diffuseColor.a);\n            }\n            gl_FragColor = diffuseColor;\n         }\n         else\n         {\n            vec3 normal = normalize(eye_normal);\n            float NdotL = abs(dot(normal, LIGHT_TOP_DIR));\n            float intensity = light_intensity.x + NdotL * light_intensity.y;\n            NdotL = abs(dot(normal, LIGHT_FRONT_DIR));\n            intensity += NdotL * light_intensity.z;\n            gl_FragColor = vec4(diffuseColor.rgb * light_intensity.w * intensity, diffuseColor.a);\n         }\n   }";
     constructor(scene: Scene);
     buildMaterial(): void;
@@ -22,6 +22,7 @@ export default class LineShaderMaterial {
     setAlphaValue(value: number): void;
     setProgressMode(mode: boolean): void;
     setShowTravels(show: boolean): void;
+    setPerimeterOnly(mode: boolean): void;
     setProgressColor(color: number[]): void;
     setLineMesh(mode: boolean): void;
     showSupports(show: boolean): void;

package/dist/processor.d.ts

@@ -19,7 +19,8 @@ export default class Processor {
     focusedColorId: number;
     lastMeshMode: number;
     perimeterOnly: boolean;
-    originalFile: string;
+    originalFile: string | undefined;
+    private cancelRequested;
     nozzle: Nozzle | null;
     positionTracker: Map<number, {
         x: number;
@@ -61,6 +62,8 @@ export default class Processor {
         diameter?: number;
     }[]): void;
     cleanup(): void;
+    cancelLoad(): void;
+    private throwIfCancelled;
     dispose(): void;
     loadFile(file: any): Promise<void>;
     private loadFileStreamed;
@@ -74,6 +77,7 @@ export default class Processor {
     getFileSize(): number;
     getGCodeInRange(filePos: any, count?: number): void;
     updateFilePosition(position: number, animate?: boolean): void;
+    private closestPositionData;
     private updateNozzlePositionInstant;
     private updateNozzlePositionAnimated;
     animateNozzleToPosition(targetPosition: number): Promise<void>;
@@ -81,7 +85,7 @@ export default class Processor {
     private buildMeshesFromWasmBuffers;
     private createMeshesFromWasmBuffers;
     private applyWasmBuffersToMesh;
-    setPerimeterOnly(perimeterOnly: any): Promise<void>;
+    setPerimeterOnly(perimeterOnly: boolean): void;
     showSupports(show: any): void;
     startNozzleAnimation(): void;
     pauseNozzleAnimation(): void;

package/dist/viewer-proxy.d.ts

@@ -1,7 +1,9 @@
 export default class ViewerProxy {
     private webWorker;
     mainCanvas: HTMLCanvasElement | null;
+    private registeredListeners;
     constructor(canvas: HTMLCanvasElement);
+    private addTrackedListener;
     private onmessage;
     passThru: any;
     private onerror;
@@ -25,6 +27,7 @@ export default class ViewerProxy {
     pauseNozzleAnimation(): void;
     resumeNozzleAnimation(): void;
     stopNozzleAnimation(): void;
+    setAllowSeek(enabled: boolean): void;
     showViewBox(visible: boolean): void;
     setCameraDirection(direction: {
         x: number;
@@ -69,5 +72,6 @@ export default class ViewerProxy {
     showObjectLabels(visible: boolean): void;
     enableWasmProcessing(): Promise<void>;
     getProcessingStats(): Promise<any>;
+    private removeAllListeners;
     cloneEvent(event: any): {};
 }

package/dist/viewer.d.ts

@@ -34,6 +34,7 @@ export default class Viewer {
     buildObjects: BuildObjects | null;
     zTopClipValue: number | null;
     zBottomClipValue: number | null;
+    allowSeek: boolean;
     offscreen: boolean;
     lastFrameUpdate: number;
     renderTimeout: number;
@@ -59,6 +60,7 @@ export default class Viewer {
     frameToPrint(): void;
     postPrintBounds(): void;
     registerClipIgnore(mesh: any): void;
+    setAllowSeek(enabled: boolean): void;
     showViewBox(visible: boolean): void;
     setBackgroundColor(hexColor: string): void;
     setCameraInertia(enabled: boolean): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/gcodeviewer",
-  "version": "3.7.0-alpha.1",
+  "version": "3.7.0-alpha.2",
   "description": "G-code viewer and processor library with Babylon.js rendering and a Rust/WASM parsing fast path",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.es.js",