@3driseai/3drise-viewer 0.1.25 → 0.1.26

package/dist/api/sceneHandle.js

@@ -3,21 +3,24 @@
 // =============================================================================
 //
 // What a developer extending a project gets from <ProjectLoader ref={…} /> or
-// onSceneReady(handle): trigger the project's actions and animations from their
-// own UI, and hear when they run.
+// onSceneReady(handle): trigger the project's actions, clips and sequences from
+// their own UI, and hear when they run.
 //
 //   scene.current?.actions.toggle('open-door');
-//   scene.current?.animations.play('intro', { speed: 1.5 });
-//   const off = scene.current?.on('actionApplied', (e) => console.log(e.key));
+//   scene.current?.clips.play('spin');                    // one clip, its own loop / yoyo / end
+//   scene.current?.sequences.play('intro', { speed: 1.5 });
+//   const off = scene.current?.on('animationEnd', (e) => console.log(e.kind, e.key));
 //
-// Addressing (`ref`): an action's `key` first (stable across renames and project
-// copies — prefer it), then its id, then its exact name. Animations have no key
-// yet, so id, then name. An ambiguous name warns and uses the first match.
+// Addressing (`ref`): the item's `key` first (stable across renames and project
+// copies — prefer it), then its id, then its exact name. An ambiguous name warns
+// and uses the first match. Clip and sequence keys are separate namespaces.
 //
 // This is a thin layer: object clicks go through the same SceneActions /
-// AnimationsManager calls, so a button and a click behave identically.
+// ClipsRuntime calls, so a button and a click behave identically.
 //
