@3driseai/3drise-core 1.0.7 → 1.0.9

package/dist/services/SkySystemManager.d.ts

@@ -12,6 +12,10 @@ export interface SkyTimeState {
     delta: number;
     elapsedTime: number;
     autoAnimate: boolean;
+    /** Time is moving on its own — autoAnimate OR real-time sync. Consumers that
+     *  schedule expensive work off a sun change (a cube-camera capture) use this
+     *  to stand down and let the environment probe's own timer do it once. */
+    advancing: boolean;
 }
 export declare class SkySystemManager {
     private static instance;
@@ -30,12 +34,35 @@ export declare class SkySystemManager {
     private syncWithRealTime;
     private lastSyncedMinute;
     private onTimeSync;
+    /** The last timeOfDay this manager and its host agree on. A host pushing the
+     *  same value back (its own echo of `onTimeSync`) must NOT rewind the clock;
+     *  only a genuinely different value is an intentional seek. */
+    private lastAppliedTimeOfDay;
+    /** Real seconds since the last write-back, so playback dispatches a few times
+     *  a second instead of once per frame. */
+    private syncAccumulator;
+    /** Whoever is allowed to advance the clock. The manager is a singleton, so a
+     *  second mounted SkySystem (a market preview, a second canvas) would
+     *  otherwise double-tick it and stomp its settings. */
+    private driver;
     constructor();
     static getInstance(): SkySystemManager;
     static resetInstance(): void;
+    /** Claim the right to drive the clock. Returns true if `token` owns it —
+     *  the first claimant wins and keeps it until it releases. Everyone else
+     *  reads. */
+    claimDriver(token: object): boolean;
+    releaseDriver(token: object): void;
+    hasDriver(): boolean;
     setTimeSettings(settings: TimeSettings): void;
     setOnTimeSync(callback: ((timeOfDay: number) => void) | null): void;
     setTime(hours: number, minutes?: number): void;
+    /**
+     * One frame of clock. Safe to call every frame whenever time is enabled —
+     * it advances `timeInHours` only in an advancing mode, but `elapsedTime` and
+     * `delta` are what every consumer's smoothing and twinkle read, so they must
+     * keep running in manual mode too.
+     */
     tick(delta: number): void;
     getState(): SkyTimeState;
     getStateByTime(timeOfDay: number): SkyTimeState;
@@ -45,10 +72,47 @@ export declare class SkySystemManager {
     getTimeInHours(): number;
     isEnabled(): boolean;
     isAutoAnimating(): boolean;
+    isAdvancing(): boolean;
     private advanceTime;
+    /**
+     * Push the animating time back to the host a few times a second.
+     *
+     * Without this the manager was the only thing that knew what time it was:
+     * the slider sat frozen at the last value the user set, and that stale value
+     * was what got saved with the project. Throttled in REAL seconds, not
+     * simulated ones, so the dispatch rate does not scale with timescale.
+     *
+     * `lastAppliedTimeOfDay` is set to exactly what is published, so the value
+     * coming back through the host's state is recognised as our own echo by
+     * `setTimeSettings` and does not rewind the clock.
+     */
+    private publishTime;
     private syncToRealTime;
     private recalculateState;
+    /**
+     * Sun elevation and azimuth for a given hour.
+     *
+     * Both curves are continuous across the whole 24 h, which they were not:
+     *
+     *  - Azimuth used to be `180 + 180 * normalizedTime` with `normalizedTime`
+     *    restarting at 0 at both SUNRISE and SUNSET, so the sun teleported to
+     *    the opposite horizon twice a cycle. The night arc now CONTINUES the
+     *    day arc (360 -> 540, which is 180 again mod 360), so the sun keeps
+     *    travelling the same way round and meets the next dawn exactly where
+     *    the day arc starts.
+     *
+     *  - Night elevation used to be the day curve halved, and the day curve is
+     *    positive in the middle — so the sun rose again after sunset and stood
+     *    +18 degrees up at 02:00. Anything reading the direction rather than
+     *    `isDaytime` (the clouds and the ocean, through useCloudSun) was lit as
+     *    if it were afternoon in the middle of the night. The night arc is now
+     *    its own curve, below the horizon for all of it, meeting the day curve
+     *    at -5 degrees at both ends.
+     */
     private calculateTimeState;
+    /** Scene azimuth in [-180, 180). Normalised into range rather than left to
+     *  JS's signed `%`, so the night arc's 360-540 degrees maps onto the same
+     *  directions the day arc's 180-360 does instead of running off the end. */
     private transformAzimuth;
     private updateSunDirection;
 }

package/dist/services/SkySystemManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SkySystemManager.d.ts","sourceRoot":"","sources":["../../src/services/SkySystemManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE3E,MAAM,WAAW,YAAY;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,cAAc,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACxB;AAMD,qBAAa,gBAAgB;IACzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,cAAc,CAAO;IAC7B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,UAAU,CAAO;IACzB,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,gBAAgB,CAAM;IAC9B,OAAO,CAAC,UAAU,CAAQ;;IAI1B,MAAM,CAAC,WAAW,IAAI,gBAAgB;IAMtC,MAAM,CAAC,aAAa,IAAI,IAAI;IAG5B,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAa7C,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAGnE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,MAAU,GAAG,IAAI;IAIjD,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAezB,QAAQ,IAAI,YAAY;IAcxB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY;IAmB/C,OAAO,IAAI,IAAI;IAKf,YAAY,IAAI,cAAc;IAG9B,eAAe,IAAI,KAAK,CAAC,OAAO;IAGhC,cAAc,IAAI,MAAM;IAGxB,SAAS,IAAI,OAAO;IAGpB,eAAe,IAAI,OAAO;IAG1B,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,kBAAkB;IA0B1B,OAAO,CAAC,gBAAgB;IAGxB,OAAO,CAAC,kBAAkB;CAQ7B;AACD,eAAO,MAAM,gBAAgB,EAAE,gBAAiD,CAAC;AACjF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"SkySystemManager.d.ts","sourceRoot":"","sources":["../../src/services/SkySystemManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE3E,MAAM,WAAW,YAAY;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,cAAc,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB;;8EAE0E;IAC1E,SAAS,EAAE,OAAO,CAAC;CACtB;AAaD,qBAAa,gBAAgB;IACzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAQ;IAC/B,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,cAAc,CAAO;IAC7B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,UAAU,CAAO;IACzB,OAAO,CAAC,YAAY,CAA8B;IAClD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,gBAAgB,CAAM;IAC9B,OAAO,CAAC,UAAU,CAAQ;IAC1B;;mEAE+D;IAC/D,OAAO,CAAC,oBAAoB,CAAuB;IACnD;8CAC0C;IAC1C,OAAO,CAAC,eAAe,CAAK;IAC5B;;2DAEuD;IACvD,OAAO,CAAC,MAAM,CAAuB;;IAIrC,MAAM,CAAC,WAAW,IAAI,gBAAgB;IAMtC,MAAM,CAAC,aAAa,IAAI,IAAI;IAG5B;;iBAEa;IACb,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAMnC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAKlC,SAAS,IAAI,OAAO;IAGpB,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IA6B7C,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAGnE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,MAAU,GAAG,IAAI;IAQjD;;;;;OAKG;IACH,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAczB,QAAQ,IAAI,YAAY;IAexB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY;IAoB/C,OAAO,IAAI,IAAI;IAKf,YAAY,IAAI,cAAc;IAG9B,eAAe,IAAI,KAAK,CAAC,OAAO;IAGhC,cAAc,IAAI,MAAM;IAGxB,SAAS,IAAI,OAAO;IAGpB,eAAe,IAAI,OAAO;IAG1B,WAAW,IAAI,OAAO;IAGtB,OAAO,CAAC,WAAW;IAWnB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,gBAAgB;IASxB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,kBAAkB;IA2B1B;;gFAE4E;IAC5E,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,kBAAkB;CAQ7B;AACD,eAAO,MAAM,gBAAgB,EAAE,gBAAiD,CAAC;AACjF,eAAe,gBAAgB,CAAC"}

package/dist/services/SkySystemManager.js

@@ -2,6 +2,13 @@ import * as THREE from 'three';
 const SUNRISE = 6;
 const SUNSET = 21;
 const MAX_ELEVATION = 42;
+/** Where the day arc meets the horizon at SUNRISE and SUNSET, and where the
+ *  night arc has to meet it back for the curve to be continuous. */
+const HORIZON_OFFSET = 5;
+/** How far below the horizon the sun gets at the middle of the night. */
+const MAX_NIGHT_DEPTH = 21;
+/** Real seconds between playback write-backs to the host. */
+const SYNC_INTERVAL_SECONDS = 0.25;
 export class SkySystemManager {
     static instance = null;
     timeInHours = 12;
@@ -19,6 +26,17 @@ export class SkySystemManager {
     syncWithRealTime = false;
     lastSyncedMinute = -1;
     onTimeSync = null;
+    /** The last timeOfDay this manager and its host agree on. A host pushing the
+     *  same value back (its own echo of `onTimeSync`) must NOT rewind the clock;
+     *  only a genuinely different value is an intentional seek. */
+    lastAppliedTimeOfDay = null;
+    /** Real seconds since the last write-back, so playback dispatches a few times
+     *  a second instead of once per frame. */
+    syncAccumulator = 0;
+    /** Whoever is allowed to advance the clock. The manager is a singleton, so a
+     *  second mounted SkySystem (a market preview, a second canvas) would
+     *  otherwise double-tick it and stomp its settings. */
+    driver = null;
     constructor() {
         this.updateSunDirection();
     }
@@ -31,16 +49,49 @@ export class SkySystemManager {
     static resetInstance() {
         SkySystemManager.instance = null;
     }
+    /** Claim the right to drive the clock. Returns true if `token` owns it —
+     *  the first claimant wins and keeps it until it releases. Everyone else
+     *  reads. */
+    claimDriver(token) {
+        if (this.driver === null) {
+            this.driver = token;
+        }
+        return this.driver === token;
+    }
+    releaseDriver(token) {
+        if (this.driver === token) {
+            this.driver = null;
+        }
+    }
+    hasDriver() {
+        return this.driver !== null;
+    }
     setTimeSettings(settings) {
         this.enabled = settings.enabled;
         this.timescale = settings.timescale;
         this.autoAnimate = settings.autoAnimate;
         this.syncWithRealTime = settings.syncWithRealTime;
         if (this.syncWithRealTime) {
+            // Wall clock wins outright; the settings' timeOfDay is only ever an
+            // echo of what this manager last published. Adopting it here is what
+            // used to put one frame of yesterday's sun on screen.
+            this.lastAppliedTimeOfDay = settings.timeOfDay;
             this.syncToRealTime();
+            this.recalculateState();
+            return;
         }
-        if (Math.abs(this.timeInHours - settings.timeOfDay) > 0.01) {
+        // A running clock is ahead of whatever the host last stored, so a plain
+        // `timeInHours !== settings.timeOfDay` test is true on every settings
+        // object and would rewind playback on any unrelated change (a speed
+        // button, a project load, a re-render). Only a timeOfDay that differs
+        // from the last one we agreed on is a deliberate seek.
+        const seeked = this.lastAppliedTimeOfDay === null
+            || Math.abs(settings.timeOfDay - this.lastAppliedTimeOfDay) > 0.001;
+        if (seeked) {
+            this.lastAppliedTimeOfDay = settings.timeOfDay;
             this.timeInHours = settings.timeOfDay;
+            this.delta = 0;
+            this.syncAccumulator = 0;
             this.recalculateState();
         }
     }
@@ -49,20 +100,29 @@ export class SkySystemManager {
     }
     setTime(hours, minutes = 0) {
         this.timeInHours = hours + minutes / 60;
+        this.lastAppliedTimeOfDay = this.timeInHours;
+        // An explicit seek is a cut, not a movement: zero delta tells every
+        // consumer's smoothing lerp to snap rather than glide from the old sun.
+        this.delta = 0;
         this.recalculateState();
     }
+    /**
+     * One frame of clock. Safe to call every frame whenever time is enabled —
+     * it advances `timeInHours` only in an advancing mode, but `elapsedTime` and
+     * `delta` are what every consumer's smoothing and twinkle read, so they must
+     * keep running in manual mode too.
+     */
     tick(delta) {
         if (!this.enabled)
             return;
-        // console.log(delta)
-        // this.delta = delta;
+        this.delta = delta;
         this.elapsedTime += delta;
         if (this.syncWithRealTime) {
             this.syncToRealTime();
         }
         else if (this.autoAnimate && this.timescale > 0) {
-            // console.log(delta)
             this.advanceTime(delta);
+            this.publishTime(delta);
         }
         this.recalculateState();
     }
@@ -78,6 +138,7 @@ export class SkySystemManager {
             delta: this.delta,
             elapsedTime: this.elapsedTime,
             autoAnimate: this.autoAnimate,
+            advancing: this.isAdvancing(),
         };
     }
     getStateByTime(timeOfDay) {
@@ -97,6 +158,7 @@ export class SkySystemManager {
             delta: 0,
             elapsedTime: this.elapsedTime,
             autoAnimate: this.autoAnimate,
+            advancing: this.isAdvancing(),
         };
     }
     getTime() {
@@ -119,16 +181,45 @@ export class SkySystemManager {
     isAutoAnimating() {
         return this.autoAnimate;
     }
+    isAdvancing() {
+        return this.enabled && (this.syncWithRealTime || (this.autoAnimate && this.timescale > 0));
+    }
     advanceTime(delta) {
         const hoursPerSecond = this.timescale / 60;
         this.timeInHours += hoursPerSecond * delta;
-        if (this.timeInHours >= 24) {
-            this.timeInHours -= 24;
-        }
-        else if (this.timeInHours < 0) {
-            this.timeInHours += 24;
+        // Modulo rather than a single +/- 24: at a high timescale one long frame
+        // (a backgrounded tab handing back a multi-second delta) can carry the
+        // clock past 24 by more than a day, and a single subtraction leaves it
+        // out of range for every consumer that indexes by hour.
+        if (this.timeInHours >= 24 || this.timeInHours < 0) {
+            this.timeInHours = ((this.timeInHours % 24) + 24) % 24;
         }
     }
+    /**
+     * Push the animating time back to the host a few times a second.
+     *
+     * Without this the manager was the only thing that knew what time it was:
+     * the slider sat frozen at the last value the user set, and that stale value
+     * was what got saved with the project. Throttled in REAL seconds, not
+     * simulated ones, so the dispatch rate does not scale with timescale.
+     *
+     * `lastAppliedTimeOfDay` is set to exactly what is published, so the value
+     * coming back through the host's state is recognised as our own echo by
+     * `setTimeSettings` and does not rewind the clock.
+     */
+    publishTime(delta) {
+        if (!this.onTimeSync)
+            return;
+        this.syncAccumulator += delta;
+        if (this.syncAccumulator < SYNC_INTERVAL_SECONDS)
+            return;
+        this.syncAccumulator = 0;
+        const rounded = Math.round(this.timeInHours * 100) / 100;
+        if (rounded === this.lastAppliedTimeOfDay)
+            return;
+        this.lastAppliedTimeOfDay = rounded;
+        this.onTimeSync(rounded);
+    }
     syncToRealTime() {
         const now = new Date();
         const currentMinute = now.getHours() * 60 + now.getMinutes();
@@ -136,7 +227,9 @@ export class SkySystemManager {
             now.getHours() + now.getMinutes() / 60 + now.getSeconds() / 3600;
         if (currentMinute !== this.lastSyncedMinute) {
             this.lastSyncedMinute = currentMinute;
-            this.onTimeSync?.(Math.round(this.timeInHours * 100) / 100);
+            const rounded = Math.round(this.timeInHours * 100) / 100;
+            this.lastAppliedTimeOfDay = rounded;
+            this.onTimeSync?.(rounded);
         }
     }
     recalculateState() {
@@ -148,20 +241,41 @@ export class SkySystemManager {
         this.sunAzimuth = state.sunAzimuth;
         this.updateSunDirection();
     }
+    /**
+     * Sun elevation and azimuth for a given hour.
+     *
+     * Both curves are continuous across the whole 24 h, which they were not:
+     *
+     *  - Azimuth used to be `180 + 180 * normalizedTime` with `normalizedTime`
+     *    restarting at 0 at both SUNRISE and SUNSET, so the sun teleported to
+     *    the opposite horizon twice a cycle. The night arc now CONTINUES the
+     *    day arc (360 -> 540, which is 180 again mod 360), so the sun keeps
+     *    travelling the same way round and meets the next dawn exactly where
+     *    the day arc starts.
+     *
+     *  - Night elevation used to be the day curve halved, and the day curve is
+     *    positive in the middle — so the sun rose again after sunset and stood
+     *    +18 degrees up at 02:00. Anything reading the direction rather than
+     *    `isDaytime` (the clouds and the ocean, through useCloudSun) was lit as
+     *    if it were afternoon in the middle of the night. The night arc is now
+     *    its own curve, below the horizon for all of it, meeting the day curve
+     *    at -5 degrees at both ends.
+     */
     calculateTimeState(timeInHours) {
         const isDaytime = timeInHours >= SUNRISE && timeInHours <= SUNSET;
         let normalizedTime;
+        let sunElevation;
+        let sunAzimuth;
         if (isDaytime) {
             normalizedTime = (timeInHours - SUNRISE) / (SUNSET - SUNRISE);
+            sunElevation = Math.cos(Math.PI * (normalizedTime - 0.5)) * MAX_ELEVATION - HORIZON_OFFSET;
+            sunAzimuth = 180 + 180 * normalizedTime;
         }
         else {
             const nightHour = timeInHours >= SUNSET ? timeInHours : timeInHours + 24;
             normalizedTime = (nightHour - SUNSET) / (24 - SUNSET + SUNRISE);
-        }
-        let sunElevation = Math.cos(Math.PI * (normalizedTime - 0.5)) * MAX_ELEVATION - 5;
-        const sunAzimuth = 180 + 180 * normalizedTime;
-        if (!isDaytime) {
-            sunElevation *= 0.5;
+            sunElevation = -HORIZON_OFFSET - Math.cos(Math.PI * (normalizedTime - 0.5)) * MAX_NIGHT_DEPTH;
+            sunAzimuth = 360 + 180 * normalizedTime;
         }
         let timeOfDay = 'Nighttime';
         if (isDaytime) {
@@ -174,8 +288,12 @@ export class SkySystemManager {
         }
         return { normalizedTime, isDaytime, timeOfDay, sunElevation, sunAzimuth };
     }
+    /** Scene azimuth in [-180, 180). Normalised into range rather than left to
+     *  JS's signed `%`, so the night arc's 360-540 degrees maps onto the same
+     *  directions the day arc's 180-360 does instead of running off the end. */
     transformAzimuth(rawAzimuth) {
-        return ((270 - rawAzimuth) % 360) - 180;
+        const wrapped = (((270 - rawAzimuth) % 360) + 360) % 360;
+        return wrapped - 180;
     }
     updateSunDirection() {
         const el = THREE.MathUtils.degToRad(this.sunElevation);

package/dist/three/SkySystemV.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SkySystemV.d.ts","sourceRoot":"","sources":["../../src/three/SkySystemV.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClH,MAAM,WAAW,iBAAiB;IAC9B,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,kBAAkB,CAAC;IAC3D,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qBAAqB,CAAC,EAAE,WAAW,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CACxE;AAGD,qBAAa,UAAU;IACnB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,iBAAiB,CAAQ;gBACrB,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,iBAAiB;IAwC9D,OAAO,CAAC,QAAQ;IAQhB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,GAAE,MAAc,GAAG,IAAI;IAkBrD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAa9C,OAAO,CAAC,eAAe,GAAE,OAAc,GAAG,IAAI;CAMjD"}
+{"version":3,"file":"SkySystemV.d.ts","sourceRoot":"","sources":["../../src/three/SkySystemV.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAClH,MAAM,WAAW,iBAAiB;IAC9B,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,KAAK,CAAC,iBAAiB,GAAG,KAAK,CAAC,kBAAkB,CAAC;IAC3D,KAAK,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qBAAqB,CAAC,EAAE,WAAW,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAC;CACxE;AAGD,qBAAa,UAAU;IACnB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,iBAAiB,CAAQ;gBACrB,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,iBAAiB;IAwC9D,OAAO,CAAC,QAAQ;IAQhB,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,GAAE,MAAc,GAAG,IAAI;IAoBrD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI;IAa9C,OAAO,CAAC,eAAe,GAAE,OAAc,GAAG,IAAI;CAMjD"}

package/dist/three/SkySystemV.js

@@ -67,15 +67,17 @@ export class SkySystemV {
         const { timeSettings, onTimeOfDayChange } = this.config;
         if (!timeSettings.enabled)
             return;
-        if (timeSettings.autoAnimate) {
-            skySystemManager.tick(delta);
-            const current = skySystemManager.getTimeOfDay();
-            if (this.previousTimeOfDay !== null && this.previousTimeOfDay !== current) {
-                const state = skySystemManager.getState();
-                onTimeOfDayChange?.(current, state.elapsedTime);
-            }
-            this.previousTimeOfDay = current;
+        // Ticked whenever time is enabled, not only while it animates: the
+        // manager's `delta` and `elapsedTime` come out of here and drive every
+        // consumer's colour smoothing. Advancing the hour is the manager's own
+        // decision. Kept in step with the R3F SkySystem deliberately.
+        skySystemManager.tick(delta);
+        const current = skySystemManager.getTimeOfDay();
+        if (this.previousTimeOfDay !== null && this.previousTimeOfDay !== current) {
+            const state = skySystemManager.getState();
+            onTimeOfDayChange?.(current, state.elapsedTime);
         }
+        this.previousTimeOfDay = current;
         this.skybox?.update(_elapsed, delta);
         this.lensflare?.update(_elapsed, delta);
         this.sunLight?.update(_elapsed, delta);

package/dist/utils/galleriesUtils.js

@@ -90,7 +90,7 @@ export const updateCurrentLayoutSettings = (currentSettings, newSettings) => {
         ? currentSettings.imageUrls
         : createNumberOfDefaultImages(galleryState.numImages ?? 20), galleryState);
     const layoutSettings = getLayoutSettings(currentSettings.layout, galleryState);
-    return { frames, layoutSettings };
+    return { frames, layoutSettings: galleryState };
 };
 // =============================================================================
 // DEFAULT STATE

package/dist/utils/materialApplicationUtils.d.ts

@@ -3,6 +3,7 @@ import { MaterialInstance } from '../services/MaterialRegistry';
 export declare const MATERIAL_INSTANCE_KEY = "_3driseMaterialInstance";
 export declare const EDGES_GROUP_KEY = "__isEdgesGroup";
 export declare const GEREATIVE_EFFECTS_KEY = "__isGenerativeEffectsGroup";
+export declare const IMAGE_KEY = "__isImage";
 /**
  * Set by a renderer that builds and owns its object's material itself — today the
  * points renderers, while shader effects are active. Two writers on one

package/dist/utils/materialApplicationUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materialApplicationUtils.d.ts","sourceRoot":"","sources":["../../src/utils/materialApplicationUtils.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChD,OAA4B,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKrF,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAE/D,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAClE;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAC3D;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAAG,IAAI,CAOxH;AAKD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,gBAAgB,CAI/G;AACD;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAQlH;AACD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAsCrF;AACD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE1F;AACD;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGtD;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAElE;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAElE;AACD;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,GAAG,CAAC,MAAM,CAGtC,CAAC;AACH;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAC3D,OAAO,EAAE,KAAK,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,CAAC;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,QAAQ,EAAE,KAAK,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,GAAG,CAAC;KACd,CAAC,CAAC;IACH,QAAQ,EAAE,KAAK,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,OAAO,CAAC;KAClB,CAAC,CAAC;IACH,KAAK,EAAE,KAAK,CAAC;QACT,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,GAAG,CAAC;KACd,CAAC,CAAC;CACN,CA6BJ"}
+{"version":3,"file":"materialApplicationUtils.d.ts","sourceRoot":"","sources":["../../src/utils/materialApplicationUtils.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAChD,OAA4B,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAKrF,eAAO,MAAM,qBAAqB,4BAA4B,CAAC;AAE/D,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,qBAAqB,+BAA+B,CAAC;AAClE,eAAO,MAAM,SAAS,cAAc,CAAC;AACrC;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAC3D;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAAG,IAAI,CAOxH;AAKD;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,gBAAgB,CAI/G;AACD;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAQlH;AACD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAsCrF;AACD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE1F;AACD;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGtD;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAElE;AACD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAElE;AACD;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,GAAG,CAAC,MAAM,CAGtC,CAAC;AACH;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAC3D,OAAO,EAAE,KAAK,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,CAAC;QACV,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,QAAQ,EAAE,KAAK,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,GAAG,CAAC;KACd,CAAC,CAAC;IACH,QAAQ,EAAE,KAAK,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,OAAO,CAAC;KAClB,CAAC,CAAC;IACH,KAAK,EAAE,KAAK,CAAC;QACT,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,GAAG,CAAC;KACd,CAAC,CAAC;CACN,CA6BJ"}

package/dist/utils/materialApplicationUtils.js

@@ -18,6 +18,7 @@ export const MATERIAL_INSTANCE_KEY = '_3driseMaterialInstance';
 // Key placed on edges group userData to prevent material bleed-through
 export const EDGES_GROUP_KEY = '__isEdgesGroup';
 export const GEREATIVE_EFFECTS_KEY = '__isGenerativeEffectsGroup';
+export const IMAGE_KEY = '__isImage';
 /**
  * Set by a renderer that builds and owns its object's material itself — today the
  * points renderers, while shader effects are active. Two writers on one
@@ -33,7 +34,7 @@ export const SELF_OWNED_MATERIAL_KEY = '__ownsItsMaterial';
  * apply its own material via useMaterialApplication).
  */
 export function traverseSkippingEdgesAndEffects(obj, isRoot, callback) {
-    if (!isRoot && (obj.userData[EDGES_GROUP_KEY] || obj.userData[GEREATIVE_EFFECTS_KEY] || obj.userData[SELF_OWNED_MATERIAL_KEY]))
+    if (!isRoot && (obj.userData[EDGES_GROUP_KEY] || obj.userData[GEREATIVE_EFFECTS_KEY] || obj.userData[SELF_OWNED_MATERIAL_KEY] || obj.userData[IMAGE_KEY]))
         return;
     callback(obj);
     for (const child of obj.children) {

package/package.json

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