@3driseai/3drise-viewer 0.1.5 → 0.1.7

package/dist/hooks/useGridSurface.js

@@ -0,0 +1,66 @@
+import { useMemo, useRef } from 'react';
+import * as THREE from 'three';
+import { useFrame } from '@react-three/fiber';
+/**
+ * Per-frame plumbing shared by every shader-plane grid in this package.
+ *
+ * Advances `u_time` with the raw clock (each shader applies its own
+ * `u_animSpeed`, matching MyGridMaterial), mirrors the pointer into `u_mouse`
+ * as NDC — the 3drise convention — projects the pointer onto the grid's own
+ * plane for `u_focus` when `followMouse` is on, and drives `u_reveal` toward
+ * its target.
+ *
+ * The pick plane is derived from the mesh's world matrix rather than hard-coded
+ * to XZ, so the projection stays correct whether the grid lies flat or stands
+ * upright, and whether or not the host applied a transform above it.
+ *
+ * Reveal is driven at a constant *rate* rather than by replaying a fixed
+ * timeline, so retargeting mid-flight — the dissolve that starts while the
+ * build is still running — continues smoothly from wherever it had got to
+ * instead of snapping back to the start.
+ */
+export function useGridSurface(materialRef, meshRef, options = {}) {
+    const { followMouse = false, reveal = 1, revealDuration = 0 } = options;
+    const scratch = useMemo(() => ({
+        ray: new THREE.Raycaster(),
+        plane: new THREE.Plane(),
+        hit: new THREE.Vector3(),
+        origin: new THREE.Vector3(),
+        normal: new THREE.Vector3(),
+    }), []);
+    // Starts at 0 when it has a duration to travel, so the first frame is the
+    // beginning of the build rather than a flash of the finished grid.
+    const revealNow = useRef(revealDuration > 0 ? 0 : reveal);
+    useFrame((state, delta) => {
+        const material = materialRef.current;
+        if (!material)
+            return;
+        material.u_time = state.clock.elapsedTime;
+        material.u_mouse.copy(state.pointer);
+        const target = THREE.MathUtils.clamp(reveal, 0, 1);
+        if (revealDuration > 0) {
+            const step = delta / revealDuration;
+            const remaining = target - revealNow.current;
+            revealNow.current += Math.sign(remaining) * Math.min(Math.abs(remaining), step);
+        }
+        else {
+            revealNow.current = target;
+        }
+        material.u_reveal = revealNow.current;
+        const mesh = meshRef.current;
+        if (!followMouse || !mesh)
+            return;
+        const { ray, plane, hit, origin, normal } = scratch;
+        mesh.updateWorldMatrix(true, false);
+        // A PlaneGeometry lives in local XY, so local +Z is its normal.
+        normal.set(0, 0, 1).transformDirection(mesh.matrixWorld).normalize();
+        origin.setFromMatrixPosition(mesh.matrixWorld);
+        plane.setFromNormalAndCoplanarPoint(normal, origin);
+        ray.setFromCamera(state.pointer, state.camera);
+        if (ray.ray.intersectPlane(plane, hit)) {
+            mesh.worldToLocal(hit);
+            material.u_focus.set(hit.x, hit.y);
+        }
+    });
+}
+export default useGridSurface;

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

