@3driseai/3drise-viewer 0.1.19 → 0.1.21

package/dist/components/CreatedObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAUnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,UAAU,kBAAmB,SAAQ,gBAAgB;IACjD,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACpH;AAGD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAgF9C,CAAC;AAEH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAUnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,UAAU,kBAAmB,SAAQ,gBAAgB;IACjD,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACpH;AAGD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAmF9C,CAAC;AAEH,eAAe,aAAa,CAAC"}

package/dist/components/CreatedObject.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useRef, useEffect, useState, memo } from "react";
+import { useRef, useEffect, useState, useReducer, memo } from "react";
+import { ModelMaterialPassContext } from "./ModelMaterialPassContext.js";
 import { DEFAULT_EDGES_SETTINGS } from "@3driseai/3drise-core";
 import { useMaterialApplication } from "../hooks/useMaterialApplication.js";
 import { useShadowApplication } from "../hooks/useShadowApplication.js";
@@ -29,7 +30,10 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
     const [mountedObject, setMountedObject] = useState(null);
     useObjectEdges(createdObject.id, createdObject.edgesSettings ?? DEFAULT_EDGES_SETTINGS, meshRef);
     // useObjectGenerativeEffects(mountedObject, createdObject.effects);
-    useMaterialApplication(meshRef, createdObject.materialSettings, shouldApply3driseMaterial);
+    // Bumped when the model-level material pass lands, so per-mesh overrides
+    // (useNodeOverrides in ModelPrimitive) re-apply on top of it.
+    const [materialPass, bumpMaterialPass] = useReducer((n) => n + 1, 0);
+    useMaterialApplication(meshRef, createdObject.materialSettings, shouldApply3driseMaterial, bumpMaterialPass);
     useShadowApplication(meshRef, createdObject.meshSettings.castShadow, createdObject.meshSettings.receiveShadow);
     const anchoredPosition = cameraManager.getAnchorPosition(createdObject.meshSettings.anchor?.anchor || 'center', 0, createdObject.meshSettings.anchor?.offset || { y: 0, x: 0, z: 0 }, createdObject.meshSettings.anchor?.padding || 0);
     useEffect(() => {
@@ -77,19 +81,19 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
         e.stopPropagation();
     };
     const anchorEnabled = createdObject.meshSettings.anchor && createdObject.meshSettings.anchor.enabled;
-    return (_jsx(AnimatedObject
-    // animationId={createdObject.animationId || ''}
-    , { 
+    return (_jsx(ModelMaterialPassContext.Provider, { value: materialPass, children: _jsx(AnimatedObject
         // animationId={createdObject.animationId || ''}
-        stateKey: createdObject.id, transitionSettings: {
-            ...animatedTransform,
-            position: anchorEnabled ? [anchoredPosition.x, anchoredPosition.y, anchoredPosition.z] : animatedTransform.position
-        }, createdObject: createdObject, 
-        // animateMaterial={!useDreiMaterials}
-        parentRef: meshRef, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, visible: createdObject.meshSettings.visible, handleObjectClick: handleObjectClick, onPointerEnter: handleObjectEnter, onPointerLeave: e => handleObjectLeave(e), hovered: hovered, children: createdObject.rigidBodySettings?.enabled ? (_jsx(RigidBody, { type: createdObject.rigidBodySettings?.type || 'dynamic', mass: createdObject.rigidBodySettings?.mass || 1, colliders: createdObject.userData?.type === 'plane'
-                ? 'cuboid' // Force box collider for planes
-                : undefined // Auto-detect for others
-            , friction: createdObject.rigidBodySettings?.friction, restitution: createdObject.rigidBodySettings?.restitution, gravityScale: createdObject.rigidBodySettings?.gravityScale ?? 1, linearDamping: createdObject.rigidBodySettings?.linearDamping ?? 0.01, angularDamping: createdObject.rigidBodySettings?.angularDamping ?? 0.01, children: children })) : (children) }));
+        , { 
+            // animationId={createdObject.animationId || ''}
+            stateKey: createdObject.id, transitionSettings: {
+                ...animatedTransform,
+                position: anchorEnabled ? [anchoredPosition.x, anchoredPosition.y, anchoredPosition.z] : animatedTransform.position
+            }, createdObject: createdObject, 
+            // animateMaterial={!useDreiMaterials}
+            parentRef: meshRef, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, visible: createdObject.meshSettings.visible, handleObjectClick: handleObjectClick, onPointerEnter: handleObjectEnter, onPointerLeave: e => handleObjectLeave(e), hovered: hovered, children: createdObject.rigidBodySettings?.enabled ? (_jsx(RigidBody, { type: createdObject.rigidBodySettings?.type || 'dynamic', mass: createdObject.rigidBodySettings?.mass || 1, colliders: createdObject.userData?.type === 'plane'
+                    ? 'cuboid' // Force box collider for planes
+                    : undefined // Auto-detect for others
+                , friction: createdObject.rigidBodySettings?.friction, restitution: createdObject.rigidBodySettings?.restitution, gravityScale: createdObject.rigidBodySettings?.gravityScale ?? 1, linearDamping: createdObject.rigidBodySettings?.linearDamping ?? 0.01, angularDamping: createdObject.rigidBodySettings?.angularDamping ?? 0.01, children: children })) : (children) }) }));
 });
 CreatedObject.displayName = 'CreatedObject';
 export default CreatedObject;

