@3driseai/3drise-viewer 0.1.21 → 0.1.23

package/dist/hooks/useShadowApplication.js

@@ -14,8 +14,39 @@
 // 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`. 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;
+    // 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(() => {
         // Read the ref here, not at the call site: effects run after React has
@@ -23,13 +54,6 @@ export const useShadowApplication = (source, castShadow, receiveShadow, triggerK
         const obj = resolveObject3D(source);
         if (!obj)
             return;
-        const cast = castShadow ?? false;
-        const receive = receiveShadow ?? false;
-        traverseSkippingEdgesAndEffects(obj, true, (child) => {
-            if (child.isMesh) {
-                child.castShadow = cast;
-                child.receiveShadow = receive;
-            }
-        });
+        applyShadowFlags(obj, castShadow, receiveShadow);
     }, [source, castShadow, receiveShadow, triggerKey]);
 };

package/package.json

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