@3driseai/3drise-viewer 0.1.28 → 0.1.30

package/dist/hooks/useGridSurface.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"useInteraction.d.ts","sourceRoot":"","sources":["../../src/hooks/useInteraction.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGnG,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI9E,wBAAgB,cAAc,CAAC,EAC3B,cAAc,EAAE,SAAc,EAAE,KAAU,EAAE,eAAoB,GACnE,EAAE;IACC,cAAc,EAAE,WAAW,CAAC;IAC5B,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;CACtC;iCAkBmD,wBAAwB;EA8C3E;AACD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"useInteraction.d.ts","sourceRoot":"","sources":["../../src/hooks/useInteraction.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEnG,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI9E,wBAAgB,cAAc,CAAC,EAC3B,cAAc,EAAE,SAAc,EAAE,KAAU,EAAE,eAAoB,GACnE,EAAE;IACC,cAAc,EAAE,WAAW,CAAC;IAC5B,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IACxB,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;CACtC;iCAkBmD,wBAAwB;EAS3E;AACD,eAAe,cAAc,CAAC"}

package/dist/hooks/useInteraction.js

@@ -15,88 +15,35 @@
  *   actions     apply / revert / toggle an action (SceneActions; its own effects
  *               run through the same runtime).
  */
-import { useCallback, useMemo, useRef } from 'react';
-import { SceneActions } from '@3driseai/3drise-core';
-import ClipsRuntime from '../animationsV2/ClipsRuntime.js';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
 import { clipMap } from '../animationsV2/sequenceUtils.js';
-import { runEffect } from '../operations/runtime.js';
 import { useOperationsRuntime } from '../operations/useOperationsRuntime.js';
+import { commandsOf, registerTriggerCatalog, runCommand } from '../triggers/index.js';
 export function useInteraction({ cameraSettings, sequences = [], clips = [], actionSequences = [], }) {
     // The scene's operation tools (camera, bring-to-front…) for the shared runtime.
     useOperationsRuntime(cameraSettings);
-    // Toggle state: animation ids whose last toggle went "forward".
-    const toggledRef = useRef(new Set());
     const clipsById = useMemo(() => clipMap(clips), [clips]);
-    /** First trigger → forward (false), next → back (true), … per key. */
-    const nextIsBack = useCallback((key) => {
-        const toggled = toggledRef.current;
-        const back = toggled.has(key);
-        if (back)
-            toggled.delete(key);
-        else
-            toggled.add(key);
-        return back;
-    }, []);
+    // Where the commands find their action / clip / sequence (read live: the lists change while editing).
+    const lists = useRef({ clipsById, sequences, actionSequences });
+    lists.current = { clipsById, sequences, actionSequences };
+    const catalog = useMemo(() => ({
+        action: (id) => lists.current.actionSequences.find(x => x.id === id),
+        clip: (id) => lists.current.clipsById.get(id),
+        sequence: (id) => lists.current.sequences.find(s => s.id === id),
+        clips: () => lists.current.clipsById,
+    }), []);
+    // …and the scene's catalog for commands that come without one (studio buttons, nested triggers).
+    useEffect(() => registerTriggerCatalog(catalog), [catalog]);
     // ---------------------------------------------------------------- run
     const executeInteraction = useCallback((params) => {
-        const { interaction, ref } = params;
+        const { interaction, ref, createdObject } = params;
         if (!interaction?.enabled)
             return;
-        // 1. Effects — each on its own targets.
-        for (const effect of interaction.effects ?? [])
-            runEffect(effect, 'trigger', ref);
-        // 2. Animations.
-        for (const a of interaction.animations ?? []) {
-            if (a.kind === 'clip') {
-                const clip = clipsById.get(a.ref);
-                if (!clip)
-                    continue;
-                if (a.command === 'pause')
-                    ClipsRuntime.pause(clip.id);
-                else if (a.command === 'stop')
-                    ClipsRuntime.stop(clip.id);
-                else if (a.command === 'toggle')
-                    ClipsRuntime.play(clip, { reverse: nextIsBack(`clip:${clip.id}`) });
-                else if (ClipsRuntime.isActive(clip.id) && !ClipsRuntime.isPlaying(clip.id) && ClipsRuntime.getTime(clip.id) < clip.duration)
-                    ClipsRuntime.resume(clip.id);
-                else
-                    ClipsRuntime.play(clip, { from: 0 });
-            }
-            else {
-                const seq = sequences.find(s => s.id === a.ref);
-                if (!seq)
-                    continue;
-                if (a.command === 'pause')
-                    ClipsRuntime.pauseSequence(seq.id);
-                else if (a.command === 'stop')
-                    ClipsRuntime.stopSequence(seq.id);
-                else if (a.command === 'toggle') {
-                    const back = nextIsBack(`seq:${seq.id}`);
-                    ClipsRuntime.playSequence(seq, clipsById, { reverse: back ? !seq.reverse : seq.reverse });
-                }
-                else if (ClipsRuntime.isSequenceActive(seq.id) && !ClipsRuntime.isSequencePlaying(seq.id) && ClipsRuntime.getSequenceProgress(seq.id) < 1) {
-                    ClipsRuntime.resumeSequence(seq.id);
-                }
-                else {
-                    // From the start edge of its own direction.
-                    const total = ClipsRuntime.getSequenceDuration(seq.id);
-                    ClipsRuntime.playSequence(seq, clipsById, { from: seq.reverse && total > 0 ? total : 0 });
-                }
-            }
-        }
-        // 3. Actions.
-        for (const a of interaction.actions ?? []) {
-            const action = actionSequences.find(x => x.id === a.ref);
-            if (!action)
-                continue;
-            if (a.command === 'revert')
-                SceneActions.revertAction(action);
-            else if (a.command === 'toggle')
-                SceneActions.toggleAction(action);
-            else
-                SceneActions.applyAction(action);
-        }
-    }, [clipsById, sequences, actionSequences, nextIsBack]);
+        // Every reaction goes through the triggers engine, in the order they always ran.
+        const source = { host: 'interaction', id: `${createdObject?.id ?? '?'}:${interaction.mouseEvent}` };
+        for (const cmd of commandsOf(interaction))
+            runCommand(cmd, { source, self: ref, catalog, chain: [] });
+    }, [catalog]);
     return { executeInteraction };
 }
 export default useInteraction;

