@3driseai/3drise-viewer 0.1.14 → 0.1.15

package/dist/components/terrain/TerrainSurface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainSurface.d.ts","sourceRoot":"","sources":["../../../src/components/terrain/TerrainSurface.tsx"],"names":[],"mappings":"AACA,OAAO,KAAqC,MAAM,OAAO,CAAC;AAU1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD;;;;;;;;;;;;;;;;GAgBG;AACH,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAgG/C,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"TerrainSurface.d.ts","sourceRoot":"","sources":["../../../src/components/terrain/TerrainSurface.tsx"],"names":[],"mappings":"AACA,OAAO,KAAqC,MAAM,OAAO,CAAC;AAW1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD;;;;;;;;;;;;;;;;GAgBG;AACH,QAAA,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAqG/C,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/components/terrain/TerrainSurface.js

@@ -4,6 +4,7 @@ import { useFrame } from '@react-three/fiber';
 import { useObjectReady } from '../../hooks/useObjectReady.js';
 import { useTerrainClipmap } from '../../hooks/useTerrainClipmap.js';
 import { useCloudSun } from '../../hooks/useCloudSun.js';
+import { useLiveTransitionEvents } from '../../hooks/useLiveTransitionEvents.js';
 import { TERRAIN_LIVE_KEY } from '../../hooks/useTerrainLive.js';
 import { TerrainMaterial } from '../../shaders/terrain/TerrainMaterial.js';
 import { applySunUniforms } from '../../utils/cloudUniforms.js';
@@ -58,6 +59,10 @@ const TerrainSurface = ({ id = '3drise-terrain', config, quality, skySettings, t
         return () => { delete root.userData[TERRAIN_LIVE_KEY]; };
     }, [id, liveHandle]);
     useObjectReady(rootRef, { id, type: 'terrain', config, quality }, onObjectReady, onObjectDispose);