-import { AnimationsManager, SceneActions } from '@3driseai/3drise-core';
+import { SceneActions } from '@3driseai/3drise-core';
+import ClipsRuntime from '../animationsV2/ClipsRuntime.js';
+import { clipMap, resolveSequence } from '../animationsV2/sequenceUtils.js';
 function resolve(items, ref, kind) {
     if (!ref)
         return undefined;
@@ -29,25 +32,146 @@ function resolve(items, ref, kind) {
         return byId;
     const byName = items.filter(i => i.name === ref);
     if (byName.length > 1) {
-        console.warn(`[3drise] ${byName.length} ${kind}s are named "${ref}"; using the first.${kind === 'action' ? ' Address it by its key instead.' : ''}`);
+        console.warn(`[3drise] ${byName.length} ${kind}s are named "${ref}"; using the first. Address it by its key instead.`);
     }
     if (byName.length === 0) {
-        console.warn(`[3drise] No ${kind} "${ref}" in this project. Known: ${items.map(i => i.key ?? i.name).join(', ') || 'none'}`);
+        console.warn(`[3drise] No ${kind} "${ref}" in this project. Known: ${items.map(i => i.key || i.name).join(', ') || 'none'}`);
     }
     return byName[0];
 }
-function animationDuration(seq) {
-    return (seq.steps ?? []).reduce((sum, s) => sum + (s.delay || 0) + (s.duration || 0), 0);
-}
+const clamp01 = (n) => Math.min(1, Math.max(0, Number.isFinite(n) ? n : 0));
 /**
- * Build a handle over one project's actions and animations. `getSource` is read on
- * every call, so the handle stays valid if the project data is replaced.
+ * Build a handle over one project's actions, clips and sequences. `getSource` is
+ * read on every call, so the handle stays valid if the project data is replaced.
  */
 export function createSceneHandle(getSource) {
     const actions = () => getSource().actions ?? [];
-    const animations = () => getSource().animations ?? [];
+    const clips = () => getSource().clips ?? [];
+    const sequences = () => getSource().sequences ?? [];
+    const clipsById = () => clipMap(clips());
     const findAction = (ref) => resolve(actions(), ref, 'action');
-    const findAnimation = (ref) => resolve(animations(), ref, 'animation');
+    const findClip = (ref) => resolve(clips(), ref, 'clip');
+    const findSequence = (ref) => resolve(sequences(), ref, 'sequence');
+    const sequenceDuration = (s) => resolveSequence(s, clipsById()).duration;
+    const clipControls = {
+        list: () => clips().map(c => ({
+            id: c.id, key: c.key, name: c.name, description: c.description,
+            duration: c.duration, loop: c.loop, yoyo: c.yoyo, endMode: c.endMode,
+            playing: ClipsRuntime.isPlaying(c.id),
+        })),
+        play(ref, options = {}) {
+            const c = findClip(ref);
+            if (!c)
+                return false;
+            ClipsRuntime.play(c, {
+                speed: options.speed,
+                reverse: options.reverse,
+                from: options.from !== undefined ? clamp01(options.from) * c.duration : undefined,
+            });
+            return true;
+        },
+        pause(ref) {
+            const c = findClip(ref);
+            if (!c)
+                return false;
+            ClipsRuntime.pause(c.id);
+            return true;
+        },
+        resume(ref) {
+            const c = findClip(ref);
+            if (!c)
+                return false;
+            ClipsRuntime.resume(c.id);
+            return true;
+        },
+        stop(ref) {
+            const c = findClip(ref);
+            if (!c)
+                return false;
+            ClipsRuntime.stop(c.id);
+            return true;
+        },
+        seek(ref, progress) {
+            const c = findClip(ref);
+            if (!c)
+                return false;
+            ClipsRuntime.pose(c, clamp01(progress) * c.duration);
+            return true;
+        },
+        isPlaying(ref) {
+            const c = findClip(ref);
+            return c ? ClipsRuntime.isPlaying(c.id) : false;
+        },
+    };
+    const sequenceControls = {
+        list: () => sequences().map(s => ({
+            id: s.id, key: s.key, name: s.name, description: s.description,
+            duration: sequenceDuration(s), steps: s.steps.length,
+            loop: s.loop, yoyo: s.yoyo, reverse: s.reverse, endMode: s.endMode,
+            driver: s.driver, autoplay: s.autoplay,
+            playing: ClipsRuntime.isSequencePlaying(s.id),
+        })),
+        play(ref, options = {}) {
+            const s = findSequence(ref);
+            if (!s)
+                return false;
+            ClipsRuntime.playSequence(s, clipsById(), {
+                speed: options.speed,
+                reverse: options.reverse,
+                from: options.from !== undefined ? clamp01(options.from) * sequenceDuration(s) : undefined,
+            });
+            return true;
+        },
+        pause(ref) {
+            const s = findSequence(ref);
+            if (!s)
+                return false;
+            ClipsRuntime.pauseSequence(s.id);
+            return true;
+        },
+        resume(ref) {
+            const s = findSequence(ref);
+            if (!s)
+                return false;
+            ClipsRuntime.resumeSequence(s.id);
+            return true;
+        },
+        stop(ref) {
+            const s = findSequence(ref);
+            if (!s)
+                return false;
+            ClipsRuntime.stopSequence(s.id);
+            return true;
+        },
+        seek(ref, progress) {
+            const s = findSequence(ref);
+            if (!s)
+                return false;
+            const lookup = clipsById();
+            ClipsRuntime.poseSequence(s, lookup, clamp01(progress) * resolveSequence(s, lookup).duration);
+            return true;
+        },
+        isPlaying(ref) {
+            const s = findSequence(ref);
+            return s ? ClipsRuntime.isSequencePlaying(s.id) : false;
+        },
+        setProgress(ref, progress) {
+            const s = findSequence(ref);
+            if (!s)
+                return false;
+            if (ClipsRuntime.isSequenceActive(s.id))
+                return ClipsRuntime.setSequenceProgress(s.id, progress);
+            const lookup = clipsById();
+            const total = resolveSequence(s, lookup).duration;
+            const p = clamp01(progress);
+            ClipsRuntime.poseSequence(s, lookup, (s.reverse ? 1 - p : p) * total);
+            return true;
+        },
+        getProgress(ref) {
+            const s = findSequence(ref);
+            return s ? ClipsRuntime.getSequenceProgress(s.id) : 0;
+        },
+    };
     return {
         actions: {
             list: () => actions().map(a => ({
@@ -85,56 +209,8 @@ export function createSceneHandle(getSource) {
                     SceneActions.revertAction(a.id);
             },
         },
-        animations: {
-            list: () => animations().map(s => ({
-                id: s.id,
-                name: s.name,
-                description: s.description,
-                duration: animationDuration(s),
-                loop: !!s.loop,
-                yoyo: !!s.yoyo,
-                playing: AnimationsManager.isSequencePlaying(s.id),
-            })),
-            play(ref, options = {}) {
-                const s = findAnimation(ref);
-                if (!s)
-                    return false;
-                AnimationsManager.playSequence(s, { speed: options.speed, reverse: options.reverse });
-                return true;
-            },
-            pause(ref) {
-                const s = findAnimation(ref);
-                if (!s)
-                    return false;
-                AnimationsManager.pauseSequence(s.id);
-                return true;
-            },
-            resume(ref) {
-                const s = findAnimation(ref);
-                if (!s)
-                    return false;
-                AnimationsManager.resumeSequence(s.id);
-                return true;
-            },
-            stop(ref) {
-                const s = findAnimation(ref);
-                if (!s)
-                    return false;
-                AnimationsManager.stopSequence(s.id);
-                return true;
-            },
-            seek(ref, progress) {
-                const s = findAnimation(ref);
-                if (!s)
-                    return false;
-                AnimationsManager.seekToProgress(s.id, progress);
-                return true;
-            },
-            isPlaying(ref) {
-                const s = findAnimation(ref);
-                return s ? AnimationsManager.isSequencePlaying(s.id) : false;
-            },
-        },
+        clips: clipControls,
+        sequences: sequenceControls,
         on(type, listener) {
             if (type === 'actionApplied' || type === 'actionReverted') {
                 return SceneActions.onEvent((e) => {
@@ -144,17 +220,18 @@ export function createSceneHandle(getSource) {
                         return;
                     const a = actions().find(x => x.id === e.actionId);
                     if (a)
-                        listener({ type, id: a.id, key: a.key, name: a.name });
+                        listener({ type, kind: 'action', id: a.id, key: a.key, name: a.name });
                 });
             }
-            const managerEvent = type === 'animationStart' ? 'sequenceStart' : 'sequenceEnd';
-            const handler = (e) => {
-                const s = animations().find(x => x.id === e.sequenceId);
-                if (s)
-                    listener({ type, id: s.id, name: s.name });
-            };
-            AnimationsManager.on(managerEvent, handler);
-            return () => AnimationsManager.off(managerEvent, handler);
+            const wanted = type === 'animationStart' ? 'start' : type === 'animationEnd' ? 'end' : 'loop';
+            return ClipsRuntime.on((e) => {
+                if (e.type !== wanted)
+                    return;
+                // Only this project's items — another scene on the page shares the runtime.
+                const item = e.kind === 'clip' ? clips().find(c => c.id === e.id) : sequences().find(s => s.id === e.id);
+                if (item)
+                    listener({ type, kind: e.kind, id: item.id, key: item.key, name: item.name });
+            });
         },
     };
 }

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

@@ -1 +1 @@
-{"version":3,"file":"CameraController.d.ts","sourceRoot":"","sources":["../../src/components/CameraController.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,UAAU,qBAAsB,SAAQ,gBAAgB;IACpD,QAAQ,EAAE,WAAW,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;CAC/C;AAGD,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CA0J5D,CAAC;AACF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"CameraController.d.ts","sourceRoot":"","sources":["../../src/components/CameraController.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAQ7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,UAAU,qBAAsB,SAAQ,gBAAgB;IACpD,QAAQ,EAAE,WAAW,CAAC;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;CAC/C;AAGD,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,qBAAqB,CA+G5D,CAAC;AACF,eAAe,gBAAgB,CAAC"}

package/dist/components/CameraController.js

@@ -4,7 +4,6 @@ import { useEffect, useRef } from 'react';
 import { useFrame, useThree } from '@react-three/fiber';
 import { useCameraAnimation } from '../hooks/useCameraAnimation.js';
 import { cameraManager } from '../utils/CameraSingleton.js';
-import { useAnimationEvents } from '../hooks/useAnimationEvents.js';
 import { usePathAnimation } from '../hooks/usePathAnimation.js';
 import { OrbitControls } from "@react-three/drei";
 import { useRuntimeSettings } from '../hooks/useRuntimeSettings.js';
@@ -103,49 +102,6 @@ export const CameraController = ({ enableAutoAnimation = true, animationDuration
             cam.updateProjectionMatrix();
         }
     }, [fov, near, far]);
-    // Handle animation events (step-based animations)
-    useAnimationEvents({
-        onStepStart: (event) => {
-            if (event.step?.transitions) {
-                const stepDuration = event.step.duration ?? 1; // 0 = instant (actions)
-                event.step.transitions.forEach((transition) => {
-                    const { state, properties, pathId } = transition;
-                    if (state === 'camera') {
-                        isInAnimatedTransition.current = true;
-                        if (pathId) {
-                            const offset = camera
-                                ? [camera.position.x, camera.position.y, camera.position.z]
-                                : [0, 0, 0];
-                            startPathAnimation(pathId, stepDuration, {
-                                offset,
-                                applyRotation: false
-                            });
-                            transformAnimationProgress.current = 0;
-                        }
-                        const startSettings = properties.from ?
-                            {
-                                position: properties.from.position,
-                                // orientation: properties.from.orientation,
-                            } : {
-                            position: camera.position,
-                            // orientation: camera.rotation,
-                        };
-                        const targetSettings = properties.to;
-                        // startSettings.position && camera.position.set(startSettings.position[0], startSettings.position[1], startSettings.position[2]);
-                        // camera.rotation.set(startSettings.orientation[0], startSettings.orientation[1], startSettings.orientation[2]);
-                        animateCamera(targetSettings, stepDuration, event.step?.ease, properties.to.target)
-                            .then(() => {
-                            isInAnimatedTransition.current = false;
-                            if (properties.to.target) {
-                                controlsRef.current?.target.set(properties.to.target[0], properties.to.target[1], properties.to.target[2]);
-                            }
-                            ;
-                        });
-                    }
-                });
-            }
-        }
-    });
     // Frame loop for path animations and mouse handlers
     useFrame((state, delta) => {
         if (isPathAnimating()) {

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

@@ -1 +1 @@
-{"version":3,"file":"Clouds.d.ts","sourceRoot":"","sources":["../../src/components/Clouds.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAQ7D,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACjD,QAAQ,EAAE,qBAAqB,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAmFD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAqLjC,CAAC;AACF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Clouds.d.ts","sourceRoot":"","sources":["../../src/components/Clouds.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAO7D,OAAO,KAAK,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACjD,QAAQ,EAAE,qBAAqB,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAmFD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAoJjC,CAAC;AACF,eAAe,MAAM,CAAC"}

package/dist/components/Clouds.js

@@ -4,7 +4,6 @@ import { useRef, useCallback } from 'react';
 import * as THREE from 'three';
 import { useThree, useFrame } from '@react-three/fiber';
 import { useSkySystem } from '../hooks/useSkySystem.js';
-import { useAnimationEvents } from '../hooks/useAnimationEvents.js';
 import { useNumericAnimation } from '../hooks/useNumericAnimation.js';
 import { calculateTimeProgress, applyEasing, gsapEasingMap, interpolateValue, interpolateMouseMoveProperty, } from '@3driseai/3drise-core';
 const CLOUD_COLORS = {
@@ -142,39 +141,6 @@ const Clouds = ({ settings, timeSettings = defaultTimeSettings, onObjectReady, o
         onTimeUpdate: handleTimeUpdate,
         enabled: visible,
     });
-    // Legacy sequence-driven `speed`/`scale` anims via `useAnimationEvents`
-    useAnimationEvents({
-        onStepStart: (event) => {
-            if (!event.step?.transitions)
-                return;
-            for (const transition of event.step.transitions) {
-                if (transition.state !== 'clouds' || !meshRef.current)
-                    continue;
-                const toProps = transition.properties.to || {};
-                const fromProps = transition.properties.from || {};
-                if (toProps.visible !== undefined)
-                    meshRef.current.visible = toProps.visible;
-                const KEYS = ['speed', 'scale'];
-                const from = {};
-                const to = {};
-                for (const k of KEYS) {
-                    const toVal = toProps[k];
-                    if (toVal === undefined)
-                        continue;
-                    to[k] = toVal;
-                    const sourceFallback = k === 'speed' ? baseSpeed : scale;
-                    from[k] = fromProps[k] ?? sourceFallback;
-                }
-                if (Object.keys(to).length > 0) {
-                    animateNumeric(from, to, (updated) => {
-                        numericOverrideRef.current = { ...numericOverrideRef.current, ...updated };
-                    }, () => {
-                        numericOverrideRef.current = null;
-                    }, event.step?.duration);
-                }
-            }
-        },
-    });
     useFrame((state) => {
         const mesh = meshRef.current;
         if (!mesh || !mesh.visible || !mesh.material)

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

@@ -1 +1 @@
-{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAWnE,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,CAuF9C,CAAC;AAEH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAWnE,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;AAKD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAsG9C,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, useReducer, memo } from "react";
+import { useRef, useEffect, useState, useReducer, memo, useContext } from "react";
+import { ObjectHoverContext } from "../interactions/runner.js";
 import { ModelMaterialPassContext } from "./ModelMaterialPassContext.js";
 import { DEFAULT_EDGES_SETTINGS } from "@3driseai/3drise-core";
 import { useMaterialApplication } from "../hooks/useMaterialApplication.js";
@@ -12,11 +13,16 @@ import AnimatedObject from "./AnimatedObject.js";
 import { useFrameEffects } from "../hooks/useFrameEffects.js";
 import { useObjectEdges } from "../hooks/useObjectEdges.js";
 import { useObjectReady } from "../hooks/useObjectReady.js";
+/** One hovered part of an object: the intersected mesh (+ instance). */
+const hoverKey = (e) => `${e.object?.uuid}/${e.instanceId ?? ''}`;
 const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial = true, onObjectReady, onObjectDispose, handleObjectClick, }) => {
     const isSelected = false;
     // const isSelected = useObjectSelection(createdObject.id);
     // const { handleObjectClick: contextHandleObjectClick } = useSceneClick();
     const meshRef = useRef(null);
+    // 'mouseEnter' / 'mouseLeave' interactions (ObjectsRenderer).
+    const onHover = useContext(ObjectHoverContext);
+    const hoveredPartsRef = useRef(new Set());
     const transformRef = useRef(null);
     // const baseColorRef = useRef<string>(("color" in createdObject.materialSettings && createdObject.materialSettings.color) || '#ffffff');  
     // const [hovered, setHovered] = useState(false);
@@ -67,6 +73,14 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
         // Only handle if this is the actual mesh group, not a child
         if (e.eventObject !== meshRef.current)
             return;
+        // R3F fires enter / leave on this group once per hovered DESCENDANT (and per
+        // intersection), so a model with overlapping meshes fires several at once.
+        // Track the hovered parts and report only the first enter / last leave —
+        // otherwise two-state effects (glow, fade…) toggle on and straight back off.
+        const wasHovered = hoveredPartsRef.current.size > 0;
+        hoveredPartsRef.current.add(hoverKey(e));
+        if (!wasHovered)
+            onHover?.(createdObject, meshRef.current, 'mouseEnter');
         if (createdObject.type === 'particles' || createdObject.type === 'gallery')
             return;
         // e.stopPropagation();
@@ -79,6 +93,10 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
         // Only handle if this is the actual mesh group, not a child
         if (e.eventObject !== meshRef.current)
             return;
+        hoveredPartsRef.current.delete(hoverKey(e));
+        if (hoveredPartsRef.current.size > 0)
+            return; // still over another part of this object
+        onHover?.(createdObject, meshRef.current, 'mouseLeave');
         if (createdObject.type === 'particles' || createdObject.type === 'gallery')
             return;
         handlePointerLeave();

package/dist/components/EnvironmentManager.js

@@ -29,7 +29,7 @@ const EnvironmentManager = forwardRef(({ timeSettings, environment, hdrSettings,
     // Authored settings + applied action patches (runtime only).
     const sky = useRuntimeSettings('sky', skySettings ?? environment?.sky);
     const clouds = useRuntimeSettings('clouds', cloudsSettings ?? environment?.clouds);
-    const terrain = terrainSettings ?? environment?.terrain;
+    const terrain = useRuntimeSettings('terrain', terrainSettings ?? environment?.terrain);
     const landscape = landscapeSettings ?? environment?.landscape;
     const ocean = useRuntimeSettings('ocean', oceanSettings ?? environment?.ocean);
     const fog = fogSettings ?? environment?.fog;

package/dist/components/ObjectsRenderer.d.ts

@@ -1,4 +1,5 @@
-import type { ActionSequence, AnimationSequence, GeneralObjectSettings, CameraState, CreatedObjectSettings } from '@3driseai/3drise-core';
+import type { ActionSequence, GeneralObjectSettings, CameraState, CreatedObjectSettings } from '@3driseai/3drise-core';
+import type { AnimationClip, AnimationSequence } from '../animationsV2/types';
 import type { ObjectReadyProps } from '../types/objectReady';
 import React from "react";
 import { Object3D } from "three";
@@ -9,7 +10,9 @@ interface ObjectsRendererProps extends ObjectReadyProps {
     createdObjects: CreatedObjectSettings[];
     onObjectsReady?: () => void;
     handleObjectClick?: (object: CreatedObjectSettings, ref: Object3D, event: ThreeEvent<MouseEvent>) => void;
+    /** Animations V2 sequences and clips, for interaction triggers. */
     sequences?: AnimationSequence[];
+    clips?: AnimationClip[];
     actionSequences?: ActionSequence[];
 }
 declare const ObjectsRenderer: React.FC<ObjectsRendererProps>;

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,cAAc,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAI1I,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;IAChC,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;CACtC;AAGD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA2ClD,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ObjectsRenderer.d.ts","sourceRoot":"","sources":["../../src/components/ObjectsRenderer.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACvH,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAM9E,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,mEAAmE;IACnE,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;CACtC;AAGD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA4DlD,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/dist/components/ObjectsRenderer.js

@@ -1,10 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo, useRef, useCallback, useMemo } from 'react';
+import { memo, useRef, useCallback, useMemo, useEffect } from 'react';
 import { buildObjectTree } from '@3driseai/3drise-core';
 import ObjectNode from './ObjectNode.js';
 import useInteraction from '../hooks/useInteraction.js';
+import { ObjectHoverContext, setInteractionRunner } from '../interactions/runner.js';
+import { findById } from '../utils/sceneQuery.js';
 import { useObjectReady } from '../hooks/useObjectReady.js';
-const ObjectsRenderer = memo(({ cameraSettings, createdObjects, generalObjectSettings, onObjectsReady, onObjectReady, onObjectDispose, handleObjectClick, sequences = [], actionSequences = [], }) => {
+const ObjectsRenderer = memo(({ cameraSettings, createdObjects, generalObjectSettings, onObjectsReady, onObjectReady, onObjectDispose, handleObjectClick, sequences = [], clips = [], actionSequences = [], }) => {
     const groupRef = useRef(null);
     const objectsTree = useMemo(() => buildObjectTree(createdObjects), [createdObjects]);
     const readyObjectsCount = useRef(0);
@@ -32,8 +34,26 @@ const ObjectsRenderer = memo(({ cameraSettings, createdObjects, generalObjectSet
     const { executeInteraction } = useInteraction({
         cameraSettings,
         sequences,
+        clips,
         actionSequences,
     });
+    // Hover triggers: CreatedObject reports enter / leave through ObjectHoverContext.
+    const handleObjectHover = useCallback((createdObject, ref, trigger) => {
+        filterInteractionsByEvent(createdObject.actions, trigger).forEach((interaction) => {
+            executeInteraction({ interaction, ref, createdObject });
+        });
+    }, [executeInteraction]);
+    // "Try it" in the studio: run an interaction as if its trigger fired.
+    const objectsRef = useRef(createdObjects);
+    objectsRef.current = createdObjects;
+    useEffect(() => setInteractionRunner((objectId, interaction) => {
+        const ref = findById(objectId);
+        const createdObject = objectsRef.current?.find(o => o.id === objectId);
+        if (!ref || !createdObject)
+            return false;
+        executeInteraction({ interaction, ref, createdObject });
+        return true;
+    }), [executeInteraction]);
     const handleObjectClickHandler = (createdObject, ref, event) => {
         const clickInteractions = filterInteractionsByEvent(createdObject.actions, "click");
         clickInteractions.forEach((interaction) => {
@@ -43,7 +63,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, onObjectReady: handleObjectReady, onObjectDispose: handleObjectDispose, handleObjectClick: handleObjectClickHandler }, node.objectId))) }));
+    return (_jsx(ObjectHoverContext.Provider, { value: handleObjectHover, children: _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, onObjectReady: handleObjectReady, onObjectDispose: handleObjectDispose, handleObjectClick: handleObjectClickHandler }, node.objectId))) }) }));
 });
 ObjectsRenderer.displayName = 'ObjectsRenderer';
 export default ObjectsRenderer;

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

@@ -1 +1 @@
-{"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,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;AAS7D,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,CA+F/B,CAAC;AACF,eAAe,KAAK,CAAC"}

package/dist/components/Ocean.js

@@ -6,7 +6,6 @@ import { useFrame } from '@react-three/fiber';
 import { useMaterialApplication } from '../hooks/useMaterialApplication.js';
 import { useWaterEnvironment } from '../hooks/useWaterEnvironment.js';
 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, onObjectReady, onObjectDispose }) => {
@@ -34,68 +33,6 @@ const Ocean = ({ settings, onObjectReady, onObjectDispose }) => {
         updateFrequency: 1,
         enabled: meshSettings.visible,
     });
-    useAnimationEvents({
-        onStepStart: (event) => {
-            if (!event.step?.transitions)
-                return;
-            for (const transition of event.step.transitions) {
-                if (transition.state !== 'ocean' || !meshRef.current)
-                    continue;
-                const toProps = transition.properties.to || {};
-                const fromProps = transition.properties.from || {};
-                // visible — update state so JSX visible prop re-renders
-                if (toProps.visible !== undefined) {
-                    setMeshVisible(toProps.visible);
-                }
-                // numeric uniforms: animate any key in `to` that maps to a shader uniform
-                const material = meshRef.current.material;
-                const uniforms = material?.uniforms;
-                if (!uniforms)
-                    continue;
-                const from = {};
-                const to = {};
-                for (const key of Object.keys(toProps)) {
-                    if (key === 'visible')
-                        continue;
-                    const toVal = toProps[key];
-                    if (toVal === undefined)
-                        continue;
-                    to[key] = toVal;
-                    const fromExplicit = fromProps[key];
-                    if (fromExplicit !== undefined) {
-                        from[key] = fromExplicit;
-                    }
-                    else if (uniforms[key]?.value !== undefined) {
-                        const liveVal = uniforms[key].value;
-                        if (typeof liveVal === 'number') {
-                            from[key] = liveVal;
-                        }
-                        else if (liveVal?.toArray) {
-                            from[key] = liveVal.toArray();
-                        }
-                        else if (Array.isArray(liveVal)) {
-                            from[key] = [...liveVal];
-                        }
-                        else {
-                            from[key] = toVal;
-                        }
-                    }
-                    else {
-                        from[key] = toVal;
-                    }
-                }
-                if (Object.keys(to).length > 0) {
-                    animateNumeric(from, to, (updated) => {
-                        uniformOverrideRef.current = { ...uniformOverrideRef.current, ...updated };
-                    }, () => {
-                        uniformOverrideRef.current = null;
-                        if (toProps.visible !== undefined)
-                            setMeshVisible(null);
-                    }, event.step?.duration);
-                }
-            }
-        },
-    });
     useFrame((state) => {
         const mesh = meshRef.current;
         if (!mesh?.material || !(meshVisible ?? meshSettings.visible))

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

@@ -1 +1 @@
-{"version":3,"file":"SceneBuilder.d.ts","sourceRoot":"","sources":["../../src/components/SceneBuilder.tsx"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,WAAW,EAA0B,MAAM,oBAAoB,CAAC;AAGjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAQ/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG;IACzE,wGAAwG;IACxG,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;CAC/C,CAAC;AAEF,QAAA,MAAM,YAAY;IAJd,wGAAwG;mBACzF,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI;qCAkJ7C,CAAC;AAEH,eAAe,YAAY,CAAC"}
+{"version":3,"file":"SceneBuilder.d.ts","sourceRoot":"","sources":["../../src/components/SceneBuilder.tsx"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,WAAW,EAA0B,MAAM,oBAAoB,CAAC;AAGjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAW/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,gBAAgB,GAAG;IACzE,wGAAwG;IACxG,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;CAC/C,CAAC;AAEF,QAAA,MAAM,YAAY;IAJd,wGAAwG;mBACzF,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI;qCAgK7C,CAAC;AAEH,eAAe,YAAY,CAAC"}