three-cad-viewer 5.0.4 → 5.0.6

package/dist/three-cad-viewer.js

@@ -82241,6 +82241,7 @@ void main() {
 	        this._cadOriginalBackColor = null;
 	        this._isStudioMode = false;
 	        this._cadEdgesVisible = null;
+	        this._cadVerticesVisible = null;
 	    }
 	    /**
 	     * Get the zebra tool, creating it on first access.
@@ -82282,6 +82283,7 @@ void main() {
 	        this._cadOriginalBackColor = null;
 	        this._isStudioMode = false;
 	        this._cadEdgesVisible = null;
+	        this._cadVerticesVisible = null;
 	    }
 	    /**
 	     * Set the front face mesh.
@@ -82637,7 +82639,13 @@ void main() {
 	            }
 	        }
 	        if (this.vertices) {
-	            this.vertices.material.visible = flag;
+	            if (this._isStudioMode) {
+	                // Same rule as edges: Studio hides vertices, record the CAD intent only.
+	                this._cadVerticesVisible = flag;
+	            }
+	            else {
+	                this.vertices.material.visible = flag;
+	            }
 	        }
 	        this._syncPickVertices();
 	    }
@@ -82846,10 +82854,14 @@ void main() {
 	        this._cadOriginalBackColor = this.originalBackColor
 	            ? this.originalBackColor.clone()
 	            : null;
-	        // Save edge visibility state
+	        // Save edge and vertex visibility state (also for edge-only / vertex-only
+	        // groups, which have no front mesh and get no studio material)
 	        this._cadEdgesVisible = this.edgeMaterial
 	            ? this.edgeMaterial.visible
 	            : null;
+	        this._cadVerticesVisible = this.vertices
+	            ? this.vertices.material.visible
+	            : null;
 	        // --- Swap front material ---
 	        if (this.front && studioFront) {
 	            // Transfer per-object visibility to mesh.visible (NOT material.visible)
@@ -82903,24 +82915,30 @@ void main() {
 	        if (this._cadOriginalBackColor) {
 	            this.originalBackColor = this._cadOriginalBackColor.clone();
 	        }
-	        // --- Restore edge visibility ---
+	        // --- Restore edge and vertex visibility ---
 	        if (this.edgeMaterial && this._cadEdgesVisible !== null) {
 	            this.edgeMaterial.visible = this._cadEdgesVisible;
 	        }
+	        if (this.vertices && this._cadVerticesVisible !== null) {
+	            this.vertices.material.visible = this._cadVerticesVisible;
+	        }
 	        this._isStudioMode = false;
 	    }
 	    /**
-	     * Toggle edge visibility while in Studio mode.
+	     * Toggle edge and vertex visibility while in Studio mode.
 	     *
-	     * Only affects edges (not vertices). Should only be called while in
-	     * Studio mode; the saved CAD edge visibility is not affected.
+	     * Should only be called while in Studio mode; the saved CAD edge/vertex
+	     * visibility is not affected and is restored by `leaveStudioMode()`.
 	     *
-	     * @param visible - Whether edges should be visible
+	     * @param visible - Whether edges and vertices should be visible
 	     */
 	    setStudioShowEdges(visible) {
 	        if (this.edgeMaterial) {
 	            this.edgeMaterial.visible = visible;
 	        }
+	        if (this.vertices) {
+	            this.vertices.material.visible = visible;
+	        }
 	    }
 	}
 	/**
@@ -88258,13 +88276,17 @@ float metalnessFactor = metalness;
 	        }
 	        // Track material tags that failed to resolve
 	        const unresolvedTags = new Set();
-	        // Iterate all ObjectGroups with front meshes
 	        for (const path in this.groups) {
 	            const obj = this.groups[path];
 	            if (!(obj instanceof ObjectGroup))
 	                continue;
-	            if (!obj.front)
+	            if (!obj.front) {
+	                // Edge-only / vertex-only group: no studio material, but it must still
+	                // enter studio mode so its CAD edge/vertex visibility is saved and
+	                // restored on leave (setStudioShowEdges hides both in studio).
+	                obj.enterStudioMode(null, null);
 	                continue;
+	            }
 	            // Determine material tag, leaf color, and leaf alpha
 	            const tag = obj.materialTag || "";
 	            const leafColor = obj.originalColor
@@ -97334,7 +97356,7 @@ float metalnessFactor = metalness;
 	    }
 	}
 
-	const version = "5.0.4";
+	const version = "5.0.6";
 
 	/**
 	 * `PickedComponent` over a GPU id-pick result. Drives the shader
@@ -112510,12 +112532,21 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	        this.renderer.setSize(cadWidth, height);
 	        // Resize the id pick target to match the canvas
 	        this.idPicker?.setSize(cadWidth, height);
-	        // Adapt display dimensions
+	        // Adapt display dimensions. `glass` and `tools` are part of the sizes:
+	        // setSizes widens the toolbar and the body by the tree only when the tree
+	        // sits beside the canvas (`tools && !glass`), and updates the tree and
+	        // info heights only outside glass mode. Leaving them out meant neither
+	        // branch could ever be taken from a resize, so a non-glass viewer got a
+	        // toolbar and a body of `cadWidth + 2` with a `treeWidth + cadWidth` row
+	        // inside them - measured as a 550px toolbar over 802px of content - and a
+	        // tree that kept its old height. `glassMode` passes both and was right.
 	        this.display.setSizes({
 	            treeWidth: treeWidth,
 	            treeHeight: this.state.get("treeHeight"),
 	            cadWidth: cadWidth,
 	            height: height,
+	            glass: glass,
+	            tools: this.state.get("tools"),
 	        });
 	        // Set glass state - subscription will update UI
 	        this.state.set("glass", glass);
@@ -113371,6 +113402,8 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	        /**
 	         * Checkbox Handler for setting the tools mode.
 	         * Delegates state mutations to Viewer.activateTool() to maintain unidirectional data flow.
+	         * The active tab is left untouched: a measure/select tool can run on any tab,
+	         * including Clip, so a sectioned model can be measured.
 	         */
 	        this.setTool = (name, flag) => {
 	            // Block tool activation while Studio mode is active
@@ -113378,15 +113411,9 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	                return;
 	            }
 	            this.viewer.toggleAnimationLoop(flag);
