@3driseai/3drise-viewer 0.1.30 → 0.1.32

package/dist/animationsV2/ClipPlayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClipPlayer.d.ts","sourceRoot":"","sources":["../../src/animationsV2/ClipPlayer.tsx"],"names":[],"mappings":"AAwBA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAKjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEhE,MAAM,WAAW,eAAe;IAC5B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;IACpC,wDAAwD;IACxD,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IACvD,6FAA6F;IAC7F,QAAQ,CAAC,EAAE;QAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;QAAC,KAAK,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC;CACzE;AAcD,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAuJzC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"ClipPlayer.d.ts","sourceRoot":"","sources":["../../src/animationsV2/ClipPlayer.tsx"],"names":[],"mappings":"AAwBA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAKjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEhE,MAAM,WAAW,eAAe;IAC5B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;IACpC,wDAAwD;IACxD,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IACvD,6FAA6F;IAC7F,QAAQ,CAAC,EAAE;QAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC;QAAC,KAAK,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC;CACzE;AAcD,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAyJzC,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/animationsV2/ClipPlayer.js

@@ -156,12 +156,14 @@ const ClipPlayer = ({ getSettings, getAction, autoplay }) => {
         };
     }, [gl]);
     // --- zoom: OrbitControls must not zoom while the wheel drives a sequence -----------
-    const zoomRestore = useRef(null);
+    // Held off every frame while one runs (the camera settings sync may write it back), and
+    // handed back afterwards with the authored setting (so the Controls zoom switch wins).
+    const zoomHeld = useRef(null);
+    const authoredZoom = () => settingsRef.current('camera')?.controls?.enableZoom !== false;
     useEffect(() => () => {
-        const z = zoomRestore.current;
-        if (z?.controls)
-            z.controls.enableZoom = z.enableZoom;
-        zoomRestore.current = null;
+        if (zoomHeld.current)
+            zoomHeld.current.enableZoom = authoredZoom();
+        zoomHeld.current = null;
     }, []);
     // --- camera: OrbitControls sit out while an animation drives the camera ------------
     // Their update (damping residue, min / max distance and angle limits, auto-rotate)
@@ -187,15 +189,15 @@ const ClipPlayer = ({ getSettings, getAction, autoplay }) => {
             cameraHeld.current = null;
         }
         const wheelActive = ClipsRuntime.getDrivenSequences().some(d => d.driver === 'mouseWheel');
-        const z = zoomRestore.current;
-        if (wheelActive && controls && !z) {
-            zoomRestore.current = { controls, enableZoom: controls.enableZoom !== false };
+        if (wheelActive && controls) {
+            if (zoomHeld.current && zoomHeld.current !== controls)
+                zoomHeld.current.enableZoom = authoredZoom();
+            zoomHeld.current = controls;
             controls.enableZoom = false;
         }
-        else if ((!wheelActive || z?.controls !== controls) && z) {
-            if (z.controls)
-                z.controls.enableZoom = z.enableZoom;
-            zoomRestore.current = null;
+        else if (zoomHeld.current) {
+            zoomHeld.current.enableZoom = authoredZoom();
+            zoomHeld.current = null;
         }
     });
     return null;

package/dist/animationsV2/ClipsRuntime.d.ts