@@ -1 +1 @@
-{"version":3,"file":"useGsapAnimation.d.ts","sourceRoot":"","sources":["../../src/hooks/useGsapAnimation.ts"],"names":[],"mappings":"AA2BA;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2C7B,CAAC;AACF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,eAAc,GAAG,EAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwPxD,CAAC;AACF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"useGsapAnimation.d.ts","sourceRoot":"","sources":["../../src/hooks/useGsapAnimation.ts"],"names":[],"mappings":"AA2BA;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2C7B,CAAC;AACF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,eAAc,GAAG,EAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqPxD,CAAC;AACF,eAAe,gBAAgB,CAAC"}

package/dist/hooks/useGsapAnimation.js

@@ -75,7 +75,6 @@ export const useGsapAnimation = (dependencies = []) => {
      * Animates multiple 3D objects with the given settings
      */
     const animateObjects = (objects, settings = DEFAULT_SETTINGS) => {
-        console.log("Animating objects with settings:", settings, objects);
         const finalSettings = { ...DEFAULT_SETTINGS, ...settings };
         objects.forEach((object, index) => {
             const targetPosition = new THREE.Vector3(...(finalSettings.position || [0, 0, 0]));
@@ -217,10 +216,8 @@ export const useGsapAnimation = (dependencies = []) => {
      * Pulses objects (scale up and down)
      */
     const animatePulse = useCallback((objects, settings = {}) => {
-        console.log("Animating pulse for objects", objects, "with settings", settings);
         objects.forEach((object, index) => {
             const delay = (settings.delay || 0) + (index * 0.1);
-            console.log("Animating pulse for object", object, "with delay", delay);
             gsap.to(object.scale, {
                 x: 2.2,
                 y: 2.2,

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

@@ -1 +1 @@
-{"version":3,"file":"useInteraction.d.ts","sourceRoot":"","sources":["../../src/hooks/useInteraction.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAA4B,MAAM,uBAAuB,CAAC;AAatG,wBAAgB,cAAc,CAAC,EAE/B,cAAc,EAAE,SAAS,GAAG,EAAE;IAClB,cAAc,EAAE,WAAW,CAAC;IAC5B,SAAS,EAAE,iBAAiB,EAAE,CAAC;CAClC;;;;;EAwPR;AACD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"useInteraction.d.ts","sourceRoot":"","sources":["../../src/hooks/useInteraction.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAA4B,MAAM,uBAAuB,CAAC;AAatG,wBAAgB,cAAc,CAAC,EAE/B,cAAc,EAAE,SAAS,GAAG,EAAE;IAClB,cAAc,EAAE,WAAW,CAAC;IAC5B,SAAS,EAAE,iBAAiB,EAAE,CAAC;CAClC;;;;;EA+NR;AACD,eAAe,cAAc,CAAC"}

package/dist/hooks/useInteraction.js

@@ -42,7 +42,6 @@ cameraSettings, sequences, }) {
         if (!targetIds || targetIds.length === 0) {
             return [currentRef];
         }
-        console.log('[useInteraction] resolveTargets:', { targetIds, targetMode });
         const targetRefs = [];
         // Add current object if mode is 'add'
         if (targetMode === 'add') {
@@ -54,9 +53,6 @@ cameraSettings, sequences, }) {
             if (obj) {
                 targetRefs.push(obj);
             }
-            else {
-                console.warn(`[useInteraction] Target not found: ${id}`);
-            }
         });
         return targetRefs.length > 0 ? targetRefs : [currentRef];
     }, []);
@@ -66,16 +62,11 @@ cameraSettings, sequences, }) {
     const triggerAnimations = useCallback((animationIds) => {
         if (!animationIds || animationIds.length === 0)
             return;
-        console.log('[useInteraction] triggerAnimations:', animationIds);
-        console.log('Available sequences:', sequences.map(s => s.id));
         animationIds.forEach(animationId => {
             const sequence = sequences.find(s => s.id === animationId);
             if (sequence) {
                 AnimationsManager.playSequence(sequence);
             }
-            else {
-                console.warn(`[useInteraction] Sequence not found: ${animationId}`);
-            }
         });
     }, [sequences]);
     // ===========================================================================
@@ -89,7 +80,6 @@ cameraSettings, sequences, }) {
         const defaultDistance = 2.0;
         const isCurrentlySelected = currentAnimatedRef.current !== null;
         const isSameObject = currentAnimatedRef.current?.uuid === ref.uuid;
-        console.log('[useInteraction] executeOperation:', operation);
         switch (operation) {
             case 'vanish': {
                 if (isVanished(ref.uuid)) {
@@ -188,7 +178,6 @@ cameraSettings, sequences, }) {
                         mat.needsUpdate = true;
                     }
                     catch (err) {
-                        console.error('[useInteraction] Failed to load texture:', err);
                     }
                 }
                 break;
@@ -198,10 +187,7 @@ cameraSettings, sequences, }) {
             case 'delete':
             case 'toggle':
             case 'loadProject':
-                console.log(`[useInteraction] ${operation} - not implemented for scene interactions`);
                 break;
-            default:
-                console.warn(`[useInteraction] Unknown operation: ${operation}`);
         }
     }, [
         isVanished,
@@ -222,7 +208,6 @@ cameraSettings, sequences, }) {
     const executeOperations = useCallback((operations, ref, createdObject, textureUrl) => {
         if (!operations || operations.length === 0)
             return;
-        console.log('[useInteraction] executeOperations:', operations);
         operations.forEach(operation => {
             executeOperation(operation, ref, createdObject, textureUrl);
         });
@@ -234,19 +219,9 @@ cameraSettings, sequences, }) {
         const { interaction, ref, createdObject } = params;
         if (!interaction.enabled)
             return;
-        console.log('[useInteraction] executeInteraction:', {
-            mouseEvent: interaction.mouseEvent,
-            operations: interaction.operations,
-            targetIds: interaction.targetIds,
-            animationIds: interaction.animationIds
-        });
         let textureUrl = undefined;
         if (interaction.operations?.includes('displayImage')) {
-            console.log('Display Image interaction triggered:', {
-                ref,
-            });
             textureUrl = ref.userData?.url;
-            console.log('Texture URL:', textureUrl);
         }
         // 1. Resolve target objects
         const targets = resolveTargets(interaction, ref);

package/dist/hooks/useInteractionEffects.d.ts

@@ -1,11 +1,11 @@
 import type { CreatedObjectSettings } from '@3driseai/3drise-core';
-import { Object3D } from "three";
+import type { Object3DSource } from "../utils/resolveObject3D";
 export interface UseInteractionEffectsOptions {
     enabled?: boolean;
     animateMaterial?: boolean;
 }
 export interface UseInteractionEffectsResult {
 }
-export declare const useMouseMove: (objectSettings: CreatedObjectSettings | null, options: UseInteractionEffectsOptions, object: Object3D) => UseInteractionEffectsResult;
+export declare const useMouseMove: (objectSettings: CreatedObjectSettings | null, options?: UseInteractionEffectsOptions, objectSource?: Object3DSource) => UseInteractionEffectsResult;
 export default useMouseMove;
 //# sourceMappingURL=useInteractionEffects.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useInteractionEffects.d.ts","sourceRoot":"","sources":["../../src/hooks/useInteractionEffects.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,MAAM,WAAW,4BAA4B;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,2BAA2B;CAC3C;AAqDD,eAAO,MAAM,YAAY,GAAI,gBAAgB,qBAAqB,GAAG,IAAI,EAAE,SAAS,4BAAiC,EAAE,QAAQ,QAAQ,KAAG,2BAoBzI,CAAC;AACF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"useInteractionEffects.d.ts","sourceRoot":"","sources":["../../src/hooks/useInteractionEffects.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,MAAM,WAAW,4BAA4B;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,2BAA2B;CAC3C;AAqDD,eAAO,MAAM,YAAY,GAAI,gBAAgB,qBAAqB,GAAG,IAAI,EAAE,UAAS,4BAAiC,EAAE,eAAe,cAAc,KAAG,2BAqBtJ,CAAC;AACF,eAAe,YAAY,CAAC"}

package/dist/hooks/useInteractionEffects.js

@@ -1,5 +1,6 @@
 import { useFrame } from "@react-three/fiber";
 import { detectAnimatableDomain, handleEdgesMouseMove, handleMaterialMouseMove, handleTransformMouseMove, } from '@3driseai/3drise-core';
+import { resolveObject3D } from "../utils/resolveObject3D.js";
 // =============================================================================
 // FLAT-SHAPE BACK COMPAT
 // =============================================================================
@@ -50,9 +51,10 @@ function resolveDomains(settings) {
 // =============================================================================
 // useMouseMove
 // =============================================================================
-export const useMouseMove = (objectSettings, options = {}, object) => {
+export const useMouseMove = (objectSettings, options = {}, objectSource) => {
     const { enabled = true, animateMaterial = true } = options;
     useFrame((state) => {
+        const object = resolveObject3D(objectSource);
         if (!enabled || !object || !objectSettings)
             return;
         const domains = resolveDomains(objectSettings);

package/dist/hooks/useMaterialApplication.d.ts

@@ -1,4 +1,4 @@
 import type { MaterialSettings } from '@3driseai/3drise-core';
-import { Object3D } from "three";
-export declare const useMaterialApplication: (obj: Object3D | null | undefined, materialSettings: MaterialSettings, shouldApply3driseMaterial?: boolean, onApplied?: () => void) => void;
+import type { Object3DSource } from "../utils/resolveObject3D";
+export declare const useMaterialApplication: (source: Object3DSource, materialSettings: MaterialSettings, shouldApply3driseMaterial?: boolean, onApplied?: () => void) => void;
 //# sourceMappingURL=useMaterialApplication.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useMaterialApplication.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialApplication.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAIjC,eAAO,MAAM,sBAAsB,GAAI,KAAK,QAAQ,GAAG,IAAI,GAAG,SAAS,EAAE,kBAAkB,gBAAgB,EAAE,4BAA4B,OAAO,EAAE,YAAY,MAAM,IAAI,KAAG,IAiJ1K,CAAC"}
+{"version":3,"file":"useMaterialApplication.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialApplication.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,eAAO,MAAM,sBAAsB,GAAI,QAAQ,cAAc,EAAE,kBAAkB,gBAAgB,EAAE,4BAA4B,OAAO,EAAE,YAAY,MAAM,IAAI,KAAG,IAuIhK,CAAC"}

package/dist/hooks/useMaterialApplication.js

@@ -7,9 +7,8 @@
 //
 import { useEffect, useRef } from 'react';
 import { createAndApplyMaterial, MATERIAL_INSTANCE_KEY, MaterialRegistryAPI, ObjectManager, resolveTextures, traverseSkippingEdgesAndEffects } from '@3driseai/3drise-core';
-// TEST: 0=raw defaults, 1=+DoubleSide, 2=+transparent, 3=+metalness/roughness
-const TEST_MATERIAL_MODE = 1;
-export const useMaterialApplication = (obj, materialSettings, shouldApply3driseMaterial, onApplied) => {
+import { resolveObject3D } from "../utils/resolveObject3D.js";
+export const useMaterialApplication = (source, materialSettings, shouldApply3driseMaterial, onApplied) => {
     // Track all material instances we've created so we can release them on change/unmount
     // const { getTypeByName } = useObjectTypes();
     const activeInstancesRef = useRef([]);
@@ -24,14 +23,18 @@ export const useMaterialApplication = (obj, materialSettings, shouldApply3driseM
         return found;
     };
     useEffect(() => {
+        // Read the ref here, not at the call site: effects run after React has
+        // attached refs, so this is the first point the object reliably exists.
+        const obj = resolveObject3D(source);
         if (!obj || !materialSettings || materialSettings.materialType === 'advanced' ||
-            materialSettings.materialVariant === '3dRiseShader' || (shouldApply3driseMaterial === false))
+            materialSettings.materialVariant === '3dRiseShader'
+            || (shouldApply3driseMaterial === false))
             return;
         handleSettingsChange(obj, materialSettings);
         return () => {
             releaseActiveInstances();
         };
-    }, [materialSettings, obj]);
+    }, [materialSettings, source]);
     // Unmount-only cleanup: dispose everything once the mesh leaves the scene.
     useEffect(() => {
         return () => {
@@ -53,29 +56,22 @@ export const useMaterialApplication = (obj, materialSettings, shouldApply3driseM
         activeInstancesRef.current = [];
     };
     const handleSettingsChange = async (obj, materialSettings) => {
-        // console.log('Applying material with settings:', { obj, materialSettings });
         if (!obj || !materialSettings || materialSettings.materialType === 'advanced')
             return;
-        // console.log('Applying material with settings:',obj.name, obj);
         // const originObject: Object3D | null = getOriginObject(obj);
         const applyMaterial = materialSettings.apply !== undefined ? materialSettings.apply : true;
-        // console.log({applyMaterial});
         // If apply is false, restore original materials
         if (!applyMaterial) {
             const objectId = obj.userData?.id;
-            // console.log({objectId})
             if (objectId) {
                 releaseActiveInstances();
                 ObjectManager.restoreOriginalMaterials(objectId);
-                // console.log(`Restored original materials for object ID ${objectId}`);
             }
             onApplied?.();
             return;
         }
         const materialType = MaterialRegistryAPI.getTypeDefinition(materialSettings.materialType);
-        // console.log('Material type definition:', materialType);
         if (!materialType) {
-            console.error(`Material type "${materialSettings.materialType}" not found in registry.`);
             return;
         }
         const firstVariant = Object.keys(materialType.variants)[0];
@@ -84,12 +80,9 @@ export const useMaterialApplication = (obj, materialSettings, shouldApply3driseM
         const resolvedSettings = await resolveTextures(variant, materialSettings);
         // 2. Traverse the object tree and apply material to any child with .material.
         const objectids = materialSettings.objectIds || [];
-        // console.log(originObject)
-        // console.log({ objectids });
         if (obj) {
             if (objectids.length > 0) {
                 let meshes = [];
-                // console.log('Applying material to specific object IDs:', objectids);
                 obj.traverse((child) => {
                     if (child && child.name && objectids.includes(child.name)) {
                         meshes.push(child);
@@ -97,16 +90,13 @@ export const useMaterialApplication = (obj, materialSettings, shouldApply3driseM
                 });
                 meshes.forEach(mesh => mesh.traverse((child) => {
                     if (child && child.material) {
-                        // console.log('Applying material to child:', child.name);
                         applyMaterialToChild(child, variant, resolvedSettings);
                     }
                 }));
                 return;
             }
             traverseSkippingEdgesAndEffects(obj, true, (child) => {
-                // console.log('Traversing child:', child.name, child);
                 if (child && child.material) {
-                    // console.log('Applying material to child:');
                     applyMaterialToChild(child, variant, resolvedSettings);
                 }
             });
@@ -139,8 +129,7 @@ export const useMaterialApplication = (obj, materialSettings, shouldApply3driseM
             // else if (TEST_MATERIAL_MODE === 3) {
             //   object.material = new MeshStandardMaterial({ side: DoubleSide, transparent: true, metalness: 0.5, roughness: 0.5 });
             //   return;
-            // }
-            // console.log(`Applying material to object ${object.name} with variant "${variant}" and settings:`, resolvedSettings);
+            // } 
             const materialInstance = createAndApplyMaterial(variant, resolvedSettings);
             // materialInstance.material.side = FrontSide; // Default to FrontSide; specific variants can override to DoubleSide in their defaultSettings
             // Assign to the object
@@ -151,7 +140,6 @@ export const useMaterialApplication = (obj, materialSettings, shouldApply3driseM
             object.userData[MATERIAL_INSTANCE_KEY] = materialInstance;
         }
         catch (error) {
-            console.error(`Failed to apply material "${variant}" to object:`, error);
         }
     };
 };

package/dist/hooks/useMaterialOptions.d.ts

@@ -1,5 +1,5 @@
 import { MaterialRegistryAPI } from '@3driseai/3drise-core';
-import type { CreatedObjectType, DisplayMode, MaterialSettings, SelectOptions } from '@3driseai/3drise-core';
+import type { CreatedObjectType, MaterialSettings, ModeGroup, SelectOptions } from '@3driseai/3drise-core';
 type RegistryMaterialType = Exclude<Parameters<typeof MaterialRegistryAPI.getVariants>[0], undefined>;
 export interface UseMaterialOptionsReturn {
     selectedType: RegistryMaterialType;
@@ -9,6 +9,6 @@ export interface UseMaterialOptionsReturn {
     handleTypeChange: (type: RegistryMaterialType) => void;
     handleVariantChange: (variant: string) => void;
 }
-export declare const useMaterialOptions: (initialSettings: MaterialSettings, onSettingsChange?: (newSettings: MaterialSettings) => void, objectType?: CreatedObjectType, displayMode?: DisplayMode) => UseMaterialOptionsReturn;
+export declare const useMaterialOptions: (initialSettings: MaterialSettings, onSettingsChange?: (newSettings: MaterialSettings) => void, objectType?: CreatedObjectType, surface?: ModeGroup) => UseMaterialOptionsReturn;
 export {};
 //# sourceMappingURL=useMaterialOptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useMaterialOptions.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE7G,KAAK,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAEtG,MAAM,WAAW,wBAAwB;IACrC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,aAAa,CAAC;IACnC,cAAc,EAAE,aAAa,CAAC;IAC9B,gBAAgB,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACvD,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClD;AAED,eAAO,MAAM,kBAAkB,GAAI,iBAAiB,gBAAgB,EAAE,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,KAAK,IAAI,EAAE,aAAY,iBAA0B,EAAE,cAAa,WAAqB,KAAG,wBAkH9M,CAAC"}
+{"version":3,"file":"useMaterialOptions.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAA2B,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3G,KAAK,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAEtG,MAAM,WAAW,wBAAwB;IACrC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,aAAa,CAAC;IACnC,cAAc,EAAE,aAAa,CAAC;IAC9B,gBAAgB,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACvD,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClD;AAED,eAAO,MAAM,kBAAkB,GAAI,iBAAiB,gBAAgB,EAAE,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,KAAK,IAAI,EAAE,aAAY,iBAA0B,EAAE,UAAS,SAAkB,KAAG,wBA0FvM,CAAC"}

package/dist/hooks/useMaterialOptions.js

@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
-import { MaterialRegistryAPI } from '@3driseai/3drise-core';
+import { MaterialRegistryAPI, materialTypeFitsSurface } from '@3driseai/3drise-core';
 import { FrontSide } from 'three';
-export const useMaterialOptions = (initialSettings, onSettingsChange, objectType = 'mesh', displayMode = 'solid') => {
+export const useMaterialOptions = (initialSettings, onSettingsChange, objectType = 'mesh', surface = 'mesh') => {
     // Ensure we always have a valid material type
     const validType = (initialSettings.materialType || 'basic');
     const [selectedType, setSelectedType] = useState(validType);
@@ -12,42 +12,23 @@ export const useMaterialOptions = (initialSettings, onSettingsChange, objectType
     // updates or edge-type resets). Without this, the dropdowns stay stale after
     // any external materialType / materialVariant change.
     useEffect(() => {
-        // console.log('useMaterialOptions - syncing with new initialSettings:', initialSettings);
         const newType = initialSettings.materialType || 'basic';
         setSelectedType(newType);
         const variants = MaterialRegistryAPI.getVariants(newType);
         setSelectedVariant(initialSettings.materialVariant || variants[0] || '');
     }, [initialSettings.materialType, initialSettings.materialVariant]);
     const allmaterialTypes = MaterialRegistryAPI.getTypes();
-    const is3dRiseShaderMaterial = initialSettings.materialType === 'particles' || initialSettings.materialType === 'custom';
-    const isLineMaterial = initialSettings.materialType === 'line';
-    const meshMaterialTypes = allmaterialTypes.filter(type => type !== 'particles' && type !== 'custom' && type !== 'line');
-    const lineMaterialTypes = allmaterialTypes.filter(type => type === 'line');
-    const dRiseShaderMaterialTypes = allmaterialTypes.filter(type => type === 'particles' || type === 'custom');
-    const materialTypeOptions = () => {
-        if (objectType === 'mesh') {
-            return allmaterialTypes.map((type) => ({
-                value: type,
-                label: type.charAt(0).toUpperCase() + type.slice(1)
-            }));
-        }
-        if (is3dRiseShaderMaterial) {
-            return dRiseShaderMaterialTypes.map((type) => ({
-                value: type,
-                label: type.charAt(0).toUpperCase() + type.slice(1)
-            }));
-        }
-        if (isLineMaterial) {
-            return lineMaterialTypes.map((type) => ({
-                value: type,
-                label: type.charAt(0).toUpperCase() + type.slice(1)
-            }));
-        }
-        return meshMaterialTypes.map((type) => ({
-            value: type,
-            label: type.charAt(0).toUpperCase() + type.slice(1)
-        }));
-    };
+    // Offer only the families that can actually draw on this object's surface.
+    // A <points> takes the `particles` family and nothing else; every other
+    // surface takes everything except it. Note this keys off the surface, never
+    // off the currently selected material — the previous version did the latter,
+    // which meant an object could never get back to a family once it left it.
+    const materialTypeOptions = () => allmaterialTypes
+        .filter((type) => materialTypeFitsSurface(type, surface))
+        .map((type) => ({
+        value: type,
+        label: type.charAt(0).toUpperCase() + type.slice(1)
+    }));
     // is3dRiseShaderMaterial ?
     // dRiseShaderMaterialTypes.map((type: string) => ({
     //   value: type,
@@ -64,11 +45,9 @@ export const useMaterialOptions = (initialSettings, onSettingsChange, objectType
         label: variant
     }));
     const handleTypeChange = (type) => {
-        // console.log('Material type changed to:', type);
         setSelectedType(type);
         const availableVariants = MaterialRegistryAPI.getVariants(type);
         const defaultVariant = availableVariants[0];
-        // console.log({defaultVariant})
         setSelectedVariant(defaultVariant);
         // Auto-select first variant when type changes
         if (defaultVariant) {
@@ -76,7 +55,6 @@ export const useMaterialOptions = (initialSettings, onSettingsChange, objectType
         }
     };
     const handleVariantChange = (variant) => {
-        console.log('Material variant changed to:', variant);
         setSelectedVariant(variant);
         handleMaterialUpdate(selectedType, variant);
     };
@@ -86,7 +64,6 @@ export const useMaterialOptions = (initialSettings, onSettingsChange, objectType
         try {
             const variantDefinition = MaterialRegistryAPI.getVariantDefinition(variant);
             if (!variantDefinition) {
-                console.warn(`Variant definition for "${variant}" not found.`);
                 return;
             }
             // Start fresh from the new variant's defaults — this ensures
@@ -104,7 +81,6 @@ export const useMaterialOptions = (initialSettings, onSettingsChange, objectType
             onSettingsChange(newSettings);
         }
         catch (error) {
-            console.error('Error updating material:', error);
         }
     };
     return {

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

@@ -1 +1 @@
-{"version":3,"file":"useMeshController.d.ts","sourceRoot":"","sources":["../../src/hooks/useMeshController.ts"],"names":[],"mappings":"AACA,wBAAgB,iBAAiB,IAAI,GAAG,CAqKvC;AACD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"useMeshController.d.ts","sourceRoot":"","sources":["../../src/hooks/useMeshController.ts"],"names":[],"mappings":"AACA,wBAAgB,iBAAiB,IAAI,GAAG,CAqJvC;AACD,eAAe,iBAAiB,CAAC"}

package/dist/hooks/useMeshController.js

@@ -6,9 +6,7 @@ export function useMeshController() {
         wireframe: { value: false },
     };
     // const createMeshes = (meshes: BaseMeshOptions[]): CreatedObjectSettings[] => {
-    //   console.log("Creating meshes with data:", meshes);
     //   const createdObjectsSettings: CreatedObjectSettings[] = [];
-    //   // console.log("createMeshes...", meshes);
     //   if (!Array.isArray(meshes)) return [];
     //   meshes.forEach(mesh => {
     //     try {
@@ -19,7 +17,6 @@ export function useMeshController() {
     //         id,
     //         type: meshType
     //       };
-    //       // console.log({ meshData });
     //       // let createdObject: CreatedRef | null = ;
     //       const createdObject: CreatedRef = {
     //         id,
@@ -50,19 +47,14 @@ export function useMeshController() {
     //           active: true
     //         }));
     //       }
-    //       // console.log("Created object settings:", createdObjectSettings);
     //       createdObjectsSettings.push(createdObjectSettings);
-    //         console.log("Created mesh:", createdObject.name);
     //     } catch (error) {
-    //       console.error(`Error creating mesh of type ${(mesh as any).type}:`, error);
     //     }
     //   });
     //   return createdObjectsSettings;
     // }
     const createObjects = (objects) => {
-        console.log("Creating meshes with data:", objects);
         const createdObjectsSettings = [];
-        // console.log("createMeshes...", meshes);
         if (!Array.isArray(objects))
             return [];
         objects.forEach(object => {
@@ -80,7 +72,6 @@ export function useMeshController() {
                     type: objectType,
                     id,
                 };
-                console.log({ meshData });
                 // let createdObject: CreatedRef | null = ;
                 const meshCreationResult = createMeshByType(meshData);
                 if (!meshCreationResult)
@@ -90,7 +81,6 @@ export function useMeshController() {
                     name: object.name || `mesh-${id}`,
                     object: meshCreationResult.mesh
                 };
-                console.log("Created object:", createdObject);
                 createdObject && ObjectManager.addObject(createdObject);
                 if (!createdObject)
                     return;
@@ -104,12 +94,9 @@ export function useMeshController() {
                 };
                 if (object.animations) {
                 }
-                // console.log("Created object settings:", createdObjectSettings);
                 createdObjectsSettings.push(createdObjectSettings);
-                console.log("Created mesh:", createdObject.name);
             }
             catch (error) {
-                console.error(`Error creating mesh of type ${object.type}:`, error);
             }
         });
         return createdObjectsSettings;
@@ -117,11 +104,9 @@ export function useMeshController() {
     const createMaterialSettings = (meshData) => {
         // let materialVariant = 'Standard';
         // if (!meshData.material) {
-        //   console.warn("Mesh data is missing material property:", meshData);
         //   // return;
         // }
         // if (!meshData.material.variant) {
-        //   console.warn("Mesh data is missing material variant:", meshData);
         //   // return;
         // }
         const materialVariant = meshData.material &&
@@ -144,7 +129,6 @@ export function useMeshController() {
                 ...materialInstance.settings
             };
         }
-        // console.log("Default settings for material ", materialVariant, ":", defaultSettings);
         Object.keys(meshData.material || {}).forEach(key => {
             if (defaultSettings[key]) {
                 defaultSettings[key] = meshData.material[key];

package/dist/hooks/useObjectAnimation.d.ts

@@ -1,13 +1,24 @@
 import type { CreatedObjectSettings } from '@3driseai/3drise-core';
 import type { UseContinuousEffectsResult } from './useContinuousEffects';
 import type { UseInteractionEffectsResult } from './useInteractionEffects';
-import { Object3D } from "three";
+import type { Object3DSource } from '../utils/resolveObject3D';
 interface UseObjectAnimationOptions {
     enabled?: boolean;
     hovered?: boolean;
 }
 interface UseObjectAnimationResult extends UseContinuousEffectsResult, UseInteractionEffectsResult {
 }
-export declare const useObjectAnimation: (objectSettings: CreatedObjectSettings | null, animateMaterial: boolean, options?: UseObjectAnimationOptions, ref?: Object3D) => UseObjectAnimationResult | null;
+/**
+ * Drive every continuous animation for one scene object.
+ *
+ * Pass the **ref** the caller put on its own group. The hooks below read
+ * `.current` inside useFrame, so the object resolves as soon as React attaches
+ * it — no re-render required, and no per-render scene traversal.
+ *
+ * With no `object` at all, the object is looked up by id once, from inside the
+ * frame loop, as a fallback for callers that only hold settings. That path
+ * needs `SceneStore.scene` to be populated (see `useRegisterScene`).
+ */
+export declare const useObjectAnimation: (objectSettings: CreatedObjectSettings | null, animateMaterial: boolean, options?: UseObjectAnimationOptions, object?: Object3DSource) => UseObjectAnimationResult | null;
 export {};
 //# sourceMappingURL=useObjectAnimation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useObjectAnimation.d.ts","sourceRoot":"","sources":["../../src/hooks/useObjectAnimation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,UAAU,yBAAyB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,wBAAyB,SAAQ,0BAA0B,EAAE,2BAA2B;CACjG;AASD,eAAO,MAAM,kBAAkB,GAAI,gBAAgB,qBAAqB,GAAG,IAAI,EAAE,iBAAiB,OAAO,EAAE,UAAS,yBAA8B,EAAE,MAAM,QAAQ,KAAG,wBAAwB,GAAG,IAwB/L,CAAC"}
+{"version":3,"file":"useObjectAnimation.d.ts","sourceRoot":"","sources":["../../src/hooks/useObjectAnimation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE/D,UAAU,yBAAyB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,wBAAyB,SAAQ,0BAA0B,EAAE,2BAA2B;CACjG;AAGD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,kBAAkB,GAAI,gBAAgB,qBAAqB,GAAG,IAAI,EAAE,iBAAiB,OAAO,EAAE,UAAS,yBAA8B,EAAE,SAAS,cAAc,KAAG,wBAAwB,GAAG,IAexM,CAAC"}