package/dist/components/ModelMaterialPassContext.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Bumped by CreatedObject every time its model-level material pass
+ * (useMaterialApplication) finishes. Per-mesh overrides re-apply on top of it, because
+ * the pass replaces every material in the model — including the ones an override set.
+ */
+export declare const ModelMaterialPassContext: import("react").Context<number>;
+//# sourceMappingURL=ModelMaterialPassContext.d.ts.map

package/dist/components/ModelMaterialPassContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelMaterialPassContext.d.ts","sourceRoot":"","sources":["../../src/components/ModelMaterialPassContext.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,iCAAmB,CAAC"}

package/dist/components/ModelMaterialPassContext.js

@@ -0,0 +1,7 @@
+import { createContext } from 'react';
+/**
+ * Bumped by CreatedObject every time its model-level material pass
+ * (useMaterialApplication) finishes. Per-mesh overrides re-apply on top of it, because
+ * the pass replaces every material in the model — including the ones an override set.
+ */
+export const ModelMaterialPassContext = createContext(0);

package/dist/components/ModelPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ModelPrimitive.d.ts","sourceRoot":"","sources":["../../src/components/ModelPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoC,MAAM,OAAO,CAAC;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAGnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,UAAU,mBAAoB,SAAQ,gBAAgB;IAClD,aAAa,EAAE,qBAAqB,CAAC;IACrC,kFAAkF;IAClF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,SAAS,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA8BhD,CAAC;AAIH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"ModelPrimitive.d.ts","sourceRoot":"","sources":["../../src/components/ModelPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAKnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,UAAU,mBAAoB,SAAQ,gBAAgB;IAClD,aAAa,EAAE,qBAAqB,CAAC;IACrC,kFAAkF;IAClF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,SAAS,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAkChD,CAAC;AAIH,eAAe,cAAc,CAAC"}

package/dist/components/ModelPrimitive.js

@@ -1,6 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo, useCallback, useRef } from 'react';
+import { memo, useCallback, useMemo, useRef } from 'react';
 import { useModelObject } from '../hooks/useModelObject.js';
