vim-web 1.0.0-alpha.12 → 1.0.0-alpha.13

package/dist/vim-web.d.ts

@@ -7,14 +7,6 @@ import * as React from 'react';
 import React__default, { ReactNode } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 
-/**
- * @module vim-loader
- */
-/**
- * Determines how to draw (or not) transparent and opaque objects
- */
-type TransparencyMode = 'opaqueOnly' | 'transparentOnly' | 'allAsOpaque' | 'all';
-
 /**
  * @module vim-loader
  */
@@ -45,10 +37,6 @@ type VimSettings = {
      * Setting this will override individual position, rotation, and scale properties.
      */
     matrix: THREE.Matrix4;
-    /**
-     * Determines whether objects are drawn based on their transparency.
-     */
-    transparency: TransparencyMode;
     /**
      * Set to true to enable verbose HTTP logging.
      */
@@ -411,6 +399,8 @@ interface IMaterials {
     outlineColor: THREE.Color;
     /** Clipping planes applied to all materials. Set to undefined to disable clipping. */
     clippingPlanes: THREE.Plane[] | undefined;
+    /** Opacity of the transparent model material (0 = invisible, 1 = fully opaque). Default: 0.25. */
+    transparentOpacity: number;
     /** Selection fill mode: 'none' | 'default' | 'xray' | 'seethrough'. */
     selectionFillMode: SelectionFillMode;
     /** Color used to tint selected elements. */
@@ -894,7 +884,7 @@ interface IWebglVim extends IVim<IElement3D> {
     subset(): ISubset;
     /**
      * Loads geometry for the given subset, or all geometry if no subset is provided.
-     * Caller is responsible for not loading the same subset twice.
+     * Clears any previously loaded geometry first so meshes are never duplicated.
      * @param subset - The subset to load. Omit to load everything.
      */
     load(subset?: ISubset): Promise<void>;
@@ -1762,7 +1752,7 @@ declare function createCoreWebglViewer(settings?: PartialViewerSettings): IWebgl
 
 declare namespace Core_Webgl {
   export { MaterialSet, createCoreWebglViewer as createViewer, isElement3D };
-  export type { AxesSettings, ICameraMovement, IElement3D, IGizmoAxes, IGizmoMarkers, IGizmoOrbit, IGizmos, IMarker, IMaterials, IMeasure, IRenderingSection, IScene, ISelectable, ISubset, IWebglCamera, IWebglLoadRequest, IWebglRaycastResult, IWebglRaycaster, IWebglRenderer, IWebglSectionBox, IWebglSelection, IWebglViewport, IWebglVim, MaterialSettings, MeasureStage, PartialViewerSettings, RequestSource, SelectionFillMode, SubsetFilter, TransparencyMode, IWebglViewer as Viewer, ViewerSettings, VimPartialSettings, VimSettings };
+  export type { AxesSettings, ICameraMovement, IElement3D, IGizmoAxes, IGizmoMarkers, IGizmoOrbit, IGizmos, IMarker, IMaterials, IMeasure, IRenderingSection, IScene, ISelectable, ISubset, IWebglCamera, IWebglLoadRequest, IWebglRaycastResult, IWebglRaycaster, IWebglRenderer, IWebglSectionBox, IWebglSelection, IWebglViewport, IWebglVim, MaterialSettings, MeasureStage, PartialViewerSettings, RequestSource, SelectionFillMode, SubsetFilter, IWebglViewer as Viewer, ViewerSettings, VimPartialSettings, VimSettings };
 }
 
 /**
@@ -2515,7 +2505,9 @@ interface IsolationApi {
     /** Ghost material opacity 0-1 (observable). */
     ghostOpacity: StateRef<number>;
     /** Whether transparent materials are rendered (observable). */
-    transparency: StateRef<boolean>;
+    showTransparent: StateRef<boolean>;
+    /** Opacity of transparent materials 0-1 (observable). Default: 0.25. */
+    transparentOpacity: StateRef<number>;
     /** Whether selection outlines are enabled (observable). */
     outlineEnabled: StateRef<boolean>;
     /** Outline quality: 'low' (0.5x) | 'medium' (1x) | 'high' (2x) render target scale. */
@@ -2663,7 +2655,7 @@ type PartialWebglSettings = RecursivePartial<WebglSettings>;
 type IsolationSettings = {
     autoIsolate: boolean;
     showGhost: boolean;
-    transparency: boolean;
+    showTransparent: boolean;
     showRooms: boolean;
 };
 type SectionBoxSettings = {
@@ -3492,7 +3484,8 @@ declare const IsolationPanel: {
     Ids: {
         showGhost: string;
         ghostOpacity: string;
-        transparency: string;
+        showTransparent: string;
+        transparentOpacity: string;
         outlineEnabled: string;
         outlineQuality: string;
         outlineThickness: string;

package/dist/vim-web.iife.js

@@ -58779,12 +58779,13 @@ void main() {
     }
     /**
      * Loads geometry for the given subset, or all geometry if no subset is provided.
-     * Caller is responsible for not loading the same subset twice.
+     * Clears any previously loaded geometry first so meshes are never duplicated.
      * @param subset - The subset to load. Omit to load everything.
      */
     async load(subset) {
       subset ?? (subset = this.subset());
       if (subset.getInstanceCount() === 0) return;
+      this.clear();
       this._factory.add(subset);
       this._onGeometryLoaded.dispatch();
     }
@@ -66194,6 +66195,16 @@ void main() {
       this.three.uniformsNeedUpdate = true;
       (_a3 = this._onUpdate) == null ? void 0 : _a3.call(this);
     }
+    /** Base opacity of the material (0 = invisible, 1 = fully opaque). */
+    get baseOpacity() {
+      return this.three.uniforms.baseOpacity.value;
+    }
+    set baseOpacity(value) {
+      var _a3;
+      this.three.uniforms.baseOpacity.value = value;
+      this.three.uniformsNeedUpdate = true;
+      (_a3 = this._onUpdate) == null ? void 0 : _a3.call(this);
+    }
     /** Blend strength for selection tint (0 = off, 1 = solid). */
     get selectionTintOpacity() {
       return this.three.uniforms.selectionTintOpacity.value;
@@ -66241,7 +66252,8 @@ void main() {
       uniforms: {
         colorPaletteTexture: { value: null },
         selectionTintColor: { value: new Color(25855) },
-        selectionTintOpacity: { value: 0 }
+        selectionTintOpacity: { value: 0 },
+        baseOpacity: { value: transparent ? 0.25 : 1 }
       },
       clipping: true,
       transparent,
@@ -66309,6 +66321,7 @@ void main() {
 
       uniform vec3 selectionTintColor;
       uniform float selectionTintOpacity;
+      uniform float baseOpacity;
 
       out vec4 fragColor;
 
@@ -66330,7 +66343,7 @@ void main() {
           finalColor = mix(finalColor, selectionTintColor, selectionTintOpacity);
         }
 
-        fragColor = vec4(finalColor, ${transparent ? "0.25" : "1.0"});
+        fragColor = vec4(finalColor, baseOpacity);
       }
       `
       )
@@ -66588,6 +66601,13 @@ void main() {
     set ghostColor(value) {
       this._ghost.color = value;
     }
+    /** Opacity of the transparent model material (0 = invisible, 1 = fully opaque). Default: 0.25. */
+    get transparentOpacity() {
+      return this._modelTransparent.baseOpacity;
+    }
+    set transparentOpacity(value) {
+      this._modelTransparent.baseOpacity = value;
+    }
     /**
      * Updates material settings based on the provided configuration.
      */
@@ -68975,68 +68995,17 @@ void main() {
       this._composer.outlineScale = value;
     }
   };
-  function isTransparencyModeValid(value) {
-    if (!value) return false;
-    return ["all", "opaqueOnly", "transparentOnly", "allAsOpaque"].includes(
-      value
-    );
-  }
-  function createGeometryFromMesh(g3d2, mesh, section) {
-    const colorIndices = createColorIndices(g3d2, mesh, section);
-    const positions = g3d2.positions.subarray(
-      g3d2.getMeshVertexStart(mesh) * 3,
-      g3d2.getMeshVertexEnd(mesh) * 3
-    );
-    const start = g3d2.getMeshIndexStart(mesh, section);
-    const end = g3d2.getMeshIndexEnd(mesh, section);
-    const indices = g3d2.indices.subarray(start, end);
-    return createGeometryFromArrays(
-      positions,
-      indices,
-      colorIndices
-    );
-  }
-  function createColorIndices(g3d2, mesh, section) {
-    const vertexCount = g3d2.getMeshVertexCount(mesh);
-    const result = new Uint16Array(vertexCount);
-    const subStart = g3d2.getMeshSubmeshStart(mesh, section);
-    const subEnd = g3d2.getMeshSubmeshEnd(mesh, section);
-    for (let submesh = subStart; submesh < subEnd; submesh++) {
-      const start = g3d2.getSubmeshIndexStart(submesh);
-      const end = g3d2.getSubmeshIndexEnd(submesh);
-      const index2 = g3d2.colorIndices[submesh];
-      for (let i2 = start; i2 < end; i2++) {
-        const vertexIndex = g3d2.indices[i2];
-        result[vertexIndex] = index2;
-      }
-    }
-    return result;
-  }
-  function createGeometryFromArrays(vertices, indices, colorIndices = void 0) {
-    const geometry = new BufferGeometry();
-    geometry.setAttribute("position", new BufferAttribute(vertices, 3));
-    geometry.setIndex(new Uint32BufferAttribute(indices, 1));
-    if (colorIndices) {
-      geometry.setAttribute(
-        "colorIndex",
-        new Uint16BufferAttribute(colorIndices, 1)
-      );
-    }
-    return geometry;
-  }
   function getDefaultVimSettings() {
     return {
       position: new Vector3(),
       rotation: new Vector3(),
       scale: 1,
       matrix: void 0,
-      transparency: "all",
       verboseHttp: false
     };
   }
   function createVimSettings(options) {
     const merge = options ? deepmerge(getDefaultVimSettings(), options, void 0) : getDefaultVimSettings();
-    merge.transparency = isTransparencyModeValid(merge.transparency) ? merge.transparency : "all";
     merge.matrix = merge.matrix ?? new Matrix4().compose(
       merge.position,
       new Quaternion().setFromEuler(
@@ -69413,6 +69382,49 @@ void main() {
       return mesh;
     }
   }
+  function createGeometryFromMesh(g3d2, mesh, section) {
+    const colorIndices = createColorIndices(g3d2, mesh, section);
+    const positions = g3d2.positions.subarray(
+      g3d2.getMeshVertexStart(mesh) * 3,
+      g3d2.getMeshVertexEnd(mesh) * 3
+    );
+    const start = g3d2.getMeshIndexStart(mesh, section);
+    const end = g3d2.getMeshIndexEnd(mesh, section);
+    const indices = g3d2.indices.subarray(start, end);
+    return createGeometryFromArrays(
+      positions,
+      indices,
+      colorIndices
+    );
+  }
+  function createColorIndices(g3d2, mesh, section) {
+    const vertexCount = g3d2.getMeshVertexCount(mesh);
+    const result = new Uint16Array(vertexCount);
+    const subStart = g3d2.getMeshSubmeshStart(mesh, section);
+    const subEnd = g3d2.getMeshSubmeshEnd(mesh, section);
+    for (let submesh = subStart; submesh < subEnd; submesh++) {
+      const start = g3d2.getSubmeshIndexStart(submesh);
+      const end = g3d2.getSubmeshIndexEnd(submesh);
+      const index2 = g3d2.colorIndices[submesh];
+      for (let i2 = start; i2 < end; i2++) {
+        const vertexIndex = g3d2.indices[i2];
+        result[vertexIndex] = index2;
+      }
+    }
+    return result;
+  }
+  function createGeometryFromArrays(vertices, indices, colorIndices = void 0) {
+    const geometry = new BufferGeometry();
+    geometry.setAttribute("position", new BufferAttribute(vertices, 3));
+    geometry.setIndex(new Uint32BufferAttribute(indices, 1));
+    if (colorIndices) {
+      geometry.setAttribute(
+        "colorIndex",
+        new Uint16BufferAttribute(colorIndices, 1)
+      );
+    }
+    return geometry;
+  }
   class InstancedMeshFactory {
     constructor(mapping, vimIndex = 0) {
       __publicField(this, "_mapping");
@@ -86829,7 +86841,8 @@ Averrage Date/Second ${avgDataRatePS} kb
   const Ids = {
     showGhost: "isolationPanel.showGhost",
     ghostOpacity: "isolationPanel.ghostOpacity",
-    transparency: "isolationPanel.transparency",
+    showTransparent: "isolationPanel.showTransparent",
+    transparentOpacity: "isolationPanel.transparentOpacity",
     outlineEnabled: "isolationPanel.outlineEnabled",
     outlineQuality: "isolationPanel.outlineQuality",
     outlineThickness: "isolationPanel.outlineThickness",
@@ -86848,9 +86861,20 @@ Averrage Date/Second ${avgDataRatePS} kb
           entries: [
             {
               type: "bool",
-              id: Ids.transparency,
-              label: "Transparency",
-              state: props.state.transparency
+              id: Ids.showTransparent,
+              label: "Show Transparent",
+              state: props.state.showTransparent
+            },
+            {
+              type: "number",
+              id: Ids.transparentOpacity,
+              label: "Transparent Opacity",
+              state: props.state.transparentOpacity,
+              enabled: () => props.state.showTransparent.get(),
+              min: 0,
+              max: 1,
+              step: 0.05,
+              transform: (n) => Math.max(0, Math.min(1, n))
             },
             {
               type: "bool",
@@ -86931,7 +86955,8 @@ Averrage Date/Second ${avgDataRatePS} kb
     const showPanel = useStateRef(false);
     const showRooms = useStateRef(false);
     const showGhost = useStateRef(() => adapter.getShowGhost(), true);
-    const transparency = useStateRef(() => adapter.getTransparency(), true);
+    const showTransparent = useStateRef(() => adapter.getShowTransparent(), true);
+    const transparentOpacity = useStateRef(() => adapter.getTransparentOpacity(), true, "vim.transparent.opacity");
     const outlineEnabled = useStateRef(() => adapter.getOutlineEnabled(), true, "vim.outline.enabled");
     const outlineQuality = useStateRef(() => adapter.getOutlineQuality(), true, "vim.outline.quality");
     const outlineThickness = useStateRef(() => adapter.getOutlineThickness(), true, "vim.outline.thickness");
@@ -86959,7 +86984,8 @@ Averrage Date/Second ${avgDataRatePS} kb
       if (v) onAutoIsolate.call();
     });
     showGhost.useOnChange((v) => adapter.showGhost(v));
-    transparency.useOnChange((v) => adapter.setTransparency(v));
+    showTransparent.useOnChange((v) => adapter.setShowTransparent(v));
+    transparentOpacity.useOnChange((v) => adapter.setTransparentOpacity(v));
     outlineEnabled.useOnChange((v) => adapter.setOutlineEnabled(v));
     outlineQuality.useOnChange((v) => adapter.setOutlineQuality(v));
     outlineThickness.useOnChange((v) => adapter.setOutlineThickness(v));
@@ -86977,7 +87003,8 @@ Averrage Date/Second ${avgDataRatePS} kb
       autoIsolate: autoIsolate2,
       showPanel,
       showGhost,
-      transparency,
+      showTransparent,
+      transparentOpacity,
       outlineEnabled,
       outlineQuality,
       outlineThickness,
@@ -87007,13 +87034,13 @@ Averrage Date/Second ${avgDataRatePS} kb
   }
   function createWebglIsolationAdapter(viewer, initialState) {
     var ghost2 = (initialState == null ? void 0 : initialState.showGhost) ?? false;
-    var transparency = (initialState == null ? void 0 : initialState.transparency) ?? true;
+    var showTransparent = (initialState == null ? void 0 : initialState.showTransparent) ?? true;
     var rooms = (initialState == null ? void 0 : initialState.showRooms) ?? false;
     function updateMaterials() {
       const m = viewer.materials;
       viewer.renderer.modelMaterial = new MaterialSet(
         m.modelOpaqueMaterial,
-        transparency ? m.modelTransparentMaterial : m.modelOpaqueMaterial,
+        showTransparent ? m.modelTransparentMaterial : m.modelOpaqueMaterial,
         ghost2 ? m.ghostMaterial : void 0
       );
     }
@@ -87080,7 +87107,11 @@ Averrage Date/Second ${avgDataRatePS} kb
       getGhostOpacity: () => viewer.materials.ghostOpacity,
       setGhostOpacity: (opacity) => viewer.materials.ghostOpacity = opacity,
       getShowGhost: () => ghost2,
-      getTransparency: () => transparency,
+      getShowTransparent: () => showTransparent,
+      getTransparentOpacity: () => viewer.materials.transparentOpacity,
+      setTransparentOpacity: (opacity) => {
+        viewer.materials.transparentOpacity = opacity;
+      },
       getOutlineEnabled: () => viewer.renderer.outlineEnabled,
       getOutlineQuality: () => {
         const scale = viewer.renderer.outlineScale;
@@ -87091,8 +87122,8 @@ Averrage Date/Second ${avgDataRatePS} kb
       getOutlineThickness: () => viewer.materials.outlineThickness,
       getSelectionFillMode: () => viewer.materials.selectionFillMode,
       getSelectionOverlayOpacity: () => viewer.materials.selectionOverlayOpacity,
-      setTransparency: (enabled) => {
-        transparency = enabled;
+      setShowTransparent: (enabled) => {
+        showTransparent = enabled;
         updateMaterials();
       },
       setOutlineEnabled: (enabled) => {
@@ -87157,7 +87188,7 @@ Averrage Date/Second ${avgDataRatePS} kb
       isolation: {
         autoIsolate: false,
         showGhost: true,
-        transparency: true,
+        showTransparent: true,
         showRooms: false
       },
       sectionBox: {
@@ -87286,9 +87317,18 @@ Averrage Date/Second ${avgDataRatePS} kb
       },
       {
         type: "bool",
-        id: "transparency",
-        label: "Transparency",
-        state: isolation.transparency
+        id: "showTransparent",
+        label: "Show Transparent",
+        state: isolation.showTransparent
+      },
+      {
+        type: "number",
+        id: "transparentOpacity",
+        label: "Transparent Opacity",
+        info: "[0,1]",
+        step: 0.05,
+        transform: (n) => Math.max(0, Math.min(1, n)),
+        state: isolation.transparentOpacity
       },
       {
         type: "bool",
@@ -87897,10 +87937,13 @@ Averrage Date/Second ${avgDataRatePS} kb
       setGhostOpacity: (opacity) => {
         viewer.renderer.ghostOpacity = opacity;
       },
-      setTransparency: (_enabled) => {
+      setShowTransparent: (_enabled) => {
       },
       getShowGhost: () => ghost2.get(),
-      getTransparency: () => true,
+      getShowTransparent: () => true,
+      getTransparentOpacity: () => 0.25,
+      setTransparentOpacity: (_opacity) => {
+      },
       getOutlineEnabled: () => true,
       getOutlineQuality: () => "high",
       getOutlineThickness: () => 2,
@@ -87963,7 +88006,7 @@ Averrage Date/Second ${avgDataRatePS} kb
       isolation: {
         autoIsolate: false,
         showGhost: false,
-        transparency: true,
+        showTransparent: true,
         showRooms: false
       },
       sectionBox: {