package/dist/hooks/useLightConfig.d.ts

@@ -1,6 +1,7 @@
 import type { MutableRefObject, RefObject } from 'react';
 import type { Light, Object3D } from 'three';
 import type { AnimationOptions, MouseMoveDomain } from '@3driseai/3drise-core';
+import type { ConfigLiveValue } from './useConfigLive';
 /**
  * Push a light config onto a THREE light. Only properties the light actually
  * has are written, so one function covers every light type.
@@ -10,7 +11,7 @@ export interface UseLightConfigResult {
     /** Committed config + live drags + animation overrides, refreshed every frame. */
     merged: MutableRefObject<Record<string, any>>;
     /** What the slider drags have written since the last commit. */
-    live: MutableRefObject<Record<string, string | number | boolean>>;
+    live: MutableRefObject<Record<string, ConfigLiveValue>>;
 }
 /**
  * Registers the live-edit handle, evaluates the light's keyframe animations and

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

@@ -1 +1 @@
-{"version":3,"file":"useLightConfig.d.ts","sourceRoot":"","sources":["../../src/hooks/useLightConfig.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAU/E;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CA6B7E;AAED,MAAM,WAAW,oBAAoB;IACjC,kFAAkF;IAClF,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,gEAAgE;IAChE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;CACrE;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC1B,OAAO,EAAE,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,EACnC,QAAQ,EAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EACjC,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,UAAU,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAC1C,SAAS,CAAC,EAAE,eAAe,GAC5B,oBAAoB,CAiEtB;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"useLightConfig.d.ts","sourceRoot":"","sources":["../../src/hooks/useLightConfig.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAMvD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CA6B7E;AAED,MAAM,WAAW,oBAAoB;IACjC,kFAAkF;IAClF,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9C,gEAAgE;IAChE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;CAC3D;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC1B,OAAO,EAAE,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC,EACnC,QAAQ,EAAE,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC,EACjC,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,UAAU,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAC1C,SAAS,CAAC,EAAE,eAAe,GAC5B,oBAAoB,CAiEtB;AAED,eAAe,cAAc,CAAC"}

package/dist/hooks/useOceanMaterial.d.ts

@@ -2,7 +2,7 @@ import * as THREE from 'three';
 import { type RootState } from '@react-three/fiber';
 import type { SkySettings, TimeSettings } from '@3driseai/3drise-core';
 import { OceanSurfaceMaterial } from '../shaders/ocean/OceanSurfaceMaterial';
-import type { OceanConfig, OceanQualityConfig } from '@3driseai/3drise-core';
+import type { OceanConfig, OceanQualityConfig, ObjectAnimations, MouseMoveInteractions } from '@3driseai/3drise-core';
 /**
  * Everything the two water hosts share: the material, the live-edit handle, and
  * the per-frame uniform push.
@@ -23,6 +23,10 @@ export interface UseOceanMaterialOptions {
     skySettings?: SkySettings;
     timeSettings?: TimeSettings;
     sunIntensity?: number;
+    /** Keyframes; the `ocean` domain drives config knobs per frame. */
+    animations?: ObjectAnimations;
+    /** Pointer bindings; same `ocean` domain. */
+    mouseMove?: MouseMoveInteractions;
     /** Runs after the uniforms are pushed, with the live overrides already
      *  merged in — where a host does its own per-frame work (snapping the
      *  clipmap to the camera, say) with the config it is actually rendering. */