+import { useNodeOverrides } from '../hooks/useNodeOverrides.js';
+import { getNodeOverrides, peekModelAsset } from '@3driseai/3drise-core';
 import { useObjectReadyReporter } from '../hooks/useObjectReady.js';
 /**
  * Mounts the Object3D behind a `type: 'model'` scene object, and hands it to the host
@@ -32,6 +34,10 @@ import { useObjectReadyReporter } from '../hooks/useObjectReady.js';
 const ModelPrimitive = memo(({ createdObject, slot = 0, onObjectReady, onObjectDispose, children }) => {
     const attachedRef = useRef(null);
     const object = useModelObject(createdObject, slot);
+    // Per-mesh overrides (ModelTree). Originals come from the never-mounted cache master.
+    const url = createdObject.userData?.url;
+    const master = useMemo(() => (url ? peekModelAsset(url)?.scene ?? null : null), [url, object]);
+    useNodeOverrides(object, getNodeOverrides(createdObject), master);
     const { report, reportDisposed } = useObjectReadyReporter(createdObject, onObjectReady, onObjectDispose);
     const setObjectRef = useCallback((instance) => {
         if (instance) {

package/dist/components/ParticlesGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ParticlesGenerator.d.ts","sourceRoot":"","sources":["../../src/components/ParticlesGenerator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAO7D,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D,QAAQ,EAAE,2BAA2B,CAAC;CACzC;AAED,0FAA0F;AAC1F,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAazD,CAAC;AACF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"ParticlesGenerator.d.ts","sourceRoot":"","sources":["../../src/components/ParticlesGenerator.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAU7D,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D,QAAQ,EAAE,2BAA2B,CAAC;CACzC;AAED,0FAA0F;AAC1F,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAgBzD,CAAC;AACF,eAAe,kBAAkB,CAAC"}

package/dist/components/ParticlesGenerator.js

@@ -4,6 +4,9 @@ import BrownianDustParticles from './particles/BrownianDustParticles.js';
 import BioluminescentWakeParticles from './particles/BioluminescentWakeParticles.js';
 import ElectronOrbitalsParticles from './particles/ElectronOrbitalsParticles.js';
 import GrinderSparksParticles from './particles/GrinderSparksParticles.js';
+import ChladniSandParticles from './particles/ChladniSandParticles.js';
+import FaradayPowderParticles from './particles/FaradayPowderParticles.js';
+import NeonRainParticles from './particles/NeonRainParticles.js';
 /** Standalone generative particle objects (type 'particles'), switched on config.type. */
 const ParticlesGenerator = ({ settings, onObjectReady, onObjectDispose }) => {
     const { config, animations } = settings;
@@ -17,6 +20,9 @@ const ParticlesGenerator = ({ settings, onObjectReady, onObjectDispose }) => {
         case 'bioluminescentWake': return _jsx(BioluminescentWakeParticles, { id: settings.id, size: size, config: config, animations: animations, ...ready });
         case 'electronOrbitals': return _jsx(ElectronOrbitalsParticles, { id: settings.id, size: size, config: config, animations: animations, ...ready });
         case 'grinderSparks': return _jsx(GrinderSparksParticles, { id: settings.id, size: size, config: config, animations: animations, ...ready });
+        case 'chladniSand': return _jsx(ChladniSandParticles, { id: settings.id, size: size, config: config, animations: animations, ...ready });
+        case 'faradayPowder': return _jsx(FaradayPowderParticles, { id: settings.id, size: size, config: config, animations: animations, ...ready });
+        case 'neonRain': return _jsx(NeonRainParticles, { id: settings.id, size: size, config: config, animations: animations, ...ready });
         default: return null;
     }
 };

package/dist/components/particles/ChladniSandParticles.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import type { ObjectAnimations, ChladniSandParticlesConfig } from '@3driseai/3drise-core';
+import type { ObjectReadyProps } from '../../types/objectReady';
+export interface ChladniSandParticlesProps extends ObjectReadyProps {
+    /** Scene object id: the controller finds the live-edit handle by it. */
+    id?: string;
+    /** World size of the object (units); the object's transform scales it further. */
+    size: number;
+    config: ChladniSandParticlesConfig;
+    /** Per-domain keyframes; the `particles` domain drives this object's config knobs. */
+    animations?: ObjectAnimations;
+}
+declare const ChladniSandParticles: React.FC<ChladniSandParticlesProps>;
+export default ChladniSandParticles;
+//# sourceMappingURL=ChladniSandParticles.d.ts.map

package/dist/components/particles/ChladniSandParticles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ChladniSandParticles.d.ts","sourceRoot":"","sources":["../../../src/components/particles/ChladniSandParticles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmE,MAAM,OAAO,CAAC;AAIxF,OAAO,KAAK,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAC;AAM1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D,wEAAwE;IACxE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,0BAA0B,CAAC;IACnC,sFAAsF;IACtF,UAAU,CAAC,EAAE,gBAAgB,CAAC;CACjC;AAsvBD,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAiD7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}