three-cad-viewer 5.1.0 → 5.1.2

package/dist/three-cad-viewer.js

@@ -92269,6 +92269,20 @@ void main() {
 	        this.tracks = [];
 	        this.root = null;
 	    }
+	    /**
+	     * Apply the current animation time to the objects without advancing it, so a
+	     * single on-demand render shows the pose (e.g. after {@link setRelativeTime}).
+	     */
+	    apply() {
+	        this.mixer?.update(0);
+	    }
+	    /**
+	     * Restart the frame-time measurement, so resuming playback after a pause does
+	     * not advance the animation by the whole pause.
+	     */
+	    resetClock() {
+	        this.clock.reset();
+	    }
 	    /**
 	     * Update the animation mixer (call each frame when animating).
 	     */
@@ -97840,7 +97854,7 @@ void main() {
 	    }
 	}
 
-	const version = "5.1.0";
+	const version = "5.1.2";
 
 	/**
 	 * `PickedComponent` over a GPU id-pick result. Drives the shader
@@ -109435,6 +109449,8 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	     * @param updateMarker - enforce to redraw orientation marker after every ui activity
 	     */
 	    constructor(display, options, notifyCallback, pinAsPngCallback = null, updateMarker = true) {
+	        /** Reasons for continuous rendering; the render loop runs while any is set. */
+	        this._loopReasons = new Set();
 	        // Hide-undo stack: each meta-double-click hide pushes the leaf id + its pre-hide
 	        // state; meta-double-click on empty space pops and restores the last one. Lets a
 	        // hidden object be brought back without the tree (e.g. in Studio, where it's hidden).
@@ -109461,7 +109477,7 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	        this._capOutlineCamera = [];
 	        /** Pending redraw that adds the outline once the camera has settled. */
 	        this._capOutlineSettle = null;
-	        /** Whether the attached animation has moved parts (Play pressed or time slider moved). */
+	        /** Whether the attached animation has moved parts (Play or time slider, not stopped since). */
 	        this._animationStarted = false;
 	        // ---------------------------------------------------------------------------
 	        // Render Loop & Scene Updates
@@ -109870,12 +109886,19 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	                        this.clipAction.paused = false;
 	                    }
 	                    this.clipAction.play();
+	                    this._setAnimationPlaying(true);
 	                    break;
 	                case "pause":
 	                    this.clipAction.paused = !this.clipAction.paused;
+	                    this._setAnimationPlaying(!this.clipAction.paused && this.clipAction.isRunning());
 	                    break;
 	                case "stop":
 	                    this.clipAction.stop();
+	                    // stop() restores the parts' original transforms (three.js
+	                    // AnimationMixer._deactivateAction -> restoreOriginalState), so they are
+	                    // at their model positions again and points can be copied.
+	                    this._animationStarted = false;
+	                    this._setAnimationPlaying(false);
 	                    break;
 	            }
 	        };
@@ -110765,10 +110788,7 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	                return Promise.resolve({ task: taskId, dataUrl: null });
 	            }
 	            // canvas.toBlob can be very slow when animation loop is off!
-	            const animationLoop = this.hasAnimationLoop;
-	            if (!animationLoop) {
-	                this.toggleAnimationLoop(true);
-	            }
+	            this.setLoopReason("capture", true);
 	            this.rendered.orientationMarker.setVisible(false);
 	            this.update(true);
 	            return this.display.captureCanvas({
@@ -110786,10 +110806,8 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	                    }
 	                },
 	                onComplete: () => {
-	                    // Restore animation loop to original state
-	                    if (!animationLoop) {
-	                        this.toggleAnimationLoop(false);
-	                    }
+	                    // Restore the loop to what the other reasons need
+	                    this.setLoopReason("capture", false);
 	                    this.rendered.orientationMarker.setVisible(true);
 	                    this.update(true);
 	                },
@@ -111187,14 +111205,13 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	            return;
 	        }
 	        logger.debug("Animation initialized");
-	        if (!this.hasAnimationLoop) {
-	            this.toggleAnimationLoop(true);
-	        }
 	        this.state.set("animationMode", label === "E" ? "explode" : "animation");
 	        this._animationStarted = false;
 	        this.clipAction = this.animation.animate(this.rendered.nestedGroup.rootGroup, duration, speed, repeat);
 	        // Reset animation slider to start
 	        this.state.set("animationSliderValue", 0);
