@duet3d/gcodeviewer 3.7.0-alpha.6 → 3.7.0-alpha.8

package/dist/lineshader.d.ts

@@ -1,24 +1,29 @@
 import { ShaderMaterial } from '@babylonjs/core/Materials/shaderMaterial';
 import { Scene } from '@babylonjs/core/scene';
 import { UniformBuffer } from '@babylonjs/core/Materials/uniformBuffer';
+export declare function trailTime(): number;
 export default class LineShaderMaterial {
     scene: Scene;
     material: ShaderMaterial;
     toolBuffer: UniformBuffer;
     renderMode: number;
-    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 bool persistTravels;\n   uniform vec3 minFeedColor;\n   uniform vec3 maxFeedColor;\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   varying vec3 eye_pos;\n\n#include<clipPlaneVertexDeclaration>\n\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) / max(maxFeedRate - minFeedRate, 0.0001);\n               vDiffColor = mix(minFeedColor, maxFeedColor, clamp(m, 0.0, 1.0));\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(!showTravels)\n            {\n               bDiscard = 1.;\n            }\n            else 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 (fShow >= 0.0)\n            {\n               vDiffColor = vec3(0.3, 0.5, 0.8);\n               bDiscard = persistTravels ? 0. : 1.;\n            }\n            else if (alphaMode || progressMode)\n            {\n               vDiffColor = vec3(0.3, 0.5, 0.8);\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         vec4 worldPos = finalWorld * vec4(position, 1.0);\n         #include<clipPlaneVertex>\n         gl_Position = viewProjection * worldPos;\n         mat4 n =transpose(inverse(worldView * finalWorld));\n         eye_normal = (n * vec4(normal, 0.0)).xyz;\n         eye_pos = (worldView * finalWorld * vec4(position, 1.0)).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   const float SPECULAR_POWER = 32.0;\n   const float SPECULAR_INTENSITY = 0.35;\n   varying vec3 eye_normal;\n   varying vec3 eye_pos;\n\n#include<clipPlaneFragmentDeclaration>\n\n   uniform bool lineMesh;\n   uniform bool alphaMode;\n   uniform bool progressMode;\n   uniform float alphaValue;\n   uniform bool useSpecular;\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         #include<clipPlaneFragment>\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 if(progressMode && fShow < 0.0)\n         {\n            diffuseColor.a = alphaValue;\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            vec3 shaded = diffuseColor.rgb * light_intensity.w * intensity;\n            if(useSpecular)\n            {\n               vec3 halfDir = normalize(LIGHT_TOP_DIR + normalize(-eye_pos));\n               shaded += vec3(pow(max(dot(normal, halfDir), 0.0), SPECULAR_POWER) * SPECULAR_INTENSITY);\n            }\n            gl_FragColor = vec4(shaded, diffuseColor.a);\n         }\n   }";
+    static readonly trailHistorySize = 64;
+    static readonly vertexShader: string;
+    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   const float SPECULAR_POWER = 32.0;\n   const float SPECULAR_INTENSITY = 0.35;\n   varying vec3 eye_normal;\n   varying vec3 eye_pos;\n\n#include<clipPlaneFragmentDeclaration>\n\n   uniform bool lineMesh;\n   uniform bool alphaMode;\n   uniform bool progressMode;\n   uniform float unprintedOpacity;\n   uniform bool useSpecular;\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         #include<clipPlaneFragment>\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 if(progressMode && fShow < 0.0)\n         {\n            diffuseColor.a = unprintedOpacity;\n         }\n         else\n         {\n            diffuseColor.a = fShow >= 0.0 || !alphaMode ? 0.99 : unprintedOpacity;\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            vec3 shaded = diffuseColor.rgb * light_intensity.w * intensity;\n            if(useSpecular)\n            {\n               vec3 halfDir = normalize(LIGHT_TOP_DIR + normalize(-eye_pos));\n               shaded += vec3(pow(max(dot(normal, halfDir), 0.0), SPECULAR_POWER) * SPECULAR_INTENSITY);\n            }\n            gl_FragColor = vec4(shaded, diffuseColor.a);\n         }\n   }";
     constructor(scene: Scene);
     buildMaterial(): void;
     updateRenderMode(mode: number): void;
     updateCurrentFilePosition(position: number): void;
+    updateTrailHistory(history: number[], startPosition: number): void;
+    setTrailDuration(seconds: number): void;
+    setTrailColor(color: number[]): void;
     getMaterial(): ShaderMaterial;
     updateToolColors(toolColors: number[]): void;
     setPickColor(color: number[]): void;
     setMaxFeedRate(feedRate: number): void;
     setMinFeedRate(feedRate: number): void;
     setAlphaMode(mode: boolean): void;
-    setAlphaValue(value: number): void;
+    setUnprintedOpacity(value: number): void;
     setProgressMode(mode: boolean): void;
     setShowTravels(show: boolean): void;
     setPersistTravels(persist: boolean): void;

package/dist/processor.d.ts

@@ -2,6 +2,7 @@ import { Base } from './GCodeLines';
 import { default as ProcessorProperties } from './processorproperties';
 import { Scene } from '@babylonjs/core/scene';
 import { Mesh } from '@babylonjs/core/Meshes/mesh';
+import { Vector3 } from '@babylonjs/core/Maths/math.vector';
 import { default as GPUPicker } from './gpupicker';
 import { default as LineShaderMaterial } from './lineshader';
 import { default as Nozzle } from './Renderables/nozzle';
@@ -15,7 +16,12 @@ export default class Processor {
     worker: Worker;
     modelMaterial: LineShaderMaterial[];
     filePosition: number;
+    renderedFilePosition: number;
     focusedColorId: number;
+    trailDuration: number;
+    liveTracking: boolean;
+    trailColor: number[];
+    private trailHistory;
     allowSeek: boolean;
     lastMeshMode: number;
     perimeterOnly: boolean;
@@ -84,11 +90,21 @@ export default class Processor {
     setMeshMode(mode: any): void;
     testBuildMesh(renderlines: any, segCount: any, alphaIndex: any): Mesh[];
     getGCodeInRange(filePos: any, count?: number): void;
+    setTrailDuration(seconds: number): void;
+    private effectiveTrailDuration;
+    setLiveTracking(enabled: boolean): void;
+    setTrailColor(color: number[]): void;
+    resetTrail(): void;
+    private recordTrailSample;
     updateFilePosition(position: number, animate?: boolean): void;
     private closestPositionData;
     private updateNozzlePositionInstant;
     private updateNozzlePositionAnimated;
     animateNozzleToPosition(targetPosition: number): Promise<void>;
+    getExtrusionBounds(upToFilePosition?: number): {
+        min: Vector3;
+        max: Vector3;
+    } | null;
     updateByLineNumber(lineNumber: number): void;
     private buildMeshesFromWasmBuffers;
     private createMeshesFromWasmBuffers;

package/dist/viewer-proxy.d.ts

@@ -36,8 +36,8 @@ export default class ViewerProxy {
         y: number;
         z: number;
     }): void;
-    resetCamera(): void;
-    frameToPrint(): void;
+    resetCamera(animate?: boolean): void;
+    frameToPrint(animate?: boolean): void;
     requestPrintBounds(): void;
     setBackgroundColor(color: string): void;
     setCameraInertia(enabled: boolean): void;
@@ -63,7 +63,10 @@ export default class ViewerProxy {
     setBedRenderMode(mode: number): void;
     setBedColor(color: string): void;
     setProgressColor(color: string): void;
-    setTransparencyValue(value: number): void;
+    setLiveTracking(enabled: boolean): void;
+    setTrailDuration(seconds: number): void;
+    setTrailColor(color: string): void;
+    setUnprintedOpacity(value: number): void;
     setShowTravels(show: boolean): void;
     setPersistTravels(persist: boolean): void;
     setFeedRateRange(min: number, max: number): void;
@@ -78,6 +81,8 @@ export default class ViewerProxy {
     setDeltaBed(isDelta: boolean): void;
     showBed(visible: boolean): void;
     showAxes(visible: boolean): void;
+    showRuler(visible: boolean): void;
+    setRulerInterval(interval: number | null): void;
     showWorkplace(visible: boolean): void;
     loadObjectBoundaries(objects: any[]): void;
     showObjectSelection(visible: boolean): void;

package/dist/viewer.d.ts

@@ -9,6 +9,7 @@ import { default as Processor } from './processor';
 import { default as ViewBox, ViewBoxDirection } from './Renderables/viewbox';
 import { default as Bed, BuildVolume, RenderBedMode } from './Renderables/bed';
 import { default as Axes } from './Renderables/axes';
+import { default as Ruler } from './Renderables/ruler';
 import { default as Workplace } from './Renderables/workplace';
 import { default as BuildObjects } from './Renderables/buildobjects';
 export default class Viewer {
@@ -32,12 +33,16 @@ export default class Viewer {
     viewBox: ViewBox | null;
     bed: Bed | null;
     axes: Axes | null;
+    ruler: Ruler | null;
     workplace: Workplace | null;
     buildObjects: BuildObjects | null;
     zTopClipValue: number | null;
     zBottomClipValue: number | null;
     allowSeek: boolean;
+    private alphaMode;
+    private progressMode;
     offscreen: boolean;
+    private static readonly CAMERA_TRANSITION_FRAMES;
     lastFrameUpdate: number;
     renderTimeout: number;
     maxFrameRate: number;
@@ -56,10 +61,18 @@ export default class Viewer {
     init_worker(data: any, worker: Worker): void;
     setSizes(width: any, height: any): void;
     initEngine(): Promise<void>;
+    private stopCameraAnimation;
+    private animateCameraTo;
     setCameraDirection(direction: ViewBoxDirection): void;
-    resetCamera(): void;
+    resetCamera(animate?: boolean): void;
+    frameToPrint(animate?: boolean): void;
+    private bedCorners;
+    private printCorners;
+    private frameCorners;
+    private projectCorners;
+    private fitRadius;
+    private centerVertically;
     private getPrintBoundingBox;
-    frameToPrint(): void;
     postPrintBounds(): void;
     registerClipIgnore(mesh: any): void;
     setAllowSeek(enabled: boolean): void;
@@ -70,8 +83,13 @@ export default class Viewer {
     setBuildVolume(volume: BuildVolume): void;
     setBedRenderMode(mode: RenderBedMode): void;
     setBedColor(color: string): void;
+    setAlphaMode(mode: boolean): void;
+    setProgressMode(mode: boolean): void;
     setProgressColor(color: string): void;
-    setTransparencyValue(value: number): void;
+    setLiveTracking(enabled: boolean): void;
+    setTrailDuration(seconds: number): void;
+    setTrailColor(color: string): void;
+    setUnprintedOpacity(value: number): void;
     setShowTravels(show: boolean): void;
     setPersistTravels(persist: boolean): void;
     setFeedRateRange(min: number | null, max: number | null): void;
@@ -82,6 +100,9 @@ export default class Viewer {
     setDeltaBed(isDelta: boolean): void;
     showBed(visible: boolean): void;
     showAxes(visible: boolean): void;
+    showRuler(visible: boolean): void;
+    setRulerInterval(interval: number | null): void;
+    private syncGridToRuler;
     showWorkplace(visible: boolean): void;
     loadObjectBoundaries(objects: any[]): void;
     showObjectSelection(visible: boolean): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/gcodeviewer",
-  "version": "3.7.0-alpha.6",
+  "version": "3.7.0-alpha.8",
   "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",
@@ -21,11 +21,13 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
+    "precheck": "node WASM_FileProcessor/ensure-pkg.mjs",
     "check": "tsc --noEmit",
-    "build:wasm": "cd WASM_FileProcessor && wasm-pack build --target web --out-dir pkg --release",
+    "prepublishOnly": "node WASM_FileProcessor/ensure-pkg.mjs --require-real",
+    "build:wasm": "cd WASM_FileProcessor && wasm-pack build --target web --out-dir pkg --release && cp pkg/gcode_file_processor.d.ts pkg-fallback/gcode_file_processor.d.ts",
     "build:wasm:node": "cd WASM_FileProcessor && wasm-pack build --target nodejs --out-dir pkg-node --release"
   },
-  "contributors": ["Juan Rosario", "Christian Hammacher"],
+  "contributors": ["Juan Rosario", "Christian Hammacher", "James Skitt"],
   "license": "ISC",
   "devDependencies": {
     "@babylonjs/core": "^9.15.0",