@@ -102,6 +102,12 @@ declare class ClipsRuntime {
     pose(clip: AnimationClip, t: number): void;
     /** The clip data changed (editor edit): keep time and play state, use the new tracks. */
     updateClip(clip: AnimationClip): void;
+    /**
+     * A timeline's cue lanes changed under it (a Change cue's settings edited, a lane's
+     * command swapped): let go of every lane it holds; the next tick switches the lanes
+     * back on at the playhead with their new commands.
+     */
+    resyncCues(host: 'sequence' | 'clip', timelineId: string): void;
     getTime(clipId: string): number;
     isPlaying(clipId: string): boolean;
     isActive(clipId: string): boolean;
@@ -184,6 +190,9 @@ declare class ClipsRuntime {
      */
     private advanceSequence;
     private finishSequence;
+    /** Owners already reported for an element (one report per pair until reset). */
+    private clashed;
+    private noteLayerClash;
     private emit;
     private bump;
     /** A state change: notifies both kinds of subscribers. */

package/dist/animationsV2/ClipsRuntime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClipsRuntime.d.ts","sourceRoot":"","sources":["../../src/animationsV2/ClipsRuntime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClipsRuntime.d.ts","sourceRoot":"","sources":["../../src/animationsV2/ClipsRuntime.ts"],"names":[],"mappings":"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"}

package/dist/animationsV2/ClipsRuntime.js

@@ -39,7 +39,8 @@
 // driven); a posed sequence (the editor's scrub) applies patches only. Stopping
 // the sequence reverts its actions; a 'hold' finish keeps them.
 //
-import { SceneActions } from '@3driseai/3drise-core';
+import { SceneActions, expandMaterialVariant } from '@3driseai/3drise-core';
+import { logTrigger } from '../triggers/log.js';
 import { getAtPath, sampleTrack } from './clipUtils.js';
 import { applyValue, clearApplierCaches, isApplicable, isTargetMounted } from './appliers.js';
 import { readNodeValue, restoreNodeTrack } from './nodeTracks.js';
@@ -53,8 +54,9 @@ const REWRITE_FRAMES = 30;
 /** Deep patch from flat (path -> value) pairs. */
 function patchOf(pairs) {
     const out = {};
-    for (const [path, value] of pairs) {
-        const parts = path.split('.');
+    for (const [path, value, node] of pairs) {
+        // A part's switch track sits under its node override (node keys may contain dots: no split).
+        const parts = node ? ['config', 'nodeOverrides', node, ...path.split('.')] : path.split('.');
         let cur = out;
         for (let i = 0; i < parts.length - 1; i++)
             cur = (cur[parts[i]] ??= {});
@@ -185,6 +187,7 @@ class ClipsRuntime {
         this.written.clear();
         this.laid.clear();
         this.rewrite.clear();
+        this.clashed.clear();
         SceneActions.setLayer(TIMELINE_LAYER, null);
         clearApplierCaches();
         this.bumpState();
@@ -259,6 +262,19 @@ class ClipsRuntime {
         this.written.clear(); // values may have changed under the same time
         this.bumpState();
     }
+    /**
+     * A timeline's cue lanes changed under it (a Change cue's settings edited, a lane's
+     * command swapped): let go of every lane it holds; the next tick switches the lanes
+     * back on at the playhead with their new commands.
+     */
+    resyncCues(host, timelineId) {
+        const inst = host === 'clip' ? this.clips.get(timelineId) : this.sequences.get(timelineId);
+        if (!inst)
+            return;
+        this.releaseCues(inst.owned, host, timelineId);
+        inst.cueState.clear();
+        this.bump();
+    }
     getTime(clipId) { return this.clips.get(clipId)?.time ?? 0; }
     isPlaying(clipId) { return !!this.clips.get(clipId)?.playing; }
     isActive(clipId) { return this.clips.has(clipId); }
@@ -534,12 +550,13 @@ class ClipsRuntime {
             if (!p.discrete)
                 continue;
             const list = discrete.get(p.state) ?? [];
-            list.push([p.path, p.value]);
+            list.push([p.path, p.value, p.node]);
             discrete.set(p.state, list);
         }
         const layer = {};
+        // A material variant switch track stands for the variant's full settings (expanded here).
         for (const [state, pairs] of discrete)
-            layer[state] = patchOf(pairs);
+            layer[state] = expandMaterialVariant(patchOf(pairs));
         for (const state of new Set([...this.laid.keys(), ...discrete.keys()])) {
             const json = layer[state] ? JSON.stringify(layer[state]) : '';
             if ((this.laid.get(state) ?? '') === json)
@@ -549,6 +566,9 @@ class ClipsRuntime {
             else
                 this.laid.delete(state);
             this.rewrite.set(state, REWRITE_FRAMES);
+            // Switch tracks over an action / Change cue setting the same thing: reported, not resolved.
+            if (json)
+                this.noteLayerClash(state, layer[state]);
         }
         SceneActions.setLayer(TIMELINE_LAYER, layer);
         const failed = [];
@@ -587,7 +607,10 @@ class ClipsRuntime {
                     missing.add(t.node ? `${t.state} › ${t.node}` : t.state);
             }
         }
-        const idsOf = (c) => (c?.kind === 'effect' ? c.effect?.targets ?? [] : c?.kind === 'effectClip' ? c.use?.targets ?? [] : []);
+        const ENV = ['camera', 'sky', 'clouds', 'ocean', 'terrain'];
+        const idsOf = (c) => (c?.kind === 'effect' ? c.effect?.targets ?? []
+            : c?.kind === 'effectClip' ? c.use?.targets ?? []
+                : c?.kind === 'change' ? (c.targets ?? []).map((t) => t?.state).filter((s) => s && !ENV.includes(s)) : []);
         for (const sc of inst.schedule.cues) {
             const cmd = cueCommand(sc.cue);
             for (const id of idsOf(cmd))
@@ -624,6 +647,15 @@ class ClipsRuntime {
             if ((state.get(key) ?? false) === on) {
                 if (!wanted.has(key))
                     state.delete(key);
+                else if (on) {
+                    // The lane's command changed under it (a Change cue edited, a lane re-targeted): re-apply it.
+                    const cmd = commandOf.get(key);
+                    const prev = owned.get(key);
+                    if (cmd && prev && prev !== cmd && JSON.stringify(prev) !== JSON.stringify(cmd) && this.cueRunner) {
+                        if (this.cueRunner(cmd, 'apply', { ...opts, getAction: this.ctx?.getAction }))
+                            owned.set(key, cmd);
+                    }
+                }
                 continue;
             }
             if (wanted.has(key))
@@ -854,6 +886,21 @@ class ClipsRuntime {
         if (inst.seq.endMode === 'restore')
             this.stopSequence(inst.seq.id);
     }
+    /** Owners already reported for an element (one report per pair until reset). */
+    clashed = new Set();
+    noteLayerClash(state, patch) {
+        for (const owner of SceneActions.overlaps(state, patch, `layer:${TIMELINE_LAYER}`)) {
+            const key = `${state}|${owner}`;
+            if (this.clashed.has(key))
+                continue;
+            this.clashed.add(key);
+            const who = owner.startsWith('layer:change:') ? `Change cue ${owner.slice(13)}` : owner.startsWith('layer:') ? owner.slice(6) : `action ${owner}`;
+            logTrigger({
+                type: 'clash', kind: 'animationClip', subject: state, source: { host: 'clip', id: 'switch-tracks' }, chain: [],
+                detail: `a switch track sets the same settings on ${state} as ${who} — the last one to change wins`,
+            });
+        }
+    }
     emit(e) {
         this.eventListeners.forEach(l => { try {
             l(e);
@@ -882,7 +929,7 @@ function* sampleTracks(tracks, t) {
         const value = sampleTrack(track, t);
         if (value === undefined)
             continue;
-        yield { state: track.state, node: track.node, path: track.path, value, discrete: track.discrete && !track.node };
+        yield { state: track.state, node: track.node, path: track.path, value, discrete: !!track.discrete };
     }
 }
 const clipsRuntime = new ClipsRuntime();

package/dist/animationsV2/appliers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appliers.d.ts","sourceRoot":"","sources":["../../src/animationsV2/appliers.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAgB/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGxC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,qDAAqD;IACrD,QAAQ,EAAE,GAAG,CAAC;IACd,yFAAyF;IACzF,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;IACpC,0EAA0E;IAC1E,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;CACxD;AAWD,wBAAgB,kBAAkB,IAAI,IAAI,CAIzC;AAsLD,uFAAuF;AACvF,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAIlH;AAED,mFAAmF;AACnF,wBAAgB,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAKxF;AAED,yEAAyE;AACzE,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE"}
+{"version":3,"file":"appliers.d.ts","sourceRoot":"","sources":["../../src/animationsV2/appliers.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAiB/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGxC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;IACjC,qDAAqD;IACrD,QAAQ,EAAE,GAAG,CAAC;IACd,yFAAyF;IACzF,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;IACpC,0EAA0E;IAC1E,SAAS,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;CACxD;AAWD,wBAAgB,kBAAkB,IAAI,IAAI,CAIzC;AAwMD,uFAAuF;AACvF,mFAAmF;AACnF,wBAAgB,UAAU,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAIlH;AAED,mFAAmF;AACnF,wBAAgB,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAKxF;AAED,yEAAyE;AACzE,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjE"}

package/dist/animationsV2/appliers.js

@@ -4,7 +4,8 @@ import { CLOUD_LIVE_KEY } from '../hooks/useCloudLive.js';
 import { OCEAN_LIVE_KEY } from '../hooks/useOceanLive.js';
 import { TERRAIN_LIVE_KEY } from '../hooks/useTerrainLive.js';
 import { createSunPosition } from '../utils/utils3d.js';
-import { sunAnglesFromDirection } from '@3driseai/3drise-core';
+import { sunAnglesFromDirection, skySystemManager } from '@3driseai/3drise-core';
+import { sunSystemLive, SUN_SYSTEM_LIVE_PATHS, TIME_PATHS } from './sunSystemLive.js';
 import { publishRenderedSky, sceneOf } from '../utils/renderedSky.js';
 import { applyNodeValue, clearNodeCaches, nodesFor } from './nodeTracks.js';
 // --- live-target caches (cleared when the scene changes under us) -------------
@@ -202,8 +203,26 @@ const applyTerrain = (ctx, _state, path, value) => {
         return false;
     handle.config(path.slice('config.'.length), value);
 };
+/**
+ * Time: the Sky System clock and rig. `hour` seeks the clock (sun, moon, sky colours and
+ * the key light all follow it); the rest are live multipliers the Sky System reads per frame.
+ */
+const applyTime = (_ctx, _state, path, value) => {
+    if (typeof value !== 'number' || !Number.isFinite(value))
+        return false;
+    if (path === 'hour') {
+        skySystemManager.setTime(((value % 24) + 24) % 24);
+        return;
+    }
+    if (SUN_SYSTEM_LIVE_PATHS.includes(path)) {
+        sunSystemLive[path] = Math.max(0, value);
+        return;
+    }
+    return false;
+};
 const APPLIERS = [
     { match: (s) => s === 'camera', apply: applyCamera },
+    { match: (s, p) => s === 'time' && TIME_PATHS.includes(p), apply: applyTime },
     // Environment before the generic path families: the ocean's `config.*` is not an object's.
     { match: (s) => s === 'sky', apply: applySky },
     { match: (s) => s === 'clouds', apply: applyClouds },
@@ -226,7 +245,7 @@ export function applyValue(ctx, state, path, value, node) {
 export function isTargetMounted(ctx, state, node) {
     if (state === 'camera')
         return !!ctx.camera;
-    if (state === 'sky' || state === 'clouds' || state === 'ocean' || state === 'terrain')
+    if (state === 'sky' || state === 'clouds' || state === 'ocean' || state === 'terrain' || state === 'time')
         return true;
     if (node)
         return nodesFor(state, node).length > 0;

package/dist/animationsV2/clipUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clipUtils.d.ts","sourceRoot":"","sources":["../../src/animationsV2/clipUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAOlF,eAAO,MAAM,GAAG,GAAI,QAAQ,MAAM,WAAqF,CAAC;AAExH,uFAAuF;AACvF,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAOrD;AAMD,eAAO,MAAM,cAAc,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAwB,CAAC;AAC9E,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,EAAE,KAAK,MAAM,WAAgB,CAAC;AAC1E,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAgD,CAAC;AAEnG,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAKvD;AAaD,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAK1E;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAsBzE;AAMD,eAAO,MAAM,QAAQ,GAAI,MAAM,QAAQ,EAAE,eAAwC,CAAC;AAElF,2EAA2E;AAC3E,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAOtF;AAED,0FAA0F;AAC1F,wBAAgB,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,aAAa,CAc9G;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,aAAa,CAKrF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,GAAG,aAAa,CAQtG;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,aAAa,CAQ9F;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,QAAQ,CAAA;CAAE,GAAG,SAAS,CAMvG;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,EAAE,CAIzD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAEhE;AAED,4CAA4C;AAC5C,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAQvF"}
+{"version":3,"file":"clipUtils.d.ts","sourceRoot":"","sources":["../../src/animationsV2/clipUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAOlF,eAAO,MAAM,GAAG,GAAI,QAAQ,MAAM,WAAqF,CAAC;AAExH,uFAAuF;AACvF,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAOrD;AAMD,eAAO,MAAM,cAAc,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAwB,CAAC;AAC9E,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,EAAE,KAAK,MAAM,WAAgB,CAAC;AAC1E,eAAO,MAAM,WAAW,GAAI,GAAG,MAAM,EAAE,KAAK,MAAM,WAAgD,CAAC;AAEnG,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAKvD;AAaD,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAK1E;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAyBzE;AAMD,eAAO,MAAM,QAAQ,GAAI,MAAM,QAAQ,EAAE,eAAwC,CAAC;AAElF,2EAA2E;AAC3E,wBAAgB,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,CAOtF;AAED,0FAA0F;AAC1F,wBAAgB,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,aAAa,CAc9G;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,aAAa,CAKrF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,GAAG,aAAa,CAQtG;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,aAAa,CAQ9F;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,QAAQ,CAAA;CAAE,GAAG,SAAS,CAMvG;AAED,oEAAoE;AACpE,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,EAAE,CAIzD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAEhE;AAED,4CAA4C;AAC5C,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAQvF"}

package/dist/animationsV2/clipUtils.js

@@ -54,6 +54,10 @@ export function sampleTrack(track, t) {
     const keys = track.keys;
     if (keys.length === 0)
         return undefined;
+    // A switch track switches AT its first key: before it the element keeps its authored value
+    // (an eased track holds its first value before it, so a move can start later than 0).
+    if (t < keys[0].t - 1e-9 && track.discrete)
+        return undefined;
     if (t <= keys[0].t)
         return keys[0].value;
     const last = keys[keys.length - 1];

package/dist/animationsV2/sequenceUtils.js

@@ -145,13 +145,12 @@ export function findCueConflicts(seq, clips, getAction) {
         if (sc.cue.mode !== 'apply')
             continue;
         const cmd = cueCommand(sc.cue);
-        if (cmd?.kind !== 'action')
-            continue;
-        const action = getAction(cmd.ref);
-        if (!action?.targets?.length)
+        // an action's patches, or a Change cue's own
+        const targets = cmd?.kind === 'action' ? getAction(cmd.ref)?.targets : cmd?.kind === 'change' ? cmd.targets : undefined;
+        if (!targets?.length)
             continue;
         const entries = schedule.entries.filter(e => e.stepIndex === sc.stepIndex);
-        for (const target of action.targets) {
+        for (const target of targets) {
             const paths = patchPaths(target.patch);
             for (const e of entries) {
                 for (const track of e.clip.tracks) {

package/dist/animationsV2/sunSystemLive.d.ts

@@ -0,0 +1,12 @@
+export interface SunSystemLive {
+    moonSize?: number;
+    sunSize?: number;
+    intensity?: number;
+    moonIntensity?: number;
+}
+export declare const sunSystemLive: SunSystemLive;
+export declare const SUN_SYSTEM_LIVE_PATHS: readonly ["moonSize", "sunSize", "intensity", "moonIntensity"];
+/** Every path the `time` target accepts. */
+export declare const TIME_PATHS: readonly ["hour", "moonSize", "sunSize", "intensity", "moonIntensity"];
+export declare function resetSunSystemLive(): void;
+//# sourceMappingURL=sunSystemLive.d.ts.map

package/dist/animationsV2/sunSystemLive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sunSystemLive.d.ts","sourceRoot":"","sources":["../../src/animationsV2/sunSystemLive.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,aAAa,EAAE,aAAkB,CAAC;AAE/C,eAAO,MAAM,qBAAqB,gEAAiE,CAAC;AACpG,4CAA4C;AAC5C,eAAO,MAAM,UAAU,wEAA8C,CAAC;AAEtE,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC"}

package/dist/animationsV2/sunSystemLive.js

@@ -0,0 +1,8 @@
+export const sunSystemLive = {};
+export const SUN_SYSTEM_LIVE_PATHS = ['moonSize', 'sunSize', 'intensity', 'moonIntensity'];
+/** Every path the `time` target accepts. */
+export const TIME_PATHS = ['hour', ...SUN_SYSTEM_LIVE_PATHS];
+export function resetSunSystemLive() {
+    for (const k of SUN_SYSTEM_LIVE_PATHS)
+        delete sunSystemLive[k];
+}

package/dist/api/sceneHandle.d.ts

@@ -62,10 +62,12 @@ export type SceneValue = number | boolean | string | number[];
 /** Write live properties of the scene — what a slider or colour picker does. */
 export interface SceneValues {
     /**
-     * Write one property now. `target` is `sky` | `camera` | `clouds` | `ocean` | `terrain`, or an
+     * Write one property now. `target` is `sky` | `camera` | `clouds` | `ocean` | `terrain` | `time`, or an
      * object ref (key, id or exact name), with `/NodeName` to address a part of a model. `path` is a
      * settings path as clip tracks use it (`materialSettings.opacity`, `meshSettings.position.y`,
      * `config.intensity`, `sky:elevation`; for a model node: `position`, `rotation.y`, `material.color`).
+     * `time` drives the Sky System: `hour` (the clock — sun, moon, sky, light), `moonSize`, `sunSize`,
+     * `intensity`, `moonIntensity` (`sky` is the analytic sky, not the Sky System).
      * A `.x` / `.y` / `.z` suffix writes one component of a vector. Nothing is saved: this is the
      * live scene, like an animation frame, and a page reload puts it back. False when the target or
      * path is not writable (see `check`).

package/dist/api/sceneHandle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sceneHandle.d.ts","sourceRoot":"","sources":["../../src/api/sceneHandle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sceneHandle.d.ts","sourceRoot":"","sources":["../../src/api/sceneHandle.ts"],"names":[],"mappings":"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"}

package/dist/api/sceneHandle.js

@@ -182,7 +182,7 @@ export function createSceneHandle(getSource) {
         },
     };
     // ----- values ----------------------------------------------------------------------
-    const ENVIRONMENT = ['camera', 'sky', 'clouds', 'ocean', 'terrain'];
+    const ENVIRONMENT = ['camera', 'sky', 'clouds', 'ocean', 'terrain', 'time'];
     const COMPONENT = { x: 0, y: 1, z: 2 };
     /** `engine/Door` -> { state: <object id>, node: 'Door' }; quiet when it is unknown (this runs on a poll). */
     function target(ref) {
@@ -207,7 +207,7 @@ export function createSceneHandle(getSource) {
         check(ref, path) {
             const t = target(ref);
             if (!t)
-                return `no target "${ref}". Use sky, camera, clouds, ocean, terrain or an object${ref.includes('/') ? ' (and sky/camera/… take no node)' : ''}.`;
+                return `no target "${ref}". Use sky, camera, clouds, ocean, terrain, time or an object${ref.includes('/') ? ' (and sky/camera/… take no node)' : ''}.`;
             const c = t.node ? undefined : component(t.state, t.node, path);
             if (!t.node && !ClipsRuntime.canSetLiveValue(t.state, c ? c.base : path))
                 return `"${path}" cannot be written live on ${ref}.`;

package/dist/components/AdaptiveResolution.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export declare const MOBILE_MAX_DPR = 1.5;
+export interface AdaptiveResolutionProps {
+    /** The canvas's own dpr setting (number or [min, max]); its max is the ceiling. */
+    max?: number | [number, number];
+}
+declare const AdaptiveResolution: React.FC<AdaptiveResolutionProps>;
+export default AdaptiveResolution;
+//# sourceMappingURL=AdaptiveResolution.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AdaptiveResolution.d.ts","sourceRoot":"","sources":["../../src/components/AdaptiveResolution.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+C,MAAM,OAAO,CAAC;AAyBpE,eAAO,MAAM,cAAc,MAAM,CAAC;AAElC,MAAM,WAAW,uBAAuB;IACpC,mFAAmF;IACnF,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAID,QAAA,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAmCzD,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/components/AdaptiveResolution.js

@@ -0,0 +1,61 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { useThree } from '@react-three/fiber';
+import { PerformanceMonitor } from '@react-three/drei';
+import { isMobileDevice } from '../utils/deviceTier.js';
+/**
+ * Render resolution that follows the frame rate. Mount inside <Canvas>.
+ *
+ * The terrain (and most of what makes the environment expensive) costs per PIXEL:
+ * textures and noise octaves in the fragment shader. Pixel ratio is therefore the
+ * biggest single lever — 1.5 is 2.25x the pixels of 1, and a phone's 3 is 9x.
+ *
+ *  - Ceiling: the canvas's configured dpr, capped at MOBILE_MAX_DPR on phones and
+ *    tablets, where the device ratio is 2-3 and the GPU is a fraction of a desktop's.
+ *  - Under load: drei's PerformanceMonitor averages the frame rate and steps the
+ *    ratio down while it stays under ~50 fps, and back up when there is room.
+ *    After a few flip-flops it freezes where it is, so a scene sitting on the edge
+ *    does not oscillate between sharp and soft.
+ *  - Floor: half the ceiling, never below 0.6 — softer, never mush.
+ *  - Warm-up: the monitor starts WARMUP_MS after mount. Loading a scene compiles
+ *    shaders and packs textures, and those stalls used to burn the flip-flop
+ *    budget in the first seconds, freezing the ratio below the ceiling for the
+ *    whole session (seen in the studio: stuck at 1.42 of 1.5 at a steady 60 fps).
+ */
+const WARMUP_MS = 4000;
+export const MOBILE_MAX_DPR = 1.5;
+const round2 = (v) => Math.round(v * 100) / 100;
+const AdaptiveResolution = ({ max }) => {
+    const setDpr = useThree((s) => s.setDpr);
+    const ceiling = useMemo(() => {
+        const device = typeof window !== 'undefined' ? window.devicePixelRatio || 1 : 1;
+        const configured = Array.isArray(max) ? max[1] : (max ?? device);
+        return isMobileDevice() ? Math.min(configured, MOBILE_MAX_DPR) : configured;
+    }, [max]);
+    const floor = Math.max(0.6, ceiling * 0.5);
+    const frozen = useRef(false);
+    const [watching, setWatching] = useState(false);
+    useEffect(() => {
+        frozen.current = false;
+        setDpr(ceiling);
+        setWatching(false);
+        const t = setTimeout(() => setWatching(true), WARMUP_MS);
+        return () => clearTimeout(t);
+    }, [ceiling, setDpr]);
+    if (!watching)
+        return null;
+    return (_jsx(PerformanceMonitor
+    // 60 Hz: below 45 fps step down, above 55 step up. Not tighter: the
+    // studio's own main-thread work makes a GPU-idle frame rate wander
+    // between 55 and 60, and a 58 threshold pinned the ratio low for good.
+    , { 
+        // 60 Hz: below 45 fps step down, above 55 step up. Not tighter: the
+        // studio's own main-thread work makes a GPU-idle frame rate wander
+        // between 55 and 60, and a 58 threshold pinned the ratio low for good.
+        bounds: (refresh) => (refresh > 100 ? [70, 100] : [45, 55]), flipflops: 3, onChange: ({ factor }) => {
+            if (frozen.current)
+                return;
+            setDpr(round2(floor + (ceiling - floor) * factor));
+        }, onFallback: () => { frozen.current = true; } }));
+};
+export default AdaptiveResolution;

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;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"}
+{"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;AAGzD,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,CA4H5D,CAAC;AACF,eAAe,gBAAgB,CAAC"}

package/dist/components/CameraController.js

@@ -7,6 +7,8 @@ import { cameraManager } from '../utils/CameraSingleton.js';
 import { usePathAnimation } from '../hooks/usePathAnimation.js';
 import { OrbitControls } from "@react-three/drei";
 import { useRuntimeSettings } from '../hooks/useRuntimeSettings.js';
+import { orbitAngleLimits } from "@3driseai/3drise-core";
+import { useOrbitTargetFollow } from '../hooks/useOrbitTargetFollow.js';
 export const CameraController = ({ enableAutoAnimation = true, animationDuration = 1, animationEase = "power2.out", settings, onObjectReady, onObjectDispose, onControlsReady, onControlsDispose, }) => {
     // Authored camera + any applied action patch ('camera').
     settings = useRuntimeSettings('camera', settings);
@@ -19,8 +21,11 @@ export const CameraController = ({ enableAutoAnimation = true, animationDuration
         const controls = controlsRef.current;
         if (!controls)
             return;
+        cameraManager.setControls(controls);
         onControlsReady && onControlsReady(controls);
         return () => {
+            if (cameraManager.getControls() === controls)
+                cameraManager.setControls(null);
             onControlsDispose && onControlsDispose(controls);
         };
     }, [controlsRef.current]); // eslint-disable-line react-hooks/exhaustive-deps
@@ -59,15 +64,27 @@ export const CameraController = ({ enableAutoAnimation = true, animationDuration
             }
         }
     }, [position, orientation]);
+    // The stored orbit point is applied only when it (or the object choice) changes: a
+    // followed object or a pan moves the live point, and an unrelated edit (a speed, a
+    // limit) must not snap it back.
+    const appliedTarget = useRef('');
     // Sync controls config changes imperatively via ref (after initial mount)
     useEffect(() => {
         const orbitControls = controlsRef.current;
         if (!orbitControls)
             return;
         orbitControls.enabled = controls.enabled;
-        orbitControls.target.set(controls.target[0], controls.target[1], controls.target[2]);
-        orbitControls.enablePan = controls.enablePan;
+        // Orbiting an object: the follow hook owns the target, and panning is off
+        // (a pan would pull the orbit point off the object).
+        const lookingAtObject = !!controls.targetObject?.id;
+        const targetKey = `${controls.target?.join(',')}|${controls.targetObject?.id ?? ''}|${controls.targetObject?.node ?? ''}`;
+        if (!lookingAtObject && targetKey !== appliedTarget.current)
+            orbitControls.target.set(controls.target[0], controls.target[1], controls.target[2]);
+        appliedTarget.current = targetKey;
+        orbitControls.enablePan = lookingAtObject ? false : controls.enablePan;
         orbitControls.enableRotate = controls.enableRotate;
+        // ClipPlayer holds zoom off while a wheel-driven sequence runs (it re-asserts every frame).
+        orbitControls.enableZoom = controls.enableZoom !== false;
         orbitControls.autoRotate = controls.autoRotate;
         orbitControls.autoRotateSpeed = controls.autoRotateSpeed;
         orbitControls.zoomSpeed = controls.zoomSpeed;
@@ -75,11 +92,11 @@ export const CameraController = ({ enableAutoAnimation = true, animationDuration
         orbitControls.rotateSpeed = controls.rotateSpeed;
         orbitControls.minDistance = controls.minDistance;
         orbitControls.maxDistance = controls.maxDistance;
-        orbitControls.minPolarAngle = controls.minPolarAngle ?? -Infinity;
-        orbitControls.maxPolarAngle = controls.maxPolarAngle ?? Infinity;
-        orbitControls.minAzimuthAngle = controls.minAzimuthAngle ?? -Infinity;
-        orbitControls.maxAzimuthAngle = controls.maxAzimuthAngle ?? Infinity;
+        // Saved limits may be null (once ±Infinity): the full range then.
+        Object.assign(orbitControls, orbitAngleLimits(controls));
     }, [controls]);
+    // Look at a scene object (orbit target) and / or travel with one (follow).
+    useOrbitTargetFollow(controlsRef, controls.targetObject, controls.followObject, () => isInAnimatedTransition.current || isAnimating() || isPathAnimating(), controls.enabled !== false, controls);
     // Sync camera projection settings from state
     useEffect(() => {
         const cam = cameraRef.current;
@@ -117,6 +134,6 @@ export const CameraController = ({ enableAutoAnimation = true, animationDuration
     const ic = initialControls.current;
     return _jsx(OrbitControls, { ref: controlsRef, makeDefault: true, enabled: ic.enabled, 
         // target={new Vector3(...ic.target)}
-        enablePan: ic.enablePan, enableRotate: ic.enableRotate, autoRotate: ic.autoRotate, autoRotateSpeed: ic.autoRotateSpeed, zoomSpeed: ic.zoomSpeed, panSpeed: ic.panSpeed, rotateSpeed: ic.rotateSpeed, minDistance: ic.minDistance, maxDistance: ic.maxDistance, minPolarAngle: ic.minPolarAngle ?? -Infinity, maxPolarAngle: ic.maxPolarAngle ?? Infinity, minAzimuthAngle: ic.minAzimuthAngle ?? -Infinity, maxAzimuthAngle: ic.maxAzimuthAngle ?? Infinity });
+        enablePan: ic.targetObject?.id ? false : ic.enablePan, enableRotate: ic.enableRotate, enableZoom: ic.enableZoom !== false, autoRotate: ic.autoRotate, autoRotateSpeed: ic.autoRotateSpeed, zoomSpeed: ic.zoomSpeed, panSpeed: ic.panSpeed, rotateSpeed: ic.rotateSpeed, minDistance: ic.minDistance, maxDistance: ic.maxDistance, ...orbitAngleLimits(ic) });
 };
 export default CameraController;

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

@@ -1 +1 @@
-{"version":3,"file":"MoonDisc.d.ts","sourceRoot":"","sources":["../../src/components/MoonDisc.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqC,MAAM,OAAO,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIvE,MAAM,WAAW,aAAa;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AA+ED,QAAA,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAoDrC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"MoonDisc.d.ts","sourceRoot":"","sources":["../../src/components/MoonDisc.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqC,MAAM,OAAO,CAAC;AAG1D,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAKvE,MAAM,WAAW,aAAa;IAC1B,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AA+ED,QAAA,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAoDrC,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/components/MoonDisc.js

@@ -4,6 +4,7 @@ import * as THREE from 'three';
 import { useFrame } from '@react-three/fiber';
 import { useCloudSun } from '../hooks/useCloudSun.js';
 import { resolveMoon } from '../utils/skyMoon.js';
+import { sunSystemLive } from '../animationsV2/sunSystemLive.js';
 /**
  * The moon in the sky, for either sky renderer.
  *
@@ -114,7 +115,7 @@ const MoonDisc = ({ timeSettings, skySettings, size = 1 }) => {
         const dist = far * 0.9;
         mesh.position.copy(camera.position).addScaledVector(m.direction, dist);
         mesh.quaternion.copy(camera.quaternion);
-        const radius = dist * Math.tan(THREE.MathUtils.degToRad(MOON_ANGULAR_DIAMETER_DEG * size) / 2);
+        const radius = dist * Math.tan(THREE.MathUtils.degToRad(MOON_ANGULAR_DIAMETER_DEG * (sunSystemLive.moonSize ?? size)) / 2);
         mesh.scale.setScalar(radius * SPAN);
         // Sun direction in the quad's frame, so the disc is lit from where the sun is.
         scratch.q.copy(camera.quaternion).invert();

package/dist/components/OceanBuilder.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { SkySettings, TimeSettings } from '@3driseai/3drise-core';
+import type { SkySettings, TerrainConfig, TimeSettings } from '@3driseai/3drise-core';
 import type { ObjectReadyProps } from '../types/objectReady';
 import type { OceanWaterSettings } from '@3driseai/3drise-core';
 export interface OceanBuilderProps extends ObjectReadyProps {
@@ -11,6 +11,9 @@ export interface OceanBuilderProps extends ObjectReadyProps {
     timeSettings?: TimeSettings;
     /** Matches SkySystem's sunIntensity, so water brightens with the scene. */
     sunIntensity?: number;
+    /** The environment terrain's config: the world ocean's shoreline and the
+     *  terrain's shadow on the water. Omit (or disabled) for open water. */
+    terrain?: TerrainConfig | null;
 }
 /**
  * Picks the water body for the scene.

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

@@ -1 +1 @@
-{"version":3,"file":"OceanBuilder.d.ts","sourceRoot":"","sources":["../../src/components/OceanBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAOhE,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACvD;;uEAEmE;IACnE,QAAQ,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAqC7C,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"OceanBuilder.d.ts","sourceRoot":"","sources":["../../src/components/OceanBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAOhE,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACvD;;uEAEmE;IACnE,QAAQ,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;4EACwE;IACxE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAuC7C,CAAC;AAEF,eAAe,YAAY,CAAC"}