-	            const activeTool = this.state.get("activeTool");
-	            const currentTool = typeof activeTool === "string" ? activeTool : "";
 	            if (flag) {
 	                // Delegate state mutations to Viewer
 	                this.viewer.activateTool(name, true);
-	                if (["distance", "properties", "select"].includes(name) &&
-	                    !["distance", "properties", "select"].includes(currentTool)) {
-	                    this.viewer.toggleTab(true);
-	                }
 	                this.viewer.setSelectionInput(flag);
 	                if (name === "distance") {
 	                    this.viewer.cadTools.enable(ToolTypes.DISTANCE);
@@ -113402,9 +113429,6 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	                }
 	            }
 	            else {
-	                if (currentTool === name || name === "explode") {
-	                    this.viewer.toggleTab(false);
-	                }
 	                if (name === "distance") {
 	                    this.viewer.cadTools.disable();
 	                }
@@ -114950,9 +114974,6 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	            ["distance", "properties", "select"].includes(activeTool)) {
 	            this.clickButtons[activeTool]?.set(false);
 	            this.setTool(activeTool, false);
-	            // setTool→toggleTab(false) silently sets activeTab to "tree" (no notification).
-	            // Restore to "studio" so the next tab click correctly detects Studio as oldTab.
-	            this.state.set("activeTab", "studio", false);
 	        }
 	        // Hide tool buttons
 	        this.showMeasureTools(false);
@@ -114968,22 +114989,6 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	        this.showMeasureTools(this.measureTools);
 	        this.showSelectTool(this.selectTool);
 	    }
-	    /**
-	     * Entering Clip mode: hide the measure + select tool buttons (a measure/select
-	     * tool can't be active here — it disables the clip tab — but the buttons must not
-	     * be invocable while clipping). Mirrors {@link _deactivateToolsForStudio};
-	     * explode/zscale stay enabled for consistency with studio mode. Restored by
-	     * {@link _restoreToolsAfterClip} on leave.
-	     */
-	    _deactivateToolsForClip() {
-	        this.showMeasureTools(false);
-	        this.showSelectTool(false);
-	    }
-	    /** Leaving Clip mode: restore measure + select buttons per their feature flags. */
-	    _restoreToolsAfterClip() {
-	        this.showMeasureTools(this.measureTools);
-	        this.showSelectTool(this.selectTool);
-	    }
 	    /**
 	     * Show/hide pinning button
 	     */
@@ -115003,9 +115008,6 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	        if (oldTab === "zebra" && newTab !== "zebra") {
 	            this.viewer.enableZebraTool(false);
 	        }
-	        if (oldTab === "clip" && newTab !== "clip") {
-	            this._restoreToolsAfterClip();
-	        }
 	        if (oldTab === "studio" && newTab !== "studio") {
 	            this.closeMatEditor();
 	            this._saveMatEditorChanges();
@@ -115044,7 +115046,6 @@ void mainImage(const in vec4 inputColor, const in vec2 uv, const in float depth,
 	        }
 	        else if (newTab === "clip") {
 	            _updateVisibility(false, true, false, false, false);
-	            this._deactivateToolsForClip();
 	            this.viewer.nestedGroup.setBackVisible(true);
 	            const clipIntersection = this.viewer.state.get("clipIntersection");
 	            if (typeof clipIntersection === "boolean") {