@3driseai/3drise-viewer 0.1.22 → 0.1.24

package/dist/hooks/useLightLive.js

@@ -2,6 +2,14 @@ import { useConfigLiveHandle } from './useConfigLive.js';
 import { kelvinToColor } from '../components/lightBulb/kelvin.js';
 export const LIGHT_STRUCTURAL = [
     'shape', 'glass', 'glassTint', 'colorMode', 'on', 'targetPosition',
+    // spotBeam: the gobo is redrawn and the beam/emitter geometry is rebuilt.
+    'pattern', 'patternSoftness', 'patternRotation', 'beamMode', 'emitter',
+    // ledArray: the die layout is rebuilt. fluorescentTube: the tube geometry is.
+    'layout', 'count', 'rows', 'spacing', 'dieSize',
+    'tubes', 'tubeSpacing', 'length', 'diameter', 'startup',
+    // candle: the wax and wick are rebuilt, and the flame mode swaps meshes.
+    'body', 'waxColor', 'flameMode', 'smoke',
+    'height', 'radius', 'melt', 'flameHeight', 'flameWidth',
     'shadow.enabled', 'shadow.mapSize', 'shadow.cameraNear', 'shadow.cameraFar',
     'shadow.cameraLeft', 'shadow.cameraRight', 'shadow.cameraTop', 'shadow.cameraBottom',
     'shadow.cameraFov', 'shadow.focus',
@@ -9,8 +17,10 @@ export const LIGHT_STRUCTURAL = [
 const DIRECT = ['intensity', 'decay', 'distance', 'angle', 'penumbra'];
 const SHADOW = ['bias', 'normalBias', 'radius', 'intensity'];
 export function applyLightLive(light, overrides, config) {
-    const isBulb = config?.type === 'lightBulb';
-    const colorMode = isBulb ? (config.colorMode ?? 'temperature') : 'color';
+    // A type that has a colour-mode knob drives the light from either `color` or
+    // `temperature`; the plain lights only ever have `color`. Read the knob, not a
+    // list of type names — `config` here is the defaults-merged base.
+    const colorMode = typeof config?.colorMode === 'string' ? config.colorMode : 'color';
     for (const [key, value] of Object.entries(overrides)) {
         if (DIRECT.includes(key)) {
             if (typeof value === 'number' && key in light)

package/dist/hooks/useShadowApplication.d.ts

@@ -1,10 +1,10 @@
 import { Object3D } from "three";
 import type { Object3DSource } from "../utils/resolveObject3D";
 /**
- * Set castShadow / receiveShadow on every mesh under `obj`. An unset flag means
- * off: an object opts into shadows through its meshSettings, whatever its loader
- * or component set. Shared with ModelPrimitive, which calls it for models that
- * attach after this hook's effect has already run.
+ * Set castShadow / receiveShadow on every mesh under `obj`. Callers resolve an
+ * unset flag with `resolveShadowFlags(type, meshSettings)` from core, which
+ * falls back to the object type's default. Shared with ModelPrimitive, which
+ * calls it for models that attach after this hook's effect has already run.
  */
 export declare const applyShadowFlags: (obj: Object3D, castShadow: boolean | undefined, receiveShadow: boolean | undefined) => void;
 export declare const useShadowApplication: (source: Object3DSource, castShadow: boolean | undefined, receiveShadow: boolean | undefined, triggerKey?: unknown) => void;

package/dist/hooks/useShadowApplication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useShadowApplication.d.ts","sourceRoot":"","sources":["../../src/hooks/useShadowApplication.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,KAAK,QAAQ,EAAE,YAAY,OAAO,GAAG,SAAS,EAAE,eAAe,OAAO,GAAG,SAAS,KAAG,IASrH,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,cAAc,EAAE,YAAY,OAAO,GAAG,SAAS,EAAE,eAAe,OAAO,GAAG,SAAS,EAAE,aAAa,OAAO,KAAG,IASxJ,CAAC"}
+{"version":3,"file":"useShadowApplication.d.ts","sourceRoot":"","sources":["../../src/hooks/useShadowApplication.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,KAAK,QAAQ,EAAE,YAAY,OAAO,GAAG,SAAS,EAAE,eAAe,OAAO,GAAG,SAAS,KAAG,IAwBrH,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,QAAQ,cAAc,EAAE,YAAY,OAAO,GAAG,SAAS,EAAE,eAAe,OAAO,GAAG,SAAS,EAAE,aAAa,OAAO,KAAG,IASxJ,CAAC"}

package/dist/hooks/useShadowApplication.js

@@ -14,23 +14,38 @@
 // arrive.
 //
 import { useEffect } from 'react';
-import { traverseSkippingEdgesAndEffects } from '@3driseai/3drise-core';
+import { EDGES_GROUP_KEY, GEREATIVE_EFFECTS_KEY, IMAGE_KEY, SELF_OWNED_MATERIAL_KEY } from '@3driseai/3drise-core';
 import { resolveObject3D } from "../utils/resolveObject3D.js";
 /**
- * Set castShadow / receiveShadow on every mesh under `obj`. An unset flag means
- * off: an object opts into shadows through its meshSettings, whatever its loader
- * or component set. Shared with ModelPrimitive, which calls it for models that
- * attach after this hook's effect has already run.
+ * Set castShadow / receiveShadow on every mesh under `obj`. Callers resolve an
+ * unset flag with `resolveShadowFlags(type, meshSettings)` from core, which
+ * falls back to the object type's default. Shared with ModelPrimitive, which
+ * calls it for models that attach after this hook's effect has already run.
  */
 export const applyShadowFlags = (obj, castShadow, receiveShadow) => {
     const cast = castShadow ?? false;
     const receive = receiveShadow ?? false;
-    traverseSkippingEdgesAndEffects(obj, true, (child) => {
-        if (child.isMesh) {
-            child.castShadow = cast;
-            child.receiveShadow = receive;
+    // Stop at another object's root. A group's CreatedObject wraps its children's
+    // CreatedObjects, so a plain traverse would push the group's flags onto every
+    // descendant object and overwrite their own settings. Each object marks its
+    // root with userData.id.
+    const rootId = obj.userData?.id;
+    const walk = (node, isRoot) => {
+        if (!isRoot) {
+            const data = node.userData;
+            if (data?.[EDGES_GROUP_KEY] || data?.[GEREATIVE_EFFECTS_KEY] || data?.[SELF_OWNED_MATERIAL_KEY] || data?.[IMAGE_KEY])
+                return;
+            if (data?.id !== undefined && data.id !== rootId)
+                return;
         }
-    });
+        if (node.isMesh) {
+            node.castShadow = cast;
+            node.receiveShadow = receive;
+        }
+        for (const child of node.children)
+            walk(child, false);
+    };
+    walk(obj, true);
 };
 export const useShadowApplication = (source, castShadow, receiveShadow, triggerKey) => {
     useEffect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3driseai/3drise-viewer",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -39,6 +39,6 @@
   },
   "dependencies": {
     "@3driseai/3drise-common": "^1.0.1",
-    "@3driseai/3drise-core": "^1.0.15"
+    "@3driseai/3drise-core": "^1.0.17"
   }
 }