+    // Sequence-authored transitions (`transition.state === 'terrain'`) — liveConfig
+    // is the same ref a controller's live handle writes into, merged last over
+    // the config each frame below.
+    useLiveTransitionEvents('terrain', liveConfig, config, rootRef);
     useFrame((state) => {
         const camera = state.camera;
         updateSun();

package/dist/components/volumetricClouds/VolumetricCloudsPass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VolumetricCloudsPass.d.ts","sourceRoot":"","sources":["../../../src/components/volumetricClouds/VolumetricCloudsPass.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAQvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEvH,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAErF;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D,6EAA6E;IAC7E,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,mBAAmB,CAAC;IAC7B;oDACgD;IAChD,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,qFAAqF;IACrF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,6DAA6D;IAC7D,SAAS,CAAC,EAAE,qBAAqB,CAAC;CACrC;AAkBD,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAmW7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"VolumetricCloudsPass.d.ts","sourceRoot":"","sources":["../../../src/components/volumetricClouds/VolumetricCloudsPass.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAMvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAQvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEvH,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAErF;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D,6EAA6E;IAC7E,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,mBAAmB,CAAC;IAC7B;oDACgD;IAChD,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,qFAAqF;IACrF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,6DAA6D;IAC7D,SAAS,CAAC,EAAE,qBAAqB,CAAC;CACrC;AAkBD,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAyW7D,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/dist/components/volumetricClouds/VolumetricCloudsPass.js

@@ -5,6 +5,7 @@ import { useFrame, useThree } from '@react-three/fiber';
 import { useFrameRenderer } from '../../hooks/useFrameRenderer.js';
 import { useThunder } from '../../hooks/useThunder.js';
 import { useObjectReady } from '../../hooks/useObjectReady.js';
+import { useLiveTransitionEvents } from '../../hooks/useLiveTransitionEvents.js';
 import { CLOUD_LIVE_KEY } from '../../hooks/useCloudLive.js';
 import { useCloudNoise } from '../../hooks/useCloudNoise.js';
 import { useCloudSun } from '../../hooks/useCloudSun.js';
@@ -154,6 +155,11 @@ const VolumetricCloudsPass = ({ id = '3drise-clouds', deck, cirrus, quality, thu
     // ObjectReadySource's union is widened by Record<string, any>, but spelling the
     // cast out keeps the intent: this reports the layer's settings, not a mesh's.
     useObjectReady(rootRef, { id, type: 'clouds', deck, cirrus, quality }, onObjectReady, onObjectDispose);
+    // Sequence-authored transitions (`transition.state === 'clouds'`), on top of
+    // whatever the deck's own keyframe/mouse-move animations are already doing —
+    // liveDeck is the same ref a controller's live handle writes into, and it is
+    // already merged last, over both, each frame.
+    useLiveTransitionEvents('clouds', liveDeck, deck, rootRef);
     // Only a resolution change genuinely invalidates the history — the buffers are
     // reallocated and nothing in them maps to the new grid.
     //

package/dist/hooks/useLiveTransitionEvents.d.ts

@@ -0,0 +1,18 @@
+import type { RefObject } from 'react';
+import type { Object3D } from 'three';
+/**
+ * Drives sequence-step transitions (see `useAnimationEvents`) into a
+ * renderer's existing live-override ref — the same ref a controller's live
+ * handle (`useCloudLive`/`useTerrainLive`/`useOceanLive`) already writes into
+ * on every slider drag, and which the renderer already merges over its config
+ * each frame. That merge order is what makes a transition win over whatever
+ * the settings currently say, with no extra "is animating" flag needed.
+ *
+ * Matches `SkyController`'s pattern (capture current value, lerp to target
+ * over the step's duration) but generically: any `to` key that is a number or
+ * number[] animates smoothly via `useNumericAnimation`; anything else
+ * (booleans, strings) switches immediately, the same way `visible` does.
+ */
+export declare function useLiveTransitionEvents(stateName: string, liveRef: React.MutableRefObject<Record<string, any>>, currentConfig?: Record<string, any> | null, rootRef?: RefObject<Object3D | null>): void;
+export default useLiveTransitionEvents;
+//# sourceMappingURL=useLiveTransitionEvents.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useLiveTransitionEvents.d.ts","sourceRoot":"","sources":["../../src/hooks/useLiveTransitionEvents.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAItC;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACnC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EACpD,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,EAC1C,OAAO,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,GACrC,IAAI,CAwCN;AAED,eAAe,uBAAuB,CAAC"}

package/dist/hooks/useLiveTransitionEvents.js

@@ -0,0 +1,57 @@
+import { useAnimationEvents } from './useAnimationEvents.js';
+import { useNumericAnimation } from './useNumericAnimation.js';
+/**
+ * Drives sequence-step transitions (see `useAnimationEvents`) into a
+ * renderer's existing live-override ref — the same ref a controller's live
+ * handle (`useCloudLive`/`useTerrainLive`/`useOceanLive`) already writes into
+ * on every slider drag, and which the renderer already merges over its config
+ * each frame. That merge order is what makes a transition win over whatever
+ * the settings currently say, with no extra "is animating" flag needed.
+ *
+ * Matches `SkyController`'s pattern (capture current value, lerp to target
+ * over the step's duration) but generically: any `to` key that is a number or
+ * number[] animates smoothly via `useNumericAnimation`; anything else
+ * (booleans, strings) switches immediately, the same way `visible` does.
+ */
+export function useLiveTransitionEvents(stateName, liveRef, currentConfig, rootRef) {
+    const { animateNumeric } = useNumericAnimation();
+    useAnimationEvents({
+        onStepStart: (event) => {
+            if (!event.step?.transitions)
+                return;
+            for (const transition of event.step.transitions) {
+                if (transition.state !== stateName)
+                    continue;
+                const toProps = transition.properties.to || {};
+                const fromProps = transition.properties.from || {};
+                // Immediate boolean switch, not animated — mirrors SkyController's `visible`.
+                if (toProps.visible !== undefined && rootRef?.current) {
+                    rootRef.current.visible = toProps.visible;
+                }
+                const from = {};
+                const to = {};
+                for (const key of Object.keys(toProps)) {
+                    if (key === 'visible')
+                        continue;
+                    const toVal = toProps[key];
+                    if (toVal === undefined)
+                        continue;
+                    if (typeof toVal === 'number' || Array.isArray(toVal)) {
+                        to[key] = toVal;
+                        from[key] = fromProps[key] ?? liveRef.current[key] ?? currentConfig?.[key] ?? toVal;
+                    }
+                    else {
+                        // Nothing to interpolate for a string/boolean — apply straight away.
+                        liveRef.current[key] = toVal;
+                    }
+                }
+                if (Object.keys(to).length > 0) {
+                    animateNumeric(from, to, (updated) => {
+                        Object.assign(liveRef.current, updated);
+                    }, () => { }, event.step?.duration);
+                }
+            }
+        },
+    });
+}
+export default useLiveTransitionEvents;

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

@@ -1 +1 @@
-{"version":3,"file":"useOceanMaterial.d.ts","sourceRoot":"","sources":["../../src/hooks/useOceanMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAI7E,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE7E;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;gFAE4E;IAC5E,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACtF;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,oBAAoB,CAAC;IAC/B;0DACsD;IACtD,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;CAChD;AAED,wBAAgB,gBAAgB,CAAC,EAC7B,EAAE,EACF,MAAM,EACN,OAAO,EACP,WAAW,EACX,YAAY,EACZ,YAAgB,EAChB,OAAO,GACV,EAAE,uBAAuB,GAAG,mBAAmB,CAkE/C;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"useOceanMaterial.d.ts","sourceRoot":"","sources":["../../src/hooks/useOceanMaterial.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAY,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAI7E,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE7E;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,EAAE,kBAAkB,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;gFAE4E;IAC5E,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACtF;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,oBAAoB,CAAC;IAC/B;0DACsD;IACtD,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;CAChD;AAED,wBAAgB,gBAAgB,CAAC,EAC7B,EAAE,EACF,MAAM,EACN,OAAO,EACP,WAAW,EACX,YAAY,EACZ,YAAgB,EAChB,OAAO,GACV,EAAE,uBAAuB,GAAG,mBAAmB,CAuE/C;AAED,eAAe,gBAAgB,CAAC"}

package/dist/hooks/useOceanMaterial.js

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useRef } from 'react';
 import { useFrame } from '@react-three/fiber';
 import { useCloudSun } from './useCloudSun.js';
+import { useLiveTransitionEvents } from './useLiveTransitionEvents.js';
 import { OCEAN_LIVE_KEY } from './useOceanLive.js';
 import { OceanSurfaceMaterial } from '../shaders/ocean/OceanSurfaceMaterial.js';
 import { applySunUniforms } from '../utils/cloudUniforms.js';
@@ -35,6 +36,10 @@ export function useOceanMaterial({ id, config, quality, skySettings, timeSetting
         root.userData[OCEAN_LIVE_KEY] = liveHandle;
         return () => { delete root.userData[OCEAN_LIVE_KEY]; };
     }, [id, liveHandle]);
+    // Sequence-authored transitions (`transition.state === 'ocean'`) — shared by
+    // both hosts (OceanSurface, WaterBody), the same way the material and the
+    // live handle already are.
+    useLiveTransitionEvents('ocean', liveConfig, config, rootRef);
     useFrame((state) => {
         const shader = material;
         updateSun();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3driseai/3drise-viewer",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",