+	        // Not playing yet: render on demand only (the loop starts with Play).
+	        this._setAnimationPlaying(false);
 	    }
 	    /**
 	     * Check whether animation object exists
@@ -111211,7 +111228,7 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	        }
 	        this.state.set("animationMode", "none");
 	        this._animationStarted = false;
-	        this.toggleAnimationLoop(false);
+	        this.setLoopReason("animation", false);
 	    }
 	    /**
 	     * Set the animation to a specific relative time (0-1).
@@ -111223,6 +111240,8 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	            this._animationStarted = true;
 	        this.animation.setRelativeTime(fraction);
 	        this.state.set("animationSliderValue", fraction * 1000);
+	        // Setting a time pauses the animation: stop the loop and show the new pose.
+	        this._setAnimationPlaying(false);
 	    }
 	    /**
 	     * Get the current relative animation time (0-1).
@@ -111231,6 +111250,44 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	    getRelativeTime() {
 	        return this.animation.getRelativeTime();
 	    }
+	    /**
+	     * Add or remove a reason for continuous rendering. The render loop runs while at
+	     * least one reason is set; otherwise the viewer renders on demand (camera changes
+	     * and explicit updates), so an idle viewer costs no CPU/GPU time.
+	     * @param reason - why continuous rendering is needed.
+	     * @param flag - whether the reason applies.
+	     */
+	    setLoopReason(reason, flag) {
+	        if (flag) {
+	            this._loopReasons.add(reason);
+	        }
+	        else {
+	            this._loopReasons.delete(reason);
+	        }
+	        const run = this._loopReasons.size > 0;
+	        if (run !== this.hasAnimationLoop)
+	            this.toggleAnimationLoop(run);
+	    }
+	    /**
+	     * Run the render loop only while the animation plays. When it stops (pause,
+	     * stop, slider), render once so the final pose is shown.
+	     */
+	    _setAnimationPlaying(playing) {
+	        if (playing) {
+	            // Resume without jumping ahead by the time spent paused.
+	            this.animation.resetClock();
+	        }
+	        this.setLoopReason("animation", playing);
+	        if (!playing && this._rendered !== null) {
+	            this.animation.apply();
+	            this.update(true, false);
+	        }
+	    }
+	    /**
+	     * Start or stop the render loop directly. Prefer {@link setLoopReason}, which keeps
+	     * the loop running while any other reason still needs it.
+	     * @param flag - whether the render loop should run.
+	     */
 	    toggleAnimationLoop(flag) {
 	        if (flag) {
 	            this.continueAnimation = true;
@@ -111381,6 +111438,7 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	            // Hide the topo filter (+ detach its shortcuts) for a clean cleared canvas.
 	            this.display.shapeFilterDropDownMenu.show(false);
 	            // stop animation
+	            this._loopReasons.clear();
 	            this.hasAnimationLoop = false;
 	            this.continueAnimation = false;
 	            // remove change listener if exists
@@ -111963,8 +112021,9 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	     * Copy the world-space point under the cursor as `"x, y, z"` to the clipboard and
 	     * send it to the host as a `copiedPoint` notification (for hosts that block the
 	     * browser clipboard). Does nothing while parts may be displaced from their model
-	     * positions — explode mode, an animation once started (Play or time slider), a
-	     * z-scale other than 1 — or when no visible component is under the cursor.
+	     * positions — explode mode, an animation that was played or scrubbed and not
+	     * stopped since (Stop puts the parts back), a z-scale other than 1 — or when no
+	     * visible component is under the cursor.
 	     * @returns true when a point was copied (the caller then consumes the key event).
 	     */
 	    copyPointUnderCursor() {
@@ -114075,7 +114134,7 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	            if (flag && this.viewer.isStudioActive) {
 	                return;
 	            }
-	            this.viewer.toggleAnimationLoop(flag);
+	            this.viewer.setLoopReason("tool", flag);
 	            if (flag) {
 	                // Delegate state mutations to Viewer
 	                this.viewer.activateTool(name, true);