@3driseai/3drise-viewer 0.1.2 → 0.1.4

package/dist/components/Lines.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useMemo } from 'react';
 import { PositionsCreator } from '@3driseai/3drise-core';
 import Path from './Path.js';
-const Lines = ({ createdObject, transitionSettings }) => {
+const Lines = ({ createdObject, transitionSettings, onObjectReady, onObjectDispose }) => {
     if (!createdObject)
         return null;
     const { config } = createdObject;
@@ -14,6 +14,6 @@ const Lines = ({ createdObject, transitionSettings }) => {
         : config.shapeType;
     const curves = useMemo(() => PositionsCreator.generatePaths(config.shapeType), [config.shapeType]);
     const targetCurves = useMemo(() => PositionsCreator.generatePaths(targetShape), [targetShape]);
-    return (_jsx(_Fragment, { children: curves.map((currentCurve, index) => (_jsx(Path, { curve: currentCurve, targetCurve: targetCurves[index % targetCurves.length], duration: 1, color: color }, `path-${index}`))) }));
+    return (_jsx(_Fragment, { children: curves.map((currentCurve, index) => (_jsx(Path, { curve: currentCurve, targetCurve: targetCurves[index % targetCurves.length], duration: 1, color: color, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }, `path-${index}`))) }));
 };
 export default Lines;

package/dist/components/Moon.d.ts

@@ -1,10 +1,9 @@
-import type { Mesh } from 'three';
+import type { ObjectReadyProps } from '../types/objectReady';
 import React from "react";
 import type { MoonSettings } from "@3driseai/3drise-core";
-export interface MoonProps {
+export interface MoonProps extends ObjectReadyProps {
     settings?: MoonSettings;
     sunPosition?: [number, number, number];
-    onMeshReady?: (mesh: Mesh) => void;
 }
 export type { MoonSettings };
 export { defaultMoonSettings } from '@3driseai/3drise-core';

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

@@ -1 +1 @@
-{"version":3,"file":"Moon.d.ts","sourceRoot":"","sources":["../../src/components/Moon.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;CACtC;AAED,YAAY,EAAE,YAAY,EAAE,CAAC;AAG7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,QAAA,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAyD7B,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"Moon.d.ts","sourceRoot":"","sources":["../../src/components/Moon.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,MAAM,WAAW,SAAU,SAAQ,gBAAgB;IAC/C,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CAC1C;AAED,YAAY,EAAE,YAAY,EAAE,CAAC;AAG7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,QAAA,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CA0D7B,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/dist/components/Moon.js

@@ -1,11 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useObjectReady } from '../hooks/useObjectReady.js';
 import { useRef, useEffect, useState, useCallback } from 'react';
 import { TextureLoader, Vector3 } from 'three';
 import { useFrame } from '@react-three/fiber';
 export { defaultMoonSettings } from '@3driseai/3drise-core';
 const MOON_TEXTURE_URL = "https://3d-rise.sfo3.cdn.digitaloceanspaces.com/app/images/moon_1024.jpg";
-const Moon = ({ settings, sunPosition, onMeshReady }) => {
+const Moon = ({ settings, sunPosition, onObjectReady, onObjectDispose }) => {
     const meshRef = useRef(null);
+    const rootRef = useRef(null);
+    useObjectReady(rootRef, settings, onObjectReady, onObjectDispose);
     const lightRef = useRef(null);
     const targetRef = useRef(null);
     const [texture, setTexture] = useState(null);
@@ -37,9 +40,8 @@ const Moon = ({ settings, sunPosition, onMeshReady }) => {
     const handleMeshRef = useCallback((mesh) => {
         if (mesh) {
             meshRef.current = mesh;
-            onMeshReady?.(mesh);
         }
-    }, [onMeshReady]);
+    }, []);
     useFrame((state) => {
         const moonPos = sunPosition ?? s.position;
         if (meshRef.current && s.enableOrbit) {
@@ -60,7 +62,7 @@ const Moon = ({ settings, sunPosition, onMeshReady }) => {
         }
     });
     const moonPos = sunPosition ?? s.position;
-    return (_jsxs("group", { userData: { id: '3drise-moon' }, children: [_jsx("object3D", { ref: targetRef, position: moonPos }), _jsx("directionalLight", { ref: lightRef, intensity: 2, color: 0xffffff, target: targetRef.current ?? undefined }), _jsxs("mesh", { ref: handleMeshRef, position: moonPos, rotation: s.rotation, scale: s.scale, visible: s.visible, children: [_jsx("sphereGeometry", { args: [1, 32, 32] }), _jsx("meshPhongMaterial", { color: 0xb2b2b2, normalMap: texture, shininess: 0 })] })] }));
+    return (_jsxs("group", { ref: rootRef, userData: { id: '3drise-moon' }, children: [_jsx("object3D", { ref: targetRef, position: moonPos }), _jsx("directionalLight", { ref: lightRef, intensity: 2, color: 0xffffff, target: targetRef.current ?? undefined }), _jsxs("mesh", { ref: handleMeshRef, position: moonPos, rotation: s.rotation, scale: s.scale, visible: s.visible, children: [_jsx("sphereGeometry", { args: [1, 32, 32] }), _jsx("meshPhongMaterial", { color: 0xb2b2b2, normalMap: texture, shininess: 0 })] })] }));
 };
 Moon.displayName = 'Moon';
 export default Moon;

package/dist/components/MyGrid.d.ts

@@ -1,6 +1,7 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import type { ThreeElements } from '@react-three/fiber';
 import type { MyGridConfig } from '@3driseai/3drise-core';
-export interface MyGridProps {
+export interface MyGridProps extends ObjectReadyProps {
     config?: MyGridConfig;
     groupProps?: ThreeElements['group'];
 }
@@ -10,6 +11,6 @@ export interface MyGridProps {
  * and any preset/serialization layer.
  */
 export declare const defaultMyGridConfig: MyGridConfig;
-export declare function MyGrid({ config, groupProps }: MyGridProps): import("react").JSX.Element;
+export declare function MyGrid({ config, groupProps, onObjectReady, onObjectDispose }: MyGridProps): import("react").JSX.Element;
 export default MyGrid;
 //# sourceMappingURL=MyGrid.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MyGrid.d.ts","sourceRoot":"","sources":["../../src/components/MyGrid.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,MAAM,WAAW,WAAW;IACxB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,UAAU,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CACvC;AAID;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,YAuBjC,CAAC;AACF,wBAAgB,MAAM,CAAC,EAAE,MAA4B,EAAE,UAAU,EAAE,EAAE,WAAW,+BAkC/E;AACD,eAAe,MAAM,CAAC"}
+{"version":3,"file":"MyGrid.d.ts","sourceRoot":"","sources":["../../src/components/MyGrid.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAI7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACjD,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,UAAU,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CACvC;AAID;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,EAAE,YAuBjC,CAAC;AACF,wBAAgB,MAAM,CAAC,EAAE,MAA4B,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,WAAW,+BAoC/G;AACD,eAAe,MAAM,CAAC"}

package/dist/components/MyGrid.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useObjectReady } from '../hooks/useObjectReady.js';
 import { useMemo, useRef } from 'react';
 import * as THREE from 'three';
 import { useFrame } from '@react-three/fiber';
@@ -34,8 +35,10 @@ export const defaultMyGridConfig = {
     bgOpacity: 0,
     followMouse: false,
 };
-export function MyGrid({ config = defaultMyGridConfig, groupProps }) {
+export function MyGrid({ config = defaultMyGridConfig, groupProps, onObjectReady, onObjectDispose }) {
     const matRef = useRef(null);
+    const rootRef = useRef(null);
+    useObjectReady(rootRef, config, onObjectReady, onObjectDispose);
     const meshRef = useRef(null);
     const { cellSize, size, segments, flat, lineMode, cellMode, lineWidth, sectionSize, sectionWidth, animSpeed, animScale, animIntensity, fadeDistance, fadeStrength, displace, lineColor, sectionColor, cellColor, glowColor, bgColor, bgOpacity, followMouse, } = config;
     const segs = segments ?? (displace > 0 ? Math.max(64, Math.ceil(size / cellSize) * 2) : 1);
@@ -67,6 +70,6 @@ export function MyGrid({ config = defaultMyGridConfig, groupProps }) {
             }
         }
     });
-    return (_jsx("group", { ...groupProps, children: _jsxs("mesh", { ref: meshRef, rotation: flat ? [-Math.PI / 2, 0, 0] : [0, 0, 0], children: [_jsx("planeGeometry", { args: [size, size, segs, segs] }), _jsx("myGridMaterial", { ref: matRef, transparent: true, depthWrite: false, blending: THREE.AdditiveBlending, side: THREE.DoubleSide, u_cellSize: cellSize, u_lineWidth: lineWidth, u_sectionSize: sectionSize, u_sectionWidth: sectionWidth, u_lineMode: lineMode, u_cellMode: cellMode, u_animSpeed: animSpeed, u_animScale: animScale, u_animIntensity: animIntensity, u_fadeDistance: fade, u_fadeStrength: fadeStrength, u_displace: displace, u_lineColor: colors.line, u_sectionColor: colors.section, u_cellColor: colors.cell, u_glowColor: colors.glow, u_bgColor: colors.bg, u_bgOpacity: bgOpacity }, MyGridMaterial.key)] }) }));
+    return (_jsx("group", { ref: rootRef, ...groupProps, children: _jsxs("mesh", { ref: meshRef, rotation: flat ? [-Math.PI / 2, 0, 0] : [0, 0, 0], children: [_jsx("planeGeometry", { args: [size, size, segs, segs] }), _jsx("myGridMaterial", { ref: matRef, transparent: true, depthWrite: false, blending: THREE.AdditiveBlending, side: THREE.DoubleSide, u_cellSize: cellSize, u_lineWidth: lineWidth, u_sectionSize: sectionSize, u_sectionWidth: sectionWidth, u_lineMode: lineMode, u_cellMode: cellMode, u_animSpeed: animSpeed, u_animScale: animScale, u_animIntensity: animIntensity, u_fadeDistance: fade, u_fadeStrength: fadeStrength, u_displace: displace, u_lineColor: colors.line, u_sectionColor: colors.section, u_cellColor: colors.cell, u_glowColor: colors.glow, u_bgColor: colors.bg, u_bgOpacity: bgOpacity }, MyGridMaterial.key)] }) }));
 }
 export default MyGrid;

package/dist/components/ObjectNode.d.ts

@@ -1,11 +1,11 @@
+import type { ObjectReadyProps } from "../types/objectReady";
 import React from "react";
 import { Object3D } from "three";
 import type { CameraState, CreatedObjectSettings, ObjectTreeNode } from "@3driseai/3drise-core";
 import { type ThreeEvent } from "@react-three/fiber";
-type ObjectNodeProps = {
+type ObjectNodeProps = ObjectReadyProps & {
     node: ObjectTreeNode;
     cameraSettings: CameraState;
-    onObjectReady?: (object: CreatedObjectSettings, ref: Object3D) => void;
     handleObjectClick?: (object: CreatedObjectSettings, ref: Object3D, event: ThreeEvent<MouseEvent>) => void;
 };
 declare const ObjectNode: React.FC<ObjectNodeProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"ObjectNode.d.ts","sourceRoot":"","sources":["../../src/components/ObjectNode.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,KAAK,eAAe,GAAG;IACnB,IAAI,EAAE,cAAc,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;IACvE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC7G,CAAC;AA8BF,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+FzC,CAAC;AACF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"ObjectNode.d.ts","sourceRoot":"","sources":["../../src/components/ObjectNode.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,KAAK,eAAe,GAAG,gBAAgB,GAAG;IACtC,IAAI,EAAE,cAAc,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC7G,CAAC;AA0BF,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA4GzC,CAAC;AACF,eAAe,UAAU,CAAC"}

package/dist/components/ObjectNode.js

@@ -13,16 +13,11 @@ import LightObject from "./LightObject.js";
 import EnvironmentObject from "./EnvironmentObject.js";
 import Galaxy from "./Galaxy.js";
 import GridGenerator from "./GridsGenerator.js";
-// Types whose React component instantiates and drives its own ShaderMaterial.
-// useMaterialApplication would otherwise traverse the mesh tree and replace
-// that material with a registry-default instance, breaking config-driven
-// uniform updates (e.g. only ringRadius worked on glyphs because that drives
-// geometry, not the material).
 const SELF_MANAGED_MATERIAL = new Set([
     'effect',
     // 'gallery',
     'earth',
-    'solarSystem',
+    'space',
     'shootingStars',
     'grid',
     // 'moon'
@@ -35,18 +30,24 @@ const SELF_MANAGED_MATERIAL = new Set([
 //             ))}
 //         </>
 //     ) : null;
-const GroupWithChildren = ({ createdObject, children, cameraSettings, onObjectReady, handleObjectClick, renderObject }) => {
+const GroupWithChildren = ({ createdObject, children, cameraSettings, onObjectReady, onObjectDispose, handleObjectClick, renderObject }) => {
     const isGroup = createdObject.type === 'group';
     const selfManagedMaterial = SELF_MANAGED_MATERIAL.has(createdObject.type);
-    return (_jsxs(CreatedObject, { createdObject: createdObject, onObjectReady: onObjectReady, handleObjectClick: handleObjectClick, shouldApply3driseMaterial: !isGroup && !selfManagedMaterial, children: [!isGroup && renderObject(createdObject, handleObjectClick), children.map(childNode => (_jsx(ObjectNode, { node: childNode, cameraSettings: cameraSettings, handleObjectClick: handleObjectClick, onObjectReady: onObjectReady }, childNode.objectId)))] }, createdObject.id));
+    return (_jsxs(CreatedObject, { createdObject: createdObject, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, handleObjectClick: handleObjectClick, shouldApply3driseMaterial: !isGroup && !selfManagedMaterial, children: [!isGroup && renderObject(createdObject, handleObjectClick), children.map(childNode => (_jsx(ObjectNode, { node: childNode, cameraSettings: cameraSettings, handleObjectClick: handleObjectClick, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }, childNode.objectId)))] }, createdObject.id));
 };
-const ObjectNode = ({ node, cameraSettings, onObjectReady, handleObjectClick }) => {
+const ObjectNode = ({ node, cameraSettings, onObjectReady, onObjectDispose, handleObjectClick }) => {
     const { children, createdObject } = node;
     // console.log(createdObject.meshSettings.name, createdObject.actions, createdObject.mouseMove)
+    // Children describe themselves with their own settings; the scene above
+    // knows them by the node's createdObject, so relabel on the way up.
+    const relabel = useCallback((obj) => ({
+        onObjectReady: (_object, ref) => onObjectReady && onObjectReady(obj, ref),
+        onObjectDispose: (_object, ref) => onObjectDispose && onObjectDispose(obj, ref),
+    }), [onObjectReady, onObjectDispose]);
     // Specialized renderers for each object type
     const renderers = useMemo(() => ({
         group: () => null,
-        mesh: (obj, cameraSettings, onObjectReady) => (_jsx(CustomPrimitive, { createdObject: obj, onObjectReady: onObjectReady, handleObjectClick: handleObjectClick }, obj.id)),
+        mesh: (obj, cameraSettings, onObjectReady) => (_jsx(CustomPrimitive, { createdObject: obj, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, handleObjectClick: handleObjectClick }, obj.id)),
         // water: (obj: CreatedObjectSettings, cameraSettings: CameraState, onObjectReady?: (object: CreatedObjectSettings, ref: Object3D) => void) => (
         //     <Ocean
         //         settings={obj}
@@ -62,7 +63,7 @@ const ObjectNode = ({ node, cameraSettings, onObjectReady, handleObjectClick })
         //         settings={obj}
         //     />
         // ),
-        model: (obj, cameraSettings, onObjectReady) => (_jsx(CustomPrimitive, { createdObject: obj, onObjectReady: onObjectReady, handleObjectClick: handleObjectClick }, obj.id)),
+        model: (obj, cameraSettings, onObjectReady) => (_jsx(CustomPrimitive, { createdObject: obj, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, handleObjectClick: handleObjectClick }, obj.id)),
         // custom_primitive: (obj: CreatedObjectSettings, cameraSettings: CameraState, onObjectReady?: (object: CreatedObjectSettings, ref: Object3D) => void) => (
         //     <CustomPrimitive
         //         key={obj.id}
@@ -74,24 +75,24 @@ const ObjectNode = ({ node, cameraSettings, onObjectReady, handleObjectClick })
         text: (obj, cameraSettings, onObjectReady) => {
             const renderMode = obj.config?.renderMode ?? 'bitmap';
             return (_jsx(_Fragment, { children: renderMode === 'text3d'
-                    ? _jsx(Text3D, { textSettings: obj })
-                    : _jsx(Text2D, { textSettings: obj }) }));
+                    ? _jsx(Text3D, { textSettings: obj, ...relabel(obj) })
+                    : _jsx(Text2D, { textSettings: obj, ...relabel(obj) }) }));
         },
         particles: (obj, cameraSettings, onObjectReady) => {
             const particlesSettings = obj;
-            return (_jsxs(_Fragment, { children: [particlesSettings.config?.particles && (_jsx(ParticlesR3f, { particlesSettings: particlesSettings, cameraFov: cameraSettings.fov, duration: 1, transitionSettings: particlesSettings.meshSettings })), particlesSettings.config?.paths && (_jsx(Lines, { createdObject: particlesSettings }))] }));
+            return (_jsxs(_Fragment, { children: [particlesSettings.config?.particles && (_jsx(ParticlesR3f, { particlesSettings: particlesSettings, cameraFov: cameraSettings.fov, duration: 1, transitionSettings: particlesSettings.meshSettings, ...relabel(obj) })), particlesSettings.config?.paths && (_jsx(Lines, { createdObject: particlesSettings, ...relabel(obj) }))] }));
         },
-        path: (obj, cameraSettings, onObjectReady) => (_jsx(PathRenderer, { pathSettings: obj.config }, obj.id)),
+        path: (obj, cameraSettings, onObjectReady) => (_jsx(PathRenderer, { pathSettings: obj.config, ...relabel(obj) }, obj.id)),
         grid: (obj, cameraSettings, onObjectReady) => (
         // <GridHelper {...(obj.config as GridConfig)} side={2} />
-        _jsx(GridGenerator, { config: obj.config })),
+        _jsx(GridGenerator, { config: obj.config, ...relabel(obj) })),
         effect: (obj) => (_jsx(EffectsGenerator, { settings: {
                 config: obj.config,
-            } }, obj.id)),
-        gallery: (obj, cameraSettings, onObjectReady) => (_jsx(GalleryLayout, { createdObject: obj, handleObjectClick: handleObjectClick })),
-        light: (obj, cameraSettings, onObjectReady) => (_jsx(LightObject, { createdObject: obj })),
-        environment: (obj, cameraSettings, onObjectReady) => (_jsx(EnvironmentObject, { createdObject: obj })),
-        space: (obj, cameraSettings, onObjectReady) => (_jsx(Galaxy, { createdObject: obj, onObjectReady: onObjectReady })),
+            }, ...relabel(obj) }, obj.id)),
+        gallery: (obj, cameraSettings, onObjectReady) => (_jsx(GalleryLayout, { createdObject: obj, handleObjectClick: handleObjectClick, ...relabel(obj) })),
+        light: (obj, cameraSettings, onObjectReady) => (_jsx(LightObject, { createdObject: obj, ...relabel(obj) })),
+        environment: (obj, cameraSettings, onObjectReady) => (_jsx(EnvironmentObject, { createdObject: obj, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose })),
+        space: (obj, cameraSettings, onObjectReady) => (_jsx(Galaxy, { createdObject: obj, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose })),
         // rain: (obj: CreatedObjectSettings, cameraSettings: CameraState, onObjectReady?: (object: CreatedObjectSettings, ref: Object3D) => void) => (
         //     <Rain
         //         settings={obj}
@@ -112,22 +113,21 @@ const ObjectNode = ({ node, cameraSettings, onObjectReady, handleObjectClick })
         //         settings={obj.config as ShootingStarsSettings}
         //     />
         // ),
-    }), [handleObjectClick]);
+    }), [handleObjectClick, onObjectReady, onObjectDispose, relabel]);
+    const renderObject = useCallback((obj, handleObjectClick) => {
+        // console.log('Rendering object:', obj);
+        const renderer = renderers[obj.type];
+        return renderer?.(obj, cameraSettings, onObjectReady) ?? null;
+    }, [cameraSettings, onObjectReady, renderers]);
     if (!createdObject) {
         console.warn(`createdObject not found.`);
         return null;
     }
-    const meshSettings = createdObject.meshSettings;
     const hasChildren = children.length > 0;
     const shouldRenderAsGroup = hasChildren || createdObject.type === 'group' || createdObject.type === 'effect';
-    const renderObject = useCallback((obj, handleObjectClick) => {
-        // console.log('Rendering object:', obj);
-        const renderer = renderers[obj.type];
-        return renderer?.(obj, cameraSettings, onObjectReady) ?? null;
-    }, [cameraSettings, onObjectReady, renderers]);
     const renderedObject = shouldRenderAsGroup
-        ? _jsx(GroupWithChildren, { createdObject: createdObject, children: children, cameraSettings: cameraSettings, onObjectReady: onObjectReady, handleObjectClick: handleObjectClick, renderObject: renderObject })
-        : _jsx(CreatedObject, { createdObject: createdObject, onObjectReady: onObjectReady, handleObjectClick: handleObjectClick, shouldApply3driseMaterial: !SELF_MANAGED_MATERIAL.has(createdObject.type), children: renderObject(createdObject) }, createdObject.id);
+        ? _jsx(GroupWithChildren, { createdObject: createdObject, children: children, cameraSettings: cameraSettings, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, handleObjectClick: handleObjectClick, renderObject: renderObject })
+        : _jsx(CreatedObject, { createdObject: createdObject, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, handleObjectClick: handleObjectClick, shouldApply3driseMaterial: !SELF_MANAGED_MATERIAL.has(createdObject.type), children: renderObject(createdObject) }, createdObject.id);
     // createdObject.effects
     //     ? <>
     //         {renderObject(createdObject)}

package/dist/components/ObjectNodeApi.d.ts

@@ -1,11 +1,11 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import React from "react";
 import { Object3D } from "three";
 import type { CameraState, CreatedObjectSettings } from "@3driseai/3drise-core";
 import { type ThreeEvent } from "@react-three/fiber";
-type ObjectNodeApiProps = {
+type ObjectNodeApiProps = ObjectReadyProps & {
     objectId: string;
     cameraSettings: CameraState;
-    onObjectReady?: (object: CreatedObjectSettings, ref: Object3D) => void;
     handleObjectClick?: (object: CreatedObjectSettings, ref: Object3D, event: ThreeEvent<MouseEvent>) => void;
 };
 declare const ObjectNodeApi: React.FC<ObjectNodeApiProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"ObjectNodeApi.d.ts","sourceRoot":"","sources":["../../src/components/ObjectNodeApi.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,KAAK,kBAAkB,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,WAAW,CAAC;IAC5B,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAC;IACvE,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC7G,CAAC;AAGF,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAW/C,CAAC;AACF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ObjectNodeApi.d.ts","sourceRoot":"","sources":["../../src/components/ObjectNodeApi.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,KAAK,kBAAkB,GAAG,gBAAgB,GAAG;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,WAAW,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC7G,CAAC;AAGF,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAW/C,CAAC;AACF,eAAe,aAAa,CAAC"}

package/dist/components/ObjectNodeApi.js

@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
 // import { apiFetch } from '../utils/apiFetch';
 import ObjectNode from './ObjectNode.js';
 import { dataCenterServer } from '../constants.js';
-const ObjectNodeApi = ({ objectId, cameraSettings, onObjectReady, handleObjectClick }) => {
+const ObjectNodeApi = ({ objectId, cameraSettings, onObjectReady, onObjectDispose, handleObjectClick }) => {
     const [node, setNode] = useState(null);
     useEffect(() => {
         fetch(`${dataCenterServer}scene-objects/${objectId}/tree`)
@@ -13,6 +13,6 @@ const ObjectNodeApi = ({ objectId, cameraSettings, onObjectReady, handleObjectCl
     }, [objectId]);
     if (!node)
         return null;
-    return (_jsx(ObjectNode, { node: node, cameraSettings: cameraSettings, onObjectReady: onObjectReady, handleObjectClick: handleObjectClick }));
+    return (_jsx(ObjectNode, { node: node, cameraSettings: cameraSettings, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose, handleObjectClick: handleObjectClick }));
 };
 export default ObjectNodeApi;

package/dist/components/ObjectsRenderer.d.ts

@@ -1,8 +1,9 @@
 import type { AnimationSequence, GeneralObjectSettings, CameraState, CreatedObjectSettings } from '@3driseai/3drise-core';
+import type { ObjectReadyProps } from '../types/objectReady';
 import React from "react";
 import { Object3D } from "three";
 import { type ThreeEvent } from "@react-three/fiber";
-interface ObjectsRendererProps {
+interface ObjectsRendererProps extends ObjectReadyProps {
     cameraSettings: CameraState;
     generalObjectSettings: GeneralObjectSettings;
     createdObjects: CreatedObjectSettings[];

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

@@ -1 +1 @@
-{"version":3,"file":"ObjectsRenderer.d.ts","sourceRoot":"","sources":["../../src/components/ObjectsRenderer.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAG1H,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,UAAU,oBAAoB;IAC1B,cAAc,EAAE,WAAW,CAAC;IAC5B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,cAAc,EAAE,qBAAqB,EAAE,CAAC;IACxC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;IAC1G,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACnC;AAGD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAgClD,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ObjectsRenderer.d.ts","sourceRoot":"","sources":["../../src/components/ObjectsRenderer.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAI1H,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,oBAAqB,SAAQ,gBAAgB;IACnD,cAAc,EAAE,WAAW,CAAC;IAC5B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,cAAc,EAAE,qBAAqB,EAAE,CAAC;IACxC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;IAC1G,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACnC;AAGD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA6ClD,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/dist/components/ObjectsRenderer.js

@@ -3,17 +3,28 @@ import { memo, useRef, useCallback, useMemo } from 'react';
 import { buildObjectTree } from '@3driseai/3drise-core';
 import ObjectNode from './ObjectNode.js';
 import useInteraction from '../hooks/useInteraction.js';
-const ObjectsRenderer = memo(({ cameraSettings, createdObjects, generalObjectSettings, onObjectsReady, handleObjectClick, sequences = [], }) => {
+import { useObjectReady } from '../hooks/useObjectReady.js';
+const ObjectsRenderer = memo(({ cameraSettings, createdObjects, generalObjectSettings, onObjectsReady, onObjectReady, onObjectDispose, handleObjectClick, sequences = [], }) => {
     const groupRef = useRef(null);
     const objectsTree = useMemo(() => buildObjectTree(createdObjects), [createdObjects]);
     const readyObjectsCount = useRef(0);
-    const onObjectReady = useCallback((object, ref) => {
+    // Count for the aggregate onObjectsReady signal, then forward the event up.
+    // Previously this callback counted and dropped the (object, ref) pair, which
+    // is why nothing above ObjectsRenderer ever received an object ref.
+    const handleObjectReady = useCallback((object, ref) => {
         readyObjectsCount.current += 1;
         if (readyObjectsCount.current === objectsTree.length) {
             console.log("All objects are ready!");
             onObjectsReady && onObjectsReady();
         }
-    }, [objectsTree.length, onObjectsReady]);
+        onObjectReady && onObjectReady(object, ref);
+    }, [objectsTree.length, onObjectsReady, onObjectReady]);
+    const handleObjectDispose = useCallback((object, ref) => {
+        readyObjectsCount.current = Math.max(0, readyObjectsCount.current - 1);
+        onObjectDispose && onObjectDispose(object, ref);
+    }, [onObjectDispose]);
+    // The wrapper group itself is an Object3D the parent may want to transform.
+    useObjectReady(groupRef, generalObjectSettings, onObjectReady, onObjectDispose);
     function filterInteractionsByEvent(interactions, mouseEvent) {
         if (!interactions)
             return [];
@@ -34,7 +45,7 @@ const ObjectsRenderer = memo(({ cameraSettings, createdObjects, generalObjectSet
             handleObjectClick(createdObject, ref, event);
         }
     };
-    return (_jsx("group", { ref: groupRef, name: "main-objects", position: generalObjectSettings.meshSettings.position, rotation: generalObjectSettings.meshSettings.rotation, scale: generalObjectSettings.meshSettings.scale, children: objectsTree.map(node => (_jsx(ObjectNode, { node: node, cameraSettings: cameraSettings, onObjectReady: onObjectReady, handleObjectClick: handleObjectClickHandler }, node.objectId))) }));
+    return (_jsx("group", { ref: groupRef, name: "main-objects", position: generalObjectSettings.meshSettings.position, rotation: generalObjectSettings.meshSettings.rotation, scale: generalObjectSettings.meshSettings.scale, children: objectsTree.map(node => (_jsx(ObjectNode, { node: node, cameraSettings: cameraSettings, onObjectReady: handleObjectReady, onObjectDispose: handleObjectDispose, handleObjectClick: handleObjectClickHandler }, node.objectId))) }));
 });
 ObjectsRenderer.displayName = 'ObjectsRenderer';
 export default ObjectsRenderer;

package/dist/components/ObjectsRendererApi.d.ts

@@ -1,8 +1,9 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import React from "react";
 import { CreatedObjectSettings, CameraState, GeneralObjectSettings } from "@3driseai/3drise-core";
 import { type ThreeEvent } from "@react-three/fiber";
 import { Object3D } from "three";
-export interface ObjectsRendererApiProps {
+export interface ObjectsRendererApiProps extends ObjectReadyProps {
     objectIds: string[];
     cameraSettings: CameraState;
     generalObjectSettings: GeneralObjectSettings;

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

@@ -1 +1 @@
-{"version":3,"file":"ObjectsRendererApi.d.ts","sourceRoot":"","sources":["../../src/components/ObjectsRendererApi.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,MAAM,WAAW,uBAAuB;IACpC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,WAAW,CAAC;IAC5B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;IAC1G,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAC5C;AAGD;;;;;;;;;;;;;GAaG;AACH,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAyDzD,CAAC;AACF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"ObjectsRendererApi.d.ts","sourceRoot":"","sources":["../../src/components/ObjectsRendererApi.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAClG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,cAAc,EAAE,WAAW,CAAC;IAC5B,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;IAC1G,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CAC5C;AAGD;;;;;;;;;;;;;GAaG;AACH,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAyDzD,CAAC;AACF,eAAe,kBAAkB,CAAC"}

package/dist/components/ObjectsRendererApi.js

@@ -15,7 +15,7 @@ import ObjectsRenderer from './ObjectsRenderer.js';
  *   apiBaseUrl="http://localhost:3001"
  * />
  */
-const ObjectsRendererApi = ({ objectIds, cameraSettings, generalObjectSettings, apiBaseUrl = 'http://localhost:3001', onObjectsReady, handleObjectClick, onError, onLoading, }) => {
+const ObjectsRendererApi = ({ objectIds, cameraSettings, generalObjectSettings, apiBaseUrl = 'http://localhost:3001', onObjectsReady, handleObjectClick, onError, onLoading, onObjectReady, onObjectDispose, }) => {
     const [createdObjects, setCreatedObjects] = useState([]);
     const [isLoading, setIsLoading] = useState(true);
     const [error, setError] = useState(null);
@@ -71,6 +71,6 @@ const ObjectsRendererApi = ({ objectIds, cameraSettings, generalObjectSettings,
         console.error('ObjectsRendererApi Error:', error);
         return (_jsx("group", { children: _jsxs("mesh", { position: [0, 0, 0], children: [_jsx("sphereGeometry", { args: [0.5, 32, 32] }), _jsx("meshStandardMaterial", { color: 0xff0000, wireframe: true })] }) }));
     }
-    return (_jsx(ObjectsRenderer, { cameraSettings: cameraSettings, createdObjects: createdObjects, generalObjectSettings: generalObjectSettings, onObjectsReady: onObjectsReady, handleObjectClick: handleObjectClick }));
+    return (_jsx(ObjectsRenderer, { cameraSettings: cameraSettings, createdObjects: createdObjects, generalObjectSettings: generalObjectSettings, onObjectsReady: onObjectsReady, handleObjectClick: handleObjectClick, onObjectReady: onObjectReady, onObjectDispose: onObjectDispose }));
 };
 export default ObjectsRendererApi;

package/dist/components/Ocean.d.ts

@@ -1,6 +1,7 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import type { CreatedObjectSettings } from '@3driseai/3drise-core';
 import React from "react";
-export interface OceanProps {
+export interface OceanProps extends ObjectReadyProps {
     settings: CreatedObjectSettings;
 }
 declare const Ocean: React.FC<OceanProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"Ocean.d.ts","sourceRoot":"","sources":["../../src/components/Ocean.tsx"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,MAAM,WAAW,UAAU;IACvB,QAAQ,EAAE,qBAAqB,CAAC;CACnC;AAGD,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA6J/B,CAAC;AACF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Ocean.d.ts","sourceRoot":"","sources":["../../src/components/Ocean.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAU7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAChD,QAAQ,EAAE,qBAAqB,CAAC;CACnC;AAGD,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA8J/B,CAAC;AACF,eAAe,KAAK,CAAC"}

package/dist/components/Ocean.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useObjectReady } from '../hooks/useObjectReady.js';
 import { useRef, useState } from 'react';
 import * as THREE from 'three';
 import { useFrame } from '@react-three/fiber';
@@ -8,8 +9,9 @@ import { useWaterReflections } from '../hooks/useWaterReflections.js';
 import { useAnimationEvents } from '../hooks/useAnimationEvents.js';
 import { useNumericAnimation } from '../hooks/useNumericAnimation.js';
 import { handleTransformAnimations, handleMaterialAnimations, handleTransformMouseMove, handleMaterialMouseMove, } from '@3driseai/3drise-core';
-const Ocean = ({ settings }) => {
+const Ocean = ({ settings, onObjectReady, onObjectDispose }) => {
     const meshRef = useRef(null);
+    useObjectReady(meshRef, settings, onObjectReady, onObjectDispose);
     const uniformOverrideRef = useRef(null);
     const matAnimCacheRef = useRef({});
     const [meshVisible, setMeshVisible] = useState(null);

package/dist/components/Outline.d.ts

@@ -1,9 +1,10 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import { Line } from '@react-three/drei';
 import type { ComponentProps } from "react";
 import type { BufferGeometry } from "three";
 import { OutlineMode } from "./extractOutline";
 type DreiLineProps = ComponentProps<typeof Line>;
-export interface OutlineProps extends Omit<DreiLineProps, 'points' | 'segments' | 'ref' | 'geometry'> {
+export interface OutlineProps extends Omit<DreiLineProps, 'points' | 'segments' | 'ref' | 'geometry'>, ObjectReadyProps {
     /** Any host geometry to outline. */
     geometry: BufferGeometry;
     /** '3d' = feature edges (uses `angle`), '2d' = flat front-plane profile. */
@@ -16,6 +17,6 @@ export interface OutlineProps extends Omit<DreiLineProps, 'points' | 'segments'
  * handled by drei's <Line>. Color / lineWidth / dashed are forwarded straight
  * through, so the parent owns all appearance.
  */
-export declare function Outline({ geometry, mode, angle, ...lineProps }: OutlineProps): import("react").JSX.Element;
+export declare function Outline({ geometry, mode, angle, onObjectReady, onObjectDispose, ...lineProps }: OutlineProps): import("react").JSX.Element;
 export {};
 //# sourceMappingURL=Outline.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Outline.d.ts","sourceRoot":"","sources":["../../src/components/Outline.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,KAAK,aAAa,GAAG,cAAc,CAAC,OAAO,IAAI,CAAC,CAAC;AAEjD,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,UAAU,GAAG,KAAK,GAAG,UAAU,CAAC;IACjG,oCAAoC;IACpC,QAAQ,EAAE,cAAc,CAAC;IACzB,4EAA4E;IAC5E,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAGD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAW,EAAE,KAAU,EAAE,GAAG,SAAS,EAAE,EAAE,YAAY,+BAKxF"}
+{"version":3,"file":"Outline.d.ts","sourceRoot":"","sources":["../../src/components/Outline.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,KAAK,aAAa,GAAG,cAAc,CAAC,OAAO,IAAI,CAAC,CAAC;AAEjD,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,UAAU,GAAG,KAAK,GAAG,UAAU,CAAC,EAAE,gBAAgB;IACnH,oCAAoC;IACpC,QAAQ,EAAE,cAAc,CAAC;IACzB,4EAA4E;IAC5E,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAGD;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAW,EAAE,KAAU,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,SAAS,EAAE,EAAE,YAAY,+BAOxH"}

package/dist/components/Outline.js

@@ -1,4 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useRef } from 'react';
+import { useObjectReady } from '../hooks/useObjectReady.js';
 import { Line } from '@react-three/drei';
 import { useOutline } from '../hooks/useOutline.js';
 /**
@@ -6,9 +8,11 @@ import { useOutline } from '../hooks/useOutline.js';
  * handled by drei's <Line>. Color / lineWidth / dashed are forwarded straight
  * through, so the parent owns all appearance.
  */
-export function Outline({ geometry, mode = '3d', angle = 18, ...lineProps }) {
+export function Outline({ geometry, mode = '3d', angle = 18, onObjectReady, onObjectDispose, ...lineProps }) {
     const points = useOutline(geometry, mode, angle);
+    const rootRef = useRef(null);
+    useObjectReady(rootRef, { mode, angle }, onObjectReady, onObjectDispose);
     if (points.length === 0)
         return null;
-    return _jsx(Line, { points: points, segments: true, ...lineProps });
+    return _jsx(Line, { ref: rootRef, points: points, segments: true, ...lineProps });
 }

package/dist/components/ParticlesR3f.d.ts

@@ -1,6 +1,7 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import type { ParticlesSettings } from '@3driseai/3drise-core';
 import React from "react";
-interface ParticlesR3fProps {
+interface ParticlesR3fProps extends ObjectReadyProps {
     particlesSettings: ParticlesSettings;
     cameraFov?: number;
     duration?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"ParticlesR3f.d.ts","sourceRoot":"","sources":["../../src/components/ParticlesR3f.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,iBAAiB;IACvB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChD;AAMD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAiG7C,CAAC;AACF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"ParticlesR3f.d.ts","sourceRoot":"","sources":["../../src/components/ParticlesR3f.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAO7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,iBAAkB,SAAQ,gBAAgB;IAChD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChD;AAMD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkG7C,CAAC;AACF,eAAe,YAAY,CAAC"}

package/dist/components/ParticlesR3f.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useObjectReady } from '../hooks/useObjectReady.js';
 import { useEffect, useMemo, useRef } from 'react';
 import { useFrame } from '@react-three/fiber';
 import { useParticlePositions } from '../hooks/useParticlePositions.js';
@@ -9,9 +10,10 @@ import { update3driseShaderUniforms } from '../hooks/use3driseShader.js';
 function normalizeEffects(raw) {
     return Array.isArray(raw) ? raw : [];
 }
-const ParticlesR3f = ({ particlesSettings, duration = 1, transitionSettings, }) => {
+const ParticlesR3f = ({ particlesSettings, duration = 1, transitionSettings, onObjectReady, onObjectDispose, }) => {
     const materialRef = useRef(null);
     const pointsRef = useRef(null);
+    useObjectReady(pointsRef, particlesSettings, onObjectReady, onObjectDispose);
     const { name, config, meshSettings } = particlesSettings;
     const { count, shapeType, outlines, texture } = config;
     const color = particlesSettings.materialSettings && 'color' in particlesSettings.materialSettings

package/dist/components/Path.d.ts

@@ -1,6 +1,7 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import React from "react";
 import type { CatmullRomCurve3 } from "three";
-interface PathProps {
+interface PathProps extends ObjectReadyProps {
     curve: CatmullRomCurve3;
     targetCurve: CatmullRomCurve3;
     duration?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../src/components/Path.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,UAAU,SAAS;IACf,KAAK,EAAE,gBAAgB,CAAC;IACxB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAGD,QAAA,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAoC7B,CAAC;AACF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../src/components/Path.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAE9C,UAAU,SAAU,SAAQ,gBAAgB;IACxC,KAAK,EAAE,gBAAgB,CAAC;IACxB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAGD,QAAA,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,SAAS,CAqD7B,CAAC;AACF,eAAe,IAAI,CAAC"}

package/dist/components/Path.js

@@ -1,13 +1,24 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef, useEffect } from 'react';
 import { useFrame } from '@react-three/fiber';
-const Path = ({ curve, targetCurve, duration = 1, color = '#4c00ff', opacity = 1, tubeRadius = 0.001, }) => {
+import { useObjectReady } from '../hooks/useObjectReady.js';
+const Path = ({ curve, targetCurve, duration = 1, color = '#4c00ff', opacity = 1, tubeRadius = 0.001, onObjectReady, onObjectDispose, }) => {
     const tubeRef = useRef(null);
     const targetTubeRef = useRef(null);
     const meshRef = useRef(null);
+    const rootRef = useRef(null);
+    useObjectReady(rootRef, { curve, targetCurve, duration, color, opacity, tubeRadius }, onObjectReady, onObjectDispose);
     const animationProgress = useRef(0);
     const basePositions = useRef(null);
     const speed = 1 / duration;
+    useObjectReady(meshRef, {
+        curve,
+        targetCurve,
+        duration,
+        color,
+        opacity,
+        tubeRadius,
+    }, onObjectReady, onObjectDispose);
     useEffect(() => {
         if (tubeRef.current) {
             basePositions.current = new Float32Array(tubeRef.current.attributes.position.array);
@@ -36,6 +47,6 @@ const Path = ({ curve, targetCurve, duration = 1, color = '#4c00ff', opacity = 1
         animationProgress.current = progress;
         currentPosAttr.needsUpdate = true;
     });
-    return (_jsxs(_Fragment, { children: [_jsxs("mesh", { ref: meshRef, children: [_jsx("tubeGeometry", { ref: tubeRef, args: [curve, 64, tubeRadius, 8, false] }), _jsx("meshBasicMaterial", { color: color, transparent: opacity < 1, opacity: opacity })] }), _jsx("mesh", { position: [0, -1000, 0], children: _jsx("tubeGeometry", { ref: targetTubeRef, args: [targetCurve, 64, tubeRadius, 8, false] }) })] }));
+    return (_jsxs("group", { ref: rootRef, children: [_jsxs("mesh", { ref: meshRef, children: [_jsx("tubeGeometry", { ref: tubeRef, args: [curve, 64, tubeRadius, 8, false] }), _jsx("meshBasicMaterial", { color: color, transparent: opacity < 1, opacity: opacity })] }), _jsx("mesh", { position: [0, -1000, 0], children: _jsx("tubeGeometry", { ref: targetTubeRef, args: [targetCurve, 64, tubeRadius, 8, false] }) })] }));
 };
 export default Path;

package/dist/components/PathGeometry.d.ts

@@ -1,6 +1,7 @@
+import type { ObjectReadyProps } from '../types/objectReady';
 import type { PathGeometrySettings, Vector3Array } from '@3driseai/3drise-core';
 import React from "react";
-interface PathGeometryProps {
+interface PathGeometryProps extends ObjectReadyProps {
     points: Vector3Array[];
     curve: number;
     smoothCorners?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"PathGeometry.d.ts","sourceRoot":"","sources":["../../src/components/PathGeometry.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,iBAAiB;IACvB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,oBAAoB,CAAC;CAClC;AAGD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAsG7C,CAAC;AACF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"PathGeometry.d.ts","sourceRoot":"","sources":["../../src/components/PathGeometry.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAK7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,iBAAkB,SAAQ,gBAAgB;IAChD,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,oBAAoB,CAAC;CAClC;AAGD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAwG7C,CAAC;AACF,eAAe,YAAY,CAAC"}