three-cad-viewer 4.2.0 → 4.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-cad-viewer",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "type": "module",
   "description": "WebGL-based CAD viewer built on Three.js with clipping planes, measurement tools, and tree navigation",
   "repository": {

package/src/_version.ts

@@ -1 +1 @@
-export const version: string = "4.2.0";
+export const version: string = "4.3.0";

package/src/core/studio-manager.ts

@@ -69,11 +69,6 @@ class StudioManager {
   private _composer: StudioComposer | null = null;
   private _active: boolean = false;
   private _savedClippingState: ClippingState | null = null;
-  private _savedViewState: {
-    ortho: boolean;
-    axes: boolean;
-    grid: [boolean, boolean, boolean];
-  } | null = null;
   private _shadowLights: THREE.DirectionalLight[] = [];
   private _ctx: StudioManagerContext;
 
@@ -162,15 +157,7 @@ class StudioManager {
         clipping.planeHelpers.visible = false;
       }
 
-      // 2. Save view state (applied after env is loaded to avoid
-      //    subscriber side-effects before the texture is ready)
-      this._savedViewState = {
-        ortho: state.get("ortho"),
-        axes: state.get("axes"),
-        grid: [...state.get("grid")] as [boolean, boolean, boolean],
-      };
-
-      // 3. Build/swap studio materials (async due to textures)
+      // 2. Build/swap studio materials (async due to textures)
       const nestedGroup = this._ctx.getNestedGroup();
       const unresolvedTags = await nestedGroup.enterStudioMode(state.get("studioTextureMapping"));
       if (!this._active) return;
@@ -182,12 +169,12 @@ class StudioManager {
         );
       }
 
-      // 4. Load environment map
+      // 3. Load environment map
       const envName = state.get("studioEnvironment");
       await this.envManager.loadEnvironment(envName, renderer);
       if (!this._active) return;
 
-      // 5. Apply ALL rendering changes atomically
+      // 4. Apply ALL rendering changes atomically
       const scene = this._ctx.getScene();
       const camera = this._ctx.getCamera();
       this.envManager.apply(
@@ -199,12 +186,6 @@ class StudioManager {
         state.get("studioEnvRotation"),
       );
 
-      // 6. Override camera, axes, grid (after env is loaded so
-      //    ortho subscriber doesn't trigger reapplyEnv with null texture)
-      if (this._savedViewState?.ortho) this._ctx.setOrtho(false);
-      if (this._savedViewState?.axes) this._ctx.setAxes(false);
-      if (state.get("grid").some(Boolean)) this._ctx.setGrids([false, false, false]);
-
       // Lighting: disable CAD lights; environment IBL provides all illumination
       this._ctx.getAmbientLight().intensity = 0;
       this._ctx.getDirectLight().intensity = 0;
@@ -292,20 +273,9 @@ class StudioManager {
       this._savedClippingState = null;
     }
 
-    // 7. Clear active flag (before restoring view state, so subscribers don't re-apply studio)
+    // 7. Clear active flag; edges restored by ObjectGroup.leaveStudioMode()
     this._active = false;
 
-    // 8. Restore camera, axes, grid
-    if (this._savedViewState) {
-      const { ortho, axes, grid } = this._savedViewState;
-      if (ortho) this._ctx.setOrtho(true);
-      if (axes) this._ctx.setAxes(true);
-      if (grid.some(Boolean)) this._ctx.setGrids(grid);
-      this._savedViewState = null;
-    }
-
-    // 9. Edges restored by ObjectGroup.leaveStudioMode()
-
     this._ctx.update(true, false);
   };
 

package/src/core/types.ts

@@ -490,8 +490,7 @@ export type StateKey = keyof ViewerStateShape;
  * which the shader skips at near-zero cost.
  *
  * This is a data-format interface (describes JSON input), not a Three.js material.
- * Texture string fields reference either a key in the root-level `textures` table,
- * a data URI, or a URL resolved against the HTML page.
+ * Texture string fields are either a data URI or a URL resolved against the HTML page.
  */
 export interface MaterialAppearance {
   /** Display name */
@@ -649,28 +648,6 @@ export function isMaterialXMaterial(m: unknown): m is MaterialXMaterial {
   return typeof m === "object" && m !== null && "properties" in m;
 }
 
-// =============================================================================
-// Texture Entry (Studio Mode)
-// =============================================================================
-
-/**
- * Entry in the root-level `textures` table.
- *
- * Each entry is either embedded (base64-encoded image data) or a URL reference
- * loaded on demand. At least one of `data`+`format` or `url` must be provided.
- * An empty TextureEntry is invalid and will be ignored at runtime.
- * Multiple builtin preset texture fields can reference the same key for
- * deduplication. threejs-materials carry their own textures as inline data URIs.
- */
-export interface TextureEntry {
-  /** Base64-encoded image data (for embedded textures) */
-  data?: string;
-  /** Image format, e.g., "png", "jpg", "webp" (required when data is provided) */
-  format?: string;
-  /** URL to load the texture from (for URL-referenced textures) */
-  url?: string;
-}
-
 // =============================================================================
 // Studio Options
 // =============================================================================
@@ -881,9 +858,6 @@ export interface Shapes {
    *  - MaterialAppearance: preset with overrides (e.g., { builtin: "acrylic-clear", color: "#55a0e3" })
    */
   materials?: Record<string, string | MaterialXMaterial | MaterialAppearance> | undefined;
-  /** Shared texture table for builtin preset materials (root node).
-   *  threejs-materials carry their own textures inline. */
-  textures?: Record<string, TextureEntry> | undefined;
 }
 
 // =============================================================================

package/src/index.ts

@@ -133,7 +133,6 @@ export type { ColoredMaterial } from "./core/types.js";
 export type {
   MaterialAppearance,
   MaterialXMaterial,
-  TextureEntry,
   StudioOptions,
   StudioBackground,
   StudioModeOptions,

package/src/rendering/material-factory.ts

@@ -540,6 +540,8 @@ class MaterialFactory {
       if (COLOR_ARRAY_KEYS.has(key) && Array.isArray(prop.value)) {
         const [r, g, b] = prop.value as number[];
         matOptions[key] = new THREE.Color(r, g, b);
+      } else if ((key === "normalScale" || key === "clearcoatNormalScale") && Array.isArray(prop.value)) {
+        matOptions[key] = new THREE.Vector2(prop.value[0], prop.value[1]);
       } else if (key === "iridescenceThicknessRange" && Array.isArray(prop.value)) {
         matOptions[key] = prop.value;
       } else {

package/src/rendering/material-presets.ts

@@ -253,20 +253,6 @@ export const MATERIAL_PRESETS: Record<string, MaterialAppearance> = {
   // Natural / Other
   // ---------------------------------------------------------------------------
 
-  "wood-light": {
-    name: "Wood (Light)",
-    color: [0.89, 0.8, 0.68, 1],
-    metalness: 0.0,
-    roughness: 0.6,
-  },
-
-  "wood-dark": {
-    name: "Wood (Dark)",
-    color: [0.63, 0.51, 0.38, 1],
-    metalness: 0.0,
-    roughness: 0.55,
-  },
-
   "ceramic-white": {
     name: "Ceramic (White)",
     color: [0.98, 0.98, 0.97, 1],