@@ -34,6 +38,6 @@ export interface OceanMaterialHandle {
      *  handle a controller reaches through `findById`. */
     rootRef: React.RefObject<THREE.Group | null>;
 }
-export declare function useOceanMaterial({ id, config, quality, skySettings, timeSettings, sunIntensity, onFrame, }: UseOceanMaterialOptions): OceanMaterialHandle;
+export declare function useOceanMaterial({ id, config, quality, skySettings, timeSettings, sunIntensity, animations, mouseMove, onFrame, }: UseOceanMaterialOptions): OceanMaterialHandle;
 export default useOceanMaterial;
 //# sourceMappingURL=useOceanMaterial.d.ts.map

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;AAGvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAU7E,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAStH;;;;;;;;;;;;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,mEAAmE;IACnE,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,6CAA6C;IAC7C,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC;;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,UAAU,EACV,SAAS,EACT,OAAO,GACV,EAAE,uBAAuB,GAAG,mBAAmB,CAuG/C;AAED,eAAe,gBAAgB,CAAC"}

package/dist/hooks/useOceanMaterial.js

@@ -1,3 +1,4 @@
+import * as THREE from 'three';
 import { useEffect, useMemo, useRef } from 'react';
 import { useFrame } from '@react-three/fiber';
 import { useCloudSun } from './useCloudSun.js';
@@ -6,8 +7,16 @@ import { OceanSurfaceMaterial } from '../shaders/ocean/OceanSurfaceMaterial.js';
 import { applySunUniforms } from '../utils/cloudUniforms.js';
 import { applyTerrainAmbient } from '../utils/terrainUniforms.js';
 import { applyOceanUniforms } from '../utils/oceanUniforms.js';
-export function useOceanMaterial({ id, config, quality, skySettings, timeSettings, sunIntensity = 1, onFrame, }) {
+import { resolveMoon, moonlightFactor, MOON_LIGHT_COLOR } from '../utils/skyMoon.js';
+/** Moonlight on the water relative to the sun's (sunIntensity 1). The key light
+ *  runs the moon at ~0.1 of the sun; the water gets a little more so the glitter
+ *  path reads at night. Tuning knob. */
+const MOON_WATER_STRENGTH = 0.15;
+import { getAnimatableProperties } from '@3driseai/3drise-core';
+import { applyConfigKeyframeAnimations, applyConfigMouseMove, } from '../utils/configAnimations.js';
+export function useOceanMaterial({ id, config, quality, skySettings, timeSettings, sunIntensity = 1, animations, mouseMove, onFrame, }) {
     const { state: sun, update: updateSun } = useCloudSun({ skySettings, timeSettings });
+    const moon = useRef({ direction: new THREE.Vector3(), illumination: 0 });
     const material = useMemo(() => new OceanSurfaceMaterial(), []);
     useEffect(() => () => { material.dispose(); }, [material]);
     // Live controller overrides. A slider drag writes here on every pointer-move
@@ -19,6 +28,17 @@ export function useOceanMaterial({ id, config, quality, skySettings, timeSetting
     const liveQuality = useRef({});
     useEffect(() => { liveConfig.current = {}; }, [config]);
     useEffect(() => { liveQuality.current = {}; }, [quality]);
+    // The `ocean` keyframe / pointer domains. Same order as the clouds:
+    // config -> keyframes -> pointer -> live controller drag. The allowed set is the
+    // registry's, so it follows the water type and host exactly as the panels do.
+    const animatable = useMemo(() => new Set(getAnimatableProperties({ type: 'ocean', config }, 'ocean').map(p => p.value)), [config.waterType, config.host]);
+    const override = useRef({});
+    const startValues = useRef({});
+    const animStart = useRef(0);
+    useEffect(() => {
+        animStart.current = performance.now();
+        startValues.current = {};
+    }, [animations]);
     const rootRef = useRef(null);
     // Set in an effect, never as a userData JSX prop: R3F replaces the whole
     // userData object on every render, which would drop the handle whenever
@@ -44,7 +64,22 @@ export function useOceanMaterial({ id, config, quality, skySettings, timeSetting
         // reflect — the sky actually being drawn behind it, or a sunset sea comes
         // out black under a blazing sky.
         applyTerrainAmbient(shader, sun);
-        const cfg = { ...config, ...liveConfig.current };
+        // The moon's glitter path and light on the water, from the same moon
+        // as the key light and the disc (resolveMoon), and the same strength
+        // curve (moonlightFactor), so all three appear and fade together.
+        const m = resolveMoon(timeSettings, sun.direction, moon.current);
+        const sunElevation = THREE.MathUtils.radToDeg(Math.asin(THREE.MathUtils.clamp(sun.direction.y, -1, 1)));
+        const k = MOON_WATER_STRENGTH * moonlightFactor(sunElevation, m) * (skySettings?.sunSystem?.moonIntensity ?? 1);
+        if (shader.uniforms.u_moonDir)
+            shader.uniforms.u_moonDir.value.copy(m.direction);
+        if (shader.uniforms.u_moonColor)
+            shader.uniforms.u_moonColor.value.setRGB(MOON_LIGHT_COLOR.r * k, MOON_LIGHT_COLOR.g * k, MOON_LIGHT_COLOR.b * k);
+        const o = override.current;
+        applyConfigKeyframeAnimations(animations?.ocean?.animations, startValues.current, config, o, performance.now() - animStart.current, animatable);
+        if (mouseMove?.enabled && mouseMove.ocean?.enabled) {
+            applyConfigMouseMove(mouseMove.ocean.properties, config, o, state.pointer, animatable);
+        }
+        const cfg = { ...config, ...o, ...liveConfig.current };
         const qual = { ...quality, ...liveQuality.current };
         applyOceanUniforms(shader, cfg, qual);
         shader.uniforms.u_time.value = state.clock.getElapsedTime();

package/dist/hooks/useSkyLive.d.ts

@@ -0,0 +1,23 @@
+import type { Object3D } from 'three';
+/**
+ * Live sky editing, the counterpart to `useCloudLive` and `useOceanLive`.
+ *
+ * A slider drag writes here on every pointer-move; SkyController's frame loop
+ * lays it over the stored settings (and over any keyframe / pointer domain) and
+ * pushes the uniforms. Redux only hears about it on slider end.
+ *
+ *   const live = useSkyLive(sky.id);
+ *   <BaseControllerUi onLiveChange={live.set} onSettingsChange={dispatch} ... />
+ *
+ * Pass the ID, not a resolved Object3D: the sky mesh is not in the scene while
+ * the sun rig is drawing the background, and a findById() memoised in the
+ * controller would resolve to null once and stay null.
+ */
+/** Where SkyController stashes its handle on the sky mesh's userData. */
+export declare const SKY_LIVE_KEY = "__skyLive";
+export interface SkyLiveHandle {
+    set(key: string, value: number): void;
+}
+export declare function useSkyLive(target?: Object3D | string | null): SkyLiveHandle;
+export default useSkyLive;
+//# sourceMappingURL=useSkyLive.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useSkyLive.d.ts","sourceRoot":"","sources":["../../src/hooks/useSkyLive.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAItC;;;;;;;;;;;;;GAaG;AAEH,yEAAyE;AACzE,eAAO,MAAM,YAAY,cAAc,CAAC;AAExC,MAAM,WAAW,aAAa;IAC1B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC;AAID,wBAAgB,UAAU,CAAC,MAAM,GAAE,QAAQ,GAAG,MAAM,GAAG,IAAa,GAAG,aAAa,CAQnF;AAED,eAAe,UAAU,CAAC"}

package/dist/hooks/useSkyLive.js

@@ -0,0 +1,30 @@
+import { useMemo } from 'react';
+import { SKY_ID } from '@3driseai/3drise-core';
+import { findById } from '../utils/sceneQuery.js';
+/**
+ * Live sky editing, the counterpart to `useCloudLive` and `useOceanLive`.
+ *
+ * A slider drag writes here on every pointer-move; SkyController's frame loop
+ * lays it over the stored settings (and over any keyframe / pointer domain) and
+ * pushes the uniforms. Redux only hears about it on slider end.
+ *
+ *   const live = useSkyLive(sky.id);
+ *   <BaseControllerUi onLiveChange={live.set} onSettingsChange={dispatch} ... />
+ *
+ * Pass the ID, not a resolved Object3D: the sky mesh is not in the scene while
+ * the sun rig is drawing the background, and a findById() memoised in the
+ * controller would resolve to null once and stay null.
+ */
+/** Where SkyController stashes its handle on the sky mesh's userData. */
+export const SKY_LIVE_KEY = '__skyLive';
+const NOOP = { set: () => { } };
+export function useSkyLive(target = SKY_ID) {
+    return useMemo(() => {
+        const resolve = () => {
+            const object = typeof target === 'string' ? findById(target) : target;
+            return object?.userData?.[SKY_LIVE_KEY] ?? NOOP;
+        };
+        return { set: (key, value) => resolve().set(key, value) };
+    }, [target]);
+}
+export default useSkyLive;

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

@@ -1 +1 @@
-{"version":3,"file":"useSkyUniforms.d.ts","sourceRoot":"","sources":["../../src/hooks/useSkyUniforms.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,wBAAgB,cAAc,IAAI;IAC1B,cAAc,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACzD,gBAAgB,EAAE,MAAM;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,GAAG,CAAC;QACf,QAAQ,EAAE,GAAG,CAAC;QACd,cAAc,EAAE,GAAG,CAAC;QACpB,eAAe,EAAE,GAAG,CAAC;KACxB,GAAG,IAAI,CAAC;IACT,sBAAsB,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK;QAC9C,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;CACL,CAmEJ"}
+{"version":3,"file":"useSkyUniforms.d.ts","sourceRoot":"","sources":["../../src/hooks/useSkyUniforms.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,wBAAgB,cAAc,IAAI;IAC1B,cAAc,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IACzD,gBAAgB,EAAE,MAAM;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,SAAS,EAAE,GAAG,CAAC;QACf,QAAQ,EAAE,GAAG,CAAC;QACd,cAAc,EAAE,GAAG,CAAC;QACpB,eAAe,EAAE,GAAG,CAAC;KACxB,GAAG,IAAI,CAAC;IACT,sBAAsB,EAAE,CAAC,WAAW,EAAE,OAAO,KAAK;QAC9C,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACnB,CAAC;CACL,CA0DJ"}

package/dist/hooks/useSkyUniforms.js

@@ -1,5 +1,6 @@
 import { useRef, useCallback } from 'react';
 import { createSunPosition } from '../utils/utils3d.js';
+import { sunAnglesFromDirection } from '@3driseai/3drise-core';
 import { findById } from '@3driseai/3drise-core';
 export function useSkyUniforms() {
     const skyMeshRef = useRef(null);
@@ -15,16 +16,7 @@ export function useSkyUniforms() {
         skyMeshRef.current = findById('3drise-sky') || null;
         return skyMeshRef.current;
     }, []);
-    const getElevationAndAzimuth = useCallback((sunPosition) => {
-        const { x, y, z } = sunPosition;
-        const r = Math.sqrt(x * x + y * y + z * z);
-        const phi = Math.acos(y / r);
-        const theta = Math.atan2(z, x);
-        return {
-            elevation: 90 - phi * (180 / Math.PI),
-            azimuth: theta * (180 / Math.PI),
-        };
-    }, []);
+    const getElevationAndAzimuth = useCallback((sunPosition) => sunAnglesFromDirection(sunPosition), []);
     const updateUniforms = useCallback((settings) => {
         const skyRef = getSkyRef();
         if (!skyRef?.material)

package/dist/hooks/useTerrainLive.d.ts

@@ -21,7 +21,9 @@ import type { Object3D } from 'three';
 /** Where TerrainSurface stashes its handle on the root object's userData. */
 export declare const TERRAIN_LIVE_KEY = "__terrainLive";
 export interface TerrainLiveHandle {
-    config(key: string, value: number | boolean | string): void;
+    /** `textures` takes the whole layer block — a texture-layer slider drags it
+     *  live (tile size, strength, tint are uniforms; nothing repacks). */
+    config(key: string, value: number | boolean | string | object): void;
     quality(key: string, value: number | boolean | string): void;
 }
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"useTerrainLive.d.ts","sourceRoot":"","sources":["../../src/hooks/useTerrainLive.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGtC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,6EAA6E;AAC7E,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;IAC5D,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;CAChE;AAID;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,GAAG,iBAAiB,CAcnF;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"useTerrainLive.d.ts","sourceRoot":"","sources":["../../src/hooks/useTerrainLive.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAGtC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,6EAA6E;AAC7E,eAAO,MAAM,gBAAgB,kBAAkB,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IAC9B;0EACsE;IACtE,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACrE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;CAChE;AAID;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,GAAG,iBAAiB,CAcnF;AAED,eAAe,cAAc,CAAC"}

package/dist/hooks/useTerrainTextures.d.ts

@@ -0,0 +1,38 @@
+import * as THREE from 'three';
+import { type TerrainTextures } from '@3driseai/3drise-core';
+/**
+ * The terrain's four texture layers, loaded and packed into three arrays.
+ *
+ * | array  | R      | G         | B   | A        |
+ * |--------|--------|-----------|-----|----------|
+ * | color  | albedo (sRGB)            || 255      |
+ * | normal | tangent normal, GL       || height   |
+ * | orm    | AO     | roughness | 0   | 255      |
+ *
+ * Height is the set's displacement map; a set without one falls back to its AO,
+ * which tracks height closely on ground scans (cavities are dark), and to a flat
+ * mid value without either. Three arrays rather than five: 4 layers x 1024^2 x 3
+ * is ~50 MB, ~67 MB with mips.
+ *
+ * Returns a ref-stable state object that is mutated when a new set of arrays is
+ * ready, so the frame loop reads it without React re-rendering. The previous
+ * arrays are released only after the new ones are in, so a set change does not
+ * blink the ground.
+ *
+ * The arrays are SHARED: a module-level cache keyed by the URLs, reference
+ * counted. The environment terrain and every land object on the same ground use
+ * one copy — at ~67 MB a copy, five patches of Alpine meadow must not cost five.
+ */
+export interface TerrainTextureState {
+    ready: boolean;
+    color: THREE.DataArrayTexture | null;
+    normal: THREE.DataArrayTexture | null;
+    orm: THREE.DataArrayTexture | null;
+    /** Per layer: has a colour map, so it draws textured. */
+    textured: boolean[];
+    meanColor: THREE.Vector3[];
+    meanNormal: THREE.Vector3[];
+    meanOrm: THREE.Vector3[];
+}
+export declare function useTerrainTextures(textures: TerrainTextures | undefined, anisotropy?: number): TerrainTextureState;
+//# sourceMappingURL=useTerrainTextures.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useTerrainTextures.d.ts","sourceRoot":"","sources":["../../src/hooks/useTerrainTextures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAGhF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAA;IACpC,MAAM,EAAE,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAA;IACrC,GAAG,EAAE,KAAK,CAAC,gBAAgB,GAAG,IAAI,CAAA;IAClC,yDAAyD;IACzD,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE,CAAA;IAC1B,UAAU,EAAE,KAAK,CAAC,OAAO,EAAE,CAAA;IAC3B,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAA;CAC3B;AAwHD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,eAAe,GAAG,SAAS,EAAE,UAAU,SAAI,GAAG,mBAAmB,CAwC7G"}

package/dist/hooks/useTerrainTextures.js

@@ -0,0 +1,149 @@
+import { useEffect, useMemo, useRef } from 'react';
+import * as THREE from 'three';
+import { TERRAIN_LAYER_KEYS } from '@3driseai/3drise-core';
+import { buildChannelArray, loadArrayImageOrNull } from '../utils/textureArrays.js';
+/** Array layer size. Every source is redrawn at this size. */
+const ARRAY_SIZE = 1024;
+/** Only the URLs matter: tile size, tint and strength are uniforms and must not
+ *  trigger a repack. */
+function urlsKey(textures) {
+    return JSON.stringify(TERRAIN_LAYER_KEYS.map((k) => {
+        const m = textures?.[k]?.maps ?? {};
+        return [m.color ?? '', m.normal ?? '', m.roughness ?? '', m.ao ?? '', m.displacement ?? ''];
+    }));
+}
+const cache = new Map();
+function disposeData(d) {
+    d?.color?.dispose();
+    d?.normal?.dispose();
+    d?.orm?.dispose();
+}
+async function buildArrays(urls, anisotropy) {
+    const images = await Promise.all(urls.map((layer) => Promise.all(layer.map((u) => loadArrayImageOrNull(u)))));
+    const colorLayers = [];
+    const normalLayers = [];
+    const ormLayers = [];
+    const textured = [];
+    for (const [color, normal, roughness, ao, displacement] of images) {
+        textured.push(!!color);
+        colorLayers.push([
+            { image: color, channel: 0, fallback: 128 },
+            { image: color, channel: 1, fallback: 128 },
+            { image: color, channel: 2, fallback: 128 },
+            { image: null, fallback: 255 },
+        ]);
+        const height = displacement ?? ao;
+        normalLayers.push([
+            { image: normal, channel: 0, fallback: 128 },
+            { image: normal, channel: 1, fallback: 128 },
+            { image: normal, channel: 2, fallback: 255 },
+            { image: height, channel: 0, fallback: 128 },
+        ]);
+        ormLayers.push([
+            { image: ao, channel: 0, fallback: 255 },
+            { image: roughness, channel: 0, fallback: 230 },
+            { image: null, fallback: 0 },
+            { image: null, fallback: 255 },
+        ]);
+    }
+    try {
+        const color = buildChannelArray(colorLayers, ARRAY_SIZE, THREE.SRGBColorSpace);
+        const normal = buildChannelArray(normalLayers, ARRAY_SIZE, THREE.NoColorSpace);
+        const orm = buildChannelArray(ormLayers, ARRAY_SIZE, THREE.NoColorSpace);
+        for (const b of [color, normal, orm])
+            b.texture.anisotropy = anisotropy;
+        return {
+            color: color.texture,
+            normal: normal.texture,
+            orm: orm.texture,
+            meanColor: color.means,
+            meanNormal: normal.means,
+            meanOrm: orm.means,
+            textured,
+        };
+    }
+    catch (error) {
+        console.warn('[terrain] texture packing failed:', error);
+        return null;
+    }
+}
+function acquire(urlKey, anisotropy) {
+    const key = `${anisotropy}|${urlKey}`;
+    let entry = cache.get(key);
+    if (!entry) {
+        const created = { key, refs: 0, data: null, disposed: false, promise: Promise.resolve(null) };
+        created.promise = buildArrays(JSON.parse(urlKey), anisotropy).then((data) => {
+            // Released while loading: nobody will ever read it.
+            if (created.disposed) {
+                disposeData(data);
+                return null;
+            }
+            created.data = data;
+            return data;
+        });
+        cache.set(key, created);
+        entry = created;
+    }
+    entry.refs++;
+    return entry;
+}
+function release(entry) {
+    if (!entry)
+        return;
+    entry.refs--;
+    if (entry.refs > 0)
+        return;
+    entry.disposed = true;
+    cache.delete(entry.key);
+    disposeData(entry.data);
+    entry.data = null;
+}
+const EMPTY = () => ({
+    ready: false,
+    color: null,
+    normal: null,
+    orm: null,
+    textured: [false, false, false, false],
+    meanColor: [],
+    meanNormal: [],
+    meanOrm: [],
+});
+export function useTerrainTextures(textures, anisotropy = 8) {
+    const key = useMemo(() => urlsKey(textures), [textures]);
+    const state = useRef(EMPTY()).current;
+    /** The cache entry `state` currently shows. */
+    const held = useRef(null);
+    useEffect(() => {
+        const urls = JSON.parse(key);
+        if (!urls.some((layer) => !!layer[0])) {
+            Object.assign(state, EMPTY());
+            release(held.current);
+            held.current = null;
+            return;
+        }
+        let cancelled = false;
+        const entry = acquire(key, anisotropy);
+        entry.promise.then((data) => {
+            if (cancelled || !data)
+                return;
+            Object.assign(state, data, { ready: true });
+            const old = held.current;
+            held.current = entry;
+            // Same entry re-acquired (anisotropy unchanged, key back): drop the extra ref.
+            release(old);
+        });
+        return () => {
+            cancelled = true;
+            // Never shown: give it back. A shown entry is released when its
+            // replacement arrives, or on unmount.
+            if (held.current !== entry)
+                release(entry);
+        };
+    }, [key, anisotropy, state]);
+    useEffect(() => () => {
+        release(held.current);
+        held.current = null;
+        Object.assign(state, EMPTY());
+    }, [state]);
+    return state;
+}