@3driseai/3drise-viewer 0.1.41 → 0.1.43

package/dist/animationsV2/clipUtils.js

@@ -1,4 +1,5 @@
-import { applyEasing, interpolateValue } from '@3driseai/3drise-core';
+import { applyEasing, interpolateValue, buildRunLine, pathLinePointAt, pathLineDirectionAt, pathLineHeading, } from '@3driseai/3drise-core';
+import { Euler, Quaternion, Vector3 } from 'three';
 import { DEFAULT_EASE } from './types.js';
 // -----------------------------------------------------------------------------
 // ids, paths
@@ -55,6 +56,26 @@ export function easeProgress(ease, p) {
  * A model part's `visible` (node track) stays per frame — parts have no effects.
  */
 export const isSwitchTrack = (track) => !!track.discrete || (!track.node && track.path === 'meshSettings.visible');
+/** Where t falls between the keys: the key before (lo), after (hi), and the raw progress u between them (edges: lo === hi). */
+function segmentAt(keys, t) {
+    const n = keys.length;
+    if (t <= keys[0].t)
+        return { lo: 0, hi: 0, u: 0 };
+    if (t >= keys[n - 1].t)
+        return { lo: n - 1, hi: n - 1, u: 0 };
+    // binary search: last key with k.t <= t
+    let lo = 0;
+    let hi = n - 1;
+    while (hi - lo > 1) {
+        const mid = (lo + hi) >> 1;
+        if (keys[mid].t <= t)
+            lo = mid;
+        else
+            hi = mid;
+    }
+    const span = keys[hi].t - keys[lo].t;
+    return { lo, hi, u: span > 0 ? (t - keys[lo].t) / span : 1 };
+}
 /**
  * The track's value at time t. Before the first key: the first key's value;
  * after the last: the last key's value. Keys must be sorted by t.
@@ -67,32 +88,138 @@ export function sampleTrack(track, t) {
     // (an eased track holds its first value before it, so a move can start later than 0).
     if (t < keys[0].t - 1e-9 && isSwitchTrack(track))
         return undefined;
-    if (t <= keys[0].t)
-        return keys[0].value;
-    const last = keys[keys.length - 1];
-    if (t >= last.t)
-        return last.value;
-    // binary search: last key with k.t <= t
-    let lo = 0;
-    let hi = keys.length - 1;
-    while (hi - lo > 1) {
-        const mid = (lo + hi) >> 1;
-        if (keys[mid].t <= t)
-            lo = mid;
-        else
-            hi = mid;
+    if (isCurvedTrack(track)) {
+        const d = curveDistanceAt(track, t);
+        if (d !== null) {
+            const p = pathLinePointAt(keyCurve(track).line, d, tmpPoint);
+            return [p.x, p.y, p.z];
+        }
     }
+    const { lo, hi, u } = segmentAt(keys, t);
     const a = keys[lo];
+    if (lo === hi)
+        return a.value;
     const b = keys[hi];
     if (isSwitchTrack(track) || isSteppedValue(a.value) || isSteppedValue(b.value))
         return a.value;
-    const span = b.t - a.t;
-    const p = span > 0 ? easeProgress(a.ease, (t - a.t) / span) : 1;
+    const p = u >= 1 ? 1 : easeProgress(a.ease, u);
     // interpolateValue is type-aware (numbers, arrays, hex colours); the property name
     // only disambiguates colour keys, so pass the path's last segment.
     return interpolateValue(track.path.split('.').pop() ?? track.path, a.value, b.value, p);
 }
 // -----------------------------------------------------------------------------
+// curved position tracks (Track.curve / smoothCorners / face)
+// -----------------------------------------------------------------------------
+//
+// The keys are the points of one line — core buildPathLine, the line a layout path draws — and
+// the object moves along it: between two keys it covers the stretch of line between them, at the
+// speed the leaving key's ease gives. Built once per track object (edits make a new object) and
+// read per frame. The line is in the track's own space (the object's parent), so the facing
+// comes out in that space too.
+/** A position track: an object's, or a model part's. The only tracks that can be curved. */
+export const isPositionTrack = (track) => track.node ? track.path === 'position' : track.path === 'meshSettings.position';
+/** An object's position track that turns the object to face its travel (drives its rotation). */
+export const isFacingTrack = (track) => !!track.face && !track.node && track.path === 'meshSettings.position';
+/** Drawn as one line through its keys instead of straight segments. */
+export const isCurvedTrack = (track) => isPositionTrack(track) && ((track.curve ?? 0) > 0 || (track.smoothCorners ?? 0) > 0 || isFacingTrack(track));
+const keyCurves = new WeakMap();
+const clamp01 = (v) => Math.min(1, Math.max(0, Number(v) || 0));
+const tmpPoint = new Vector3();
+/**
+ * The track's line (core buildRunLine — the line a path bake times its keys on): null with fewer
+ * than two distinct [x,y,z] keys (it then samples as straight segments). A track that ends where
+ * it began is drawn as a closed loop.
+ */
+function keyCurve(track) {
+    const cached = keyCurves.get(track);
+    if (cached !== undefined)
+        return cached;
+    let out = null;
+    const points = [];
+    for (const k of track.keys) {
+        const v = k.value;
+        if (!Array.isArray(v) || v.length < 3) {
+            points.length = 0;
+            break;
+        }
+        points.push([Number(v[0]), Number(v[1]), Number(v[2])]);
+    }
+    if (points.length >= 2)
+        out = buildRunLine(points, { curve: clamp01(track.curve), smoothCorners: clamp01(track.smoothCorners) });
+    keyCurves.set(track, out);
+    return out;
+}
+/** Metres along the track's line at time t (null when it has no line). */
+function curveDistanceAt(track, t) {
+    const c = keyCurve(track);
+    if (!c)
+        return null;
+    const { lo, hi, u } = segmentAt(track.keys, t);
+    if (lo === hi)
+        return c.at[lo];
+    const p = u >= 1 ? 1 : easeProgress(track.keys[lo].ease, u);
+    return c.at[lo] + (c.at[hi] - c.at[lo]) * p;
+}
+const tmpDir = new Vector3();
+const tmpQuat = new Quaternion();
+const tmpRest = new Quaternion();
+const tmpEuler = new Euler();
+const TAU = Math.PI * 2;
+/**
+ * The rotation (Euler XYZ, radians) of an object facing its travel along the track at t: +Z along
+ * the line, pitching with the slope, no roll (core pathLineHeading — the path animation's own), with
+ * `rest` (the object's authored rotation) on top as its facing correction. Each angle is taken
+ * nearest to `rest`, so gliding in from the authored rotation never spins the long way round.
+ * Undefined when the track has no line.
+ */
+export function sampleTrackFacing(track, t, rest) {
+    const c = keyCurve(track);
+    const d = curveDistanceAt(track, t);
+    if (!c || d === null)
+        return undefined;
+    // a little behind to a little ahead: smooth through corners (short lines: a shorter look)
+    pathLineDirectionAt(c.line, d, Math.min(0.5, c.line.length / 20), tmpDir);
+    const r = rest && rest.length >= 3 ? rest : null;
+    if (r)
+        tmpRest.setFromEuler(tmpEuler.set(Number(r[0]) || 0, Number(r[1]) || 0, Number(r[2]) || 0));
+    if (!pathLineHeading(tmpDir, r ? tmpRest : null, tmpQuat))
+        return undefined;
+    tmpEuler.setFromQuaternion(tmpQuat, 'XYZ');
+    const out = [tmpEuler.x, tmpEuler.y, tmpEuler.z];
+    if (r)
+        for (let k = 0; k < 3; k++)
+            out[k] += Math.round(((Number(r[k]) || 0) - out[k]) / TAU) * TAU;
+    return out;
+}
+const faceTracks = new WeakMap();
+const expanded = new WeakMap();
+/** The facing track a position track drives, or undefined. */
+export const faceSource = (track) => track.faceOf;
+/**
+ * A clip's tracks as the runtime drives them: each facing position track adds its object's
+ * rotation, AFTER all the clip's own tracks — so inside the clip it wins over a rotation track on
+ * the same object (later proposals win). Cached per tracks array (no allocation per frame).
+ */
+export function expandTracks(tracks) {
+    const hit = expanded.get(tracks);
+    if (hit)
+        return hit;
+    const faces = [];
+    for (const t of tracks) {
+        if (t.muted || !t.keys.length || !isFacingTrack(t))
+            continue;
+        let f = faceTracks.get(t);
+        if (!f) {
+            f = { id: `${t.id}:face`, state: t.state, path: 'meshSettings.rotation', keys: t.keys, faceOf: t };
+            faceTracks.set(t, f);
+        }
+        faces.push(f);
+    }
+    const out = faces.length ? [...tracks, ...faces] : tracks;
+    expanded.set(tracks, out);
+    return out;
+}
+// -----------------------------------------------------------------------------
 // key / track edits (pure — the slice stores the results)
 // -----------------------------------------------------------------------------
 export const sortKeys = (keys) => [...keys].sort((a, b) => a.t - b.t);
@@ -167,6 +294,25 @@ export function setKeysEase(clip, selection, ease) {
         })),
     };
 }
+/** Whether a track's keys can be "from current" (Keyframe.current): eased tracks only. */
+export const canKeyFromCurrent = (track) => !isSwitchTrack(track);
+/** Mark the selected keys "from current" (on) or back to their own value (off). Switch tracks are left alone. */
+export function setKeysCurrent(clip, selection, on) {
+    return {
+        ...clip,
+        tracks: clip.tracks.map(track => (!canKeyFromCurrent(track) || !track.keys.some(k => selection.has(k.id)) ? track : {
+            ...track,
+            keys: track.keys.map(k => {
+                if (!selection.has(k.id))
+                    return k;
+                if (on)
+                    return { ...k, current: true };
+                const { current: _drop, ...rest } = k;
+                return rest;
+            }),
+        })),
+    };
+}
 export function setKeyValue(clip, keyId, value) {
     return {
         ...clip,

package/dist/animationsV2/elementSettings.d.ts

@@ -7,6 +7,11 @@ export interface ElementSources {
     clouds: unknown;
     ocean: unknown;
     terrain: unknown;
+    /** For 'time': the clock (sky.sunSystem supplies the multipliers). */
+    timeSettings?: unknown;
+    /** For 'render': the post-processing state and the HDR block (sky.sunSystem supplies the shadows). */
+    postProcessing?: unknown;
+    hdr?: unknown;
 }
 export declare const ENVIRONMENT_STATES: readonly ["sky", "clouds", "ocean", "terrain"];
 export type EnvironmentState = typeof ENVIRONMENT_STATES[number];

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

@@ -1 +1 @@
-{"version":3,"file":"elementSettings.d.ts","sourceRoot":"","sources":["../../src/animationsV2/elementSettings.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,eAAO,MAAM,kBAAkB,gDAAiD,CAAC;AACjF,MAAM,MAAM,gBAAgB,GAAG,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACjE,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,KAAK,IAAI,gBACD,CAAC;AAE5D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,GAAG,GAAG,CAU9E"}
+{"version":3,"file":"elementSettings.d.ts","sourceRoot":"","sources":["../../src/animationsV2/elementSettings.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,sEAAsE;IACtE,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,sGAAsG;IACtG,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,kBAAkB,gDAAiD,CAAC;AACjF,MAAM,MAAM,gBAAgB,GAAG,OAAO,kBAAkB,CAAC,MAAM,CAAC,CAAC;AACjE,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,KAAK,IAAI,gBACD,CAAC;AAE5D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,GAAG,GAAG,CAY9E"}

package/dist/animationsV2/elementSettings.js

@@ -1,7 +1,8 @@
 // Authored settings of any animatable element, with applied action patches — the
 // value a track starts from and returns to. Elements: an object id, 'camera', or an
-// environment element ('sky' | 'clouds' | 'ocean' | 'terrain'; the first three are the ids actions use).
-import { SceneActions, applySettingsPatch } from '@3driseai/3drise-core';
+// environment element ('sky' | 'clouds' | 'ocean' | 'terrain'; the first three are the ids actions use),
+// or one of the keyed views 'render' | 'time' (core/render/renderView), built from their stored parts.
+import { SceneActions, applySettingsPatch, toRenderView, toTimeView } from '@3driseai/3drise-core';
 export const ENVIRONMENT_STATES = ['sky', 'clouds', 'ocean', 'terrain'];
 export const isEnvironmentState = (state) => ENVIRONMENT_STATES.includes(state);
 export function resolveElementSettings(state, src) {
@@ -10,7 +11,9 @@ export function resolveElementSettings(state, src) {
             : state === 'clouds' ? src.clouds
                 : state === 'ocean' ? src.ocean
                     : state === 'terrain' ? src.terrain
-                        : src.objects.find(o => o.id === state);
+                        : state === 'time' ? toTimeView(src.timeSettings, src.sky?.sunSystem)
+                            : state === 'render' ? toRenderView({ postProcessing: src.postProcessing, hdr: src.hdr, sunSystem: src.sky?.sunSystem })
+                                : src.objects.find(o => o.id === state);
     const patch = SceneActions.getPatch(state);
     return base && patch ? applySettingsPatch(base, patch) : base;
 }

package/dist/animationsV2/sequenceUtils.js

@@ -1,5 +1,5 @@
 import { DEFAULT_DRIVER_SETTINGS } from './types.js';
-import { uid } from './clipUtils.js';
+import { expandTracks, uid } from './clipUtils.js';
 const lookup = (clips, id) => (typeof clips === 'function' ? clips(id) : clips.get(id));
 export const clipMap = (clips) => new Map(clips.map(c => [c.id, c]));
 const safeSpeed = (s) => (Number.isFinite(s) && s > 0 ? s : 1);
@@ -157,7 +157,7 @@ export function findCueConflicts(seq, clips, getAction) {
         for (const target of targets) {
             const paths = patchPaths(target.patch);
             for (const e of entries) {
-                for (const track of e.clip.tracks) {
+                for (const track of expandTracks(e.clip.tracks)) {
                     if (track.muted || track.node || track.state !== target.state || !track.keys.length)
                         continue;
                     if (paths.some(p => overlapsPath(p, track.path)))
@@ -234,7 +234,7 @@ export function findSequenceConflicts(seq, clips) {
             if (upper.end <= upper.start)
                 continue; // nothing animates
             const upperTargets = new Map();
-            upper.clip.tracks.forEach(t => {
+            expandTracks(upper.clip.tracks).forEach(t => {
                 if (!t.muted && t.keys.length)
                     upperTargets.set(targetKey(t.state, t.node, t.path), t);
             });
@@ -247,7 +247,7 @@ export function findSequenceConflicts(seq, clips) {
                 if (!overlaps)
                     continue;
                 const seen = new Set();
-                lower.clip.tracks.forEach(t => {
+                expandTracks(lower.clip.tracks).forEach(t => {
                     if (t.muted || !t.keys.length)
                         return;
                     const k = targetKey(t.state, t.node, t.path);

package/dist/animationsV2/types.d.ts

@@ -10,6 +10,14 @@ export interface Keyframe {
     value: KeyValue;
     /** Easing of the segment LEAVING this key. */
     ease?: EaseName;
+    /**
+     * "From current": the key takes the property's value as it is in the scene when the clip
+     * starts a run (a camera wherever the visitor orbited it, an object wherever another clip
+     * left it), read once per run and held for it — reverse, yoyo and loop return to it.
+     * `value` stays the fallback (nothing readable yet) and what the editor shows. Ignored on
+     * switch tracks (they don't ease).
+     */
+    current?: boolean;
 }
 export interface Track {
     id: string;
@@ -33,6 +41,21 @@ export interface Track {
      * SceneActions patch layer — the element re-renders, as when an action changes it.
      */
     discrete?: boolean;
+    /**
+     * Position tracks only (an object's `meshSettings.position`, a part's `position`): the motion
+     * between keys is drawn as one line through them — core buildPathLine, the same line a layout
+     * path draws — instead of straight segments. 0 straight … 1 a smooth curve through the keys.
+     * Each key's ease still sets the speed along its stretch; the keys stay where they are in time.
+     */
+    curve?: number;
+    /** Position tracks: 0 sharp corners … 1 round corners (arcs) at the keys (core smoothPathCorners). */
+    smoothCorners?: number;
+    /**
+     * An object's position track: the object turns to face where it travels (+Z along the line,
+     * pitching with the slope, no roll), its authored rotation on top as the facing correction.
+     * This drives its rotation: inside the clip it wins over a rotation track on the same object.
+     */
+    face?: boolean;
 }
 export interface AnimationClip {
     id: string;

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

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

package/dist/api/sceneHandle.js

@@ -183,7 +183,7 @@ export function createSceneHandle(getSource) {
         },
     };
     // ----- values ----------------------------------------------------------------------
-    const ENVIRONMENT = ['camera', 'sky', 'clouds', 'ocean', 'terrain', 'time'];
+    const ENVIRONMENT = ['camera', 'sky', 'clouds', 'ocean', 'terrain', 'time', 'render'];
     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) {
@@ -238,7 +238,7 @@ export function createSceneHandle(getSource) {
         check(ref, path) {
             const t = target(ref);
             if (!t)
-                return `no target "${ref}". Use sky, camera, clouds, ocean, terrain, time or an object${ref.includes('/') ? ' (and sky/camera/… take no node)' : ''}.`;
+                return `no target "${ref}". Use sky, camera, clouds, ocean, terrain, time, render 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/CreatedObject.d.ts

@@ -7,6 +7,9 @@ interface CreatedObjectProps extends ObjectReadyProps {
     createdObject: CreatedObjectSettings;
     children: React.ReactNode;
     shouldApply3driseMaterial?: boolean;
+    /** Changes when the renderer output is remounted for a reason the settings don't show (it became a
+     *  link source, fell back…): the new meshes need the material applied again. */
+    structureKey?: string;
     handleObjectClick?: (createdObject: CreatedObjectSettings, ref: Object3D, event: ThreeEvent<MouseEvent>) => void;
 }
 declare const CreatedObject: React.FC<CreatedObjectProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAWnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,UAAU,kBAAmB,SAAQ,gBAAgB;IACjD,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACpH;AAKD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAwG9C,CAAC;AAEH,eAAe,aAAa,CAAC"}
+{"version":3,"file":"CreatedObject.d.ts","sourceRoot":"","sources":["../../src/components/CreatedObject.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAWnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,UAAU,kBAAmB,SAAQ,gBAAgB;IACjD,aAAa,EAAE,qBAAqB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC;oFACgF;IAChF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACpH;AAKD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA4G9C,CAAC;AAEH,eAAe,aAAa,CAAC"}

package/dist/components/CreatedObject.js

@@ -16,7 +16,7 @@ import { useObjectEdges } from "../hooks/useObjectEdges.js";
 import { useObjectReady } from "../hooks/useObjectReady.js";
 /** One hovered part of an object: the intersected mesh (+ instance). */
 const hoverKey = (e) => `${e.object?.uuid}/${e.instanceId ?? ''}`;
-const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial = true, onObjectReady, onObjectDispose, handleObjectClick, }) => {
+const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial = true, structureKey = '', onObjectReady, onObjectDispose, handleObjectClick, }) => {
     const isSelected = false;
     // const isSelected = useObjectSelection(createdObject.id);
     // const { handleObjectClick: contextHandleObjectClick } = useSceneClick();
@@ -43,7 +43,11 @@ const CreatedObject = memo(({ createdObject, children, shouldApply3driseMaterial
     const [materialPass, bumpMaterialPass] = useReducer((n) => n + 1, 0);
     // Inside a group whose material is on, the group's material wins; off, the object's own comes back.
     const groupMaterial = coveredBy(createdObject, useContext(GroupMaterialContext));
-    useMaterialApplication(meshRef, groupMaterial ?? createdObject.materialSettings, shouldApply3driseMaterial, bumpMaterialPass);
+    // A layout remounts the object's renderer (on / off, more copies, a variant mix): the new meshes
+    // mount with their default material, so the material goes on again when its structure changes.
+    const layout = createdObject.meshSettings?.layout;
+    const layoutStructure = (layout?.enabled ? `${layout.count}|${JSON.stringify(layout.variantMix ?? null)}` : 'off') + '|' + structureKey;
+    useMaterialApplication(meshRef, groupMaterial ?? createdObject.materialSettings, shouldApply3driseMaterial, bumpMaterialPass, layoutStructure);
     // An object with no explicit flags takes its type's defaults (core's
     // resolveShadowFlags): saved objects carry none, and reading them as false
     // switched every shadow in every project off.

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

@@ -1 +1 @@
-{"version":3,"file":"CustomPrimitive.d.ts","sourceRoot":"","sources":["../../src/components/CustomPrimitive.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAOtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,UAAU,oBAAqB,SAAQ,gBAAgB;IACnD,aAAa,EAAE,qBAAqB,CAAC;IACrC,+EAA+E;IAC/E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACpH;AAGD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAoElD,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"CustomPrimitive.d.ts","sourceRoot":"","sources":["../../src/components/CustomPrimitive.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAMtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,UAAU,oBAAqB,SAAQ,gBAAgB;IACnD,aAAa,EAAE,qBAAqB,CAAC;IACrC,+EAA+E;IAC/E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB,CAAC,EAAE,CAAC,aAAa,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CACpH;AAGD,QAAA,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CA6DlD,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/dist/components/CustomPrimitive.js

@@ -1,10 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useRef, memo } from "react";
-import { Vector3 } from "three";
 import MaterialLibrary from "./MaterialLibrary.js";
 import ModelBoundary from "./ModelBoundary.js";
 import ModelPrimitive from "./ModelPrimitive.js";
-import { useWaterReflections } from "../hooks/useWaterReflections.js";
 import { GeometryMesh } from "./GeometryShape.js";
 import { useObjectReady } from "../hooks/useObjectReady.js";
 const CustomPrimitive = memo(({ createdObject, slot = 0, onObjectReady, onObjectDispose, handleObjectClick, }) => {
@@ -50,13 +48,6 @@ const CustomPrimitive = memo(({ createdObject, slot = 0, onObjectReady, onObject
     // }, [
     //   createdObject.config,
     // ]);
-    const isWaterMaterial = createdObject.materialSettings.materialVariant === 'water' || createdObject.materialSettings.materialType === 'water';
-    useWaterReflections(createdObject.meshSettings.visible && isWaterMaterial ? meshRef : { current: null }, {
-        waterPosition: new Vector3(...createdObject.meshSettings.position),
-        resolution: 256,
-        updateFrequency: 1,
-        enabled: createdObject.meshSettings.visible && isWaterMaterial,
-    });
     const useDreiMaterials = createdObject.materialSettings.materialType === "advanced";
     // const obj = ObjectManager.getObject(createdObject.id);
     const materialType = createdObject.materialSettings?.materialType || 'basic';
@@ -68,7 +59,7 @@ const CustomPrimitive = memo(({ createdObject, slot = 0, onObjectReady, onObject
     //   mode = 'outline';
     // }
     if (createdObject.type === 'mesh')
-        return _jsx("mesh", { ref: meshRef, name: createdObject.name, children: _jsx(GeometryMesh, { config: createdObject.config, materialSettings: createdObject.materialSettings, animations: createdObject.animations, onObjectReady: (_object, ref) => onObjectReady && onObjectReady(createdObject, ref), onObjectDispose: (_object, ref) => onObjectDispose && onObjectDispose(createdObject, ref), modeConfig: createdObject.modeConfig || { mode: 'solid', count: 1000, symmetry: 3, spacing: 0.1, slices: 8, linkRadius: 0.05, angle: 18, lineWidth: 1 }, children: useDreiMaterials && createdObject.meshSettings.visible && (_jsx(MaterialLibrary, { materialSettings: createdObject.materialSettings })) }) }, createdObject.id);
+        return _jsx("mesh", { ref: meshRef, name: createdObject.name, children: _jsx(GeometryMesh, { config: createdObject.config, shapeLayout: createdObject.layout?.shape, materialSettings: createdObject.materialSettings, animations: createdObject.animations, onObjectReady: (_object, ref) => onObjectReady && onObjectReady(createdObject, ref), onObjectDispose: (_object, ref) => onObjectDispose && onObjectDispose(createdObject, ref), modeConfig: createdObject.modeConfig || { mode: 'solid', count: 1000, symmetry: 3, spacing: 0.1, slices: 8, linkRadius: 0.05, angle: 18, lineWidth: 1 }, children: useDreiMaterials && createdObject.meshSettings.visible && (_jsx(MaterialLibrary, { materialSettings: createdObject.materialSettings })) }) }, createdObject.id);
     // Models resolve asynchronously: ModelPrimitive suspends while its GLTF loads, so it
     // needs its own boundary rather than rendering null forever when nothing preloaded it.
     // ModelPrimitive owns its own ref and reports readiness: the meshRef above stays null

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

@@ -1 +1 @@
-{"version":3,"file":"EnvironmentManager.d.ts","sourceRoot":"","sources":["../../src/components/EnvironmentManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAkB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAGhF,OAAO,KAAK,EACR,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,YAAY,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG7D;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;iFAWiF;AACjF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG;IAChF,MAAM,CAAC,EAAE,wBAAwB,CAAC;IAClC,OAAO,CAAC,EAAE,yBAAyB,CAAC;IACpC,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D,YAAY,EAAE,YAAY,CAAC;IAC3B,iFAAiF;IACjF,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,cAAc,CAAC,mBAAmB,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IAC9C;sEACkE;IAClE,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AAoBD,QAAA,MAAM,kBAAkB,8FAyGtB,CAAC;AAGH,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"EnvironmentManager.d.ts","sourceRoot":"","sources":["../../src/components/EnvironmentManager.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAkB,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAGhF,OAAO,KAAK,EACR,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,WAAW,EACX,YAAY,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAK7D;;;;;;;;;;;;;;;;;;;GAmBG;AAEH;;;;;;;;;;;iFAWiF;AACjF,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG;IAChF,MAAM,CAAC,EAAE,wBAAwB,CAAC;IAClC,OAAO,CAAC,EAAE,yBAAyB,CAAC;IACpC,SAAS,CAAC,EAAE,iBAAiB,CAAC;IAC9B,KAAK,CAAC,EAAE,kBAAkB,CAAC;CAC9B,CAAC;AAEF,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC7D,YAAY,EAAE,YAAY,CAAC;IAC3B,iFAAiF;IACjF,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,eAAe,CAAC,EAAE,yBAAyB,CAAC;IAC5C,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,cAAc,CAAC,mBAAmB,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IAC9C;sEACkE;IAClE,SAAS,CAAC,EAAE,OAAO,CAAC;CACvB;AAoBD,QAAA,MAAM,kBAAkB,8FA6GtB,CAAC;AAGH,eAAe,kBAAkB,CAAC"}

package/dist/components/EnvironmentManager.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { forwardRef } from 'react';
+import { forwardRef, useMemo } from 'react';
 import { Vector3 } from 'three';
 import SkySystem from './SkySystem.js';
 import HdrEnvironment, { isHdrActive } from './HdrEnvironment.js';
@@ -8,6 +8,8 @@ import TerrainBuilder from './TerrainBuilder.js';
 import LandscapeBuilder from './LandscapeBuilder.js';
 import OceanBuilder from './OceanBuilder.js';
 import { useRuntimeSettings } from '../hooks/useRuntimeSettings.js';
+import { useActionPatch, useRuntimeTime, useRuntimeSunSystem } from '../hooks/useActionPatch.js';
+import { patchHdr } from '@3driseai/3drise-core';
 const DEFAULT_HDR = {
     visible: false,
     name: null,
@@ -24,10 +26,14 @@ const DEFAULT_HDR = {
     },
 };
 const ORIGIN = new Vector3(0, 0, 0);
-const EnvironmentManager = forwardRef(({ timeSettings, environment, hdrSettings, skySettings, cloudsSettings, terrainSettings, landscapeSettings, oceanSettings, fogSettings, cubeCameraResolution = 512, skyboxScale = 100000, playerPosition = ORIGIN, onTimeOfDayChange, onTimeUpdate, driveTime = true, onObjectReady, onObjectDispose, }, ref) => {
-    const hdr = hdrSettings ?? environment?.hdr ?? DEFAULT_HDR;
-    // Authored settings + applied action patches (runtime only).
-    const sky = useRuntimeSettings('sky', skySettings ?? environment?.sky);
+const EnvironmentManager = forwardRef(({ timeSettings: authoredTime, environment, hdrSettings, skySettings, cloudsSettings, terrainSettings, landscapeSettings, oceanSettings, fogSettings, cubeCameraResolution = 512, skyboxScale = 100000, playerPosition = ORIGIN, onTimeOfDayChange, onTimeUpdate, driveTime = true, onObjectReady, onObjectDispose, }, ref) => {
+    // Authored settings + applied action patches (runtime only). 'render' and 'time'
+    // are keyed views: each part is laid over the settings it belongs to.
+    const renderPatch = useActionPatch('render');
+    const authoredHdr = hdrSettings ?? environment?.hdr ?? DEFAULT_HDR;
+    const hdr = useMemo(() => patchHdr(authoredHdr, renderPatch), [authoredHdr, renderPatch]);
+    const timeSettings = useRuntimeTime(authoredTime);
+    const sky = useRuntimeSunSystem(useRuntimeSettings('sky', skySettings ?? environment?.sky));
     const clouds = useRuntimeSettings('clouds', cloudsSettings ?? environment?.clouds);
     const terrain = useRuntimeSettings('terrain', terrainSettings ?? environment?.terrain);
     const landscape = landscapeSettings ?? environment?.landscape;

package/dist/components/GeometryShape.d.ts

@@ -1,6 +1,7 @@
 import type { ObjectReadyProps } from '../types/objectReady';
 import type { ReactNode } from 'react';
 import type { BufferGeometry } from 'three';
+import { type ShapeLayout } from '@3driseai/3drise-core';
 import type { GeometryShapeConfig, MaterialSettings, ModeConfig, ObjectAnimations } from "@3driseai/3drise-core";
 type Pt = [number, number, number];
 type ModeData = {
@@ -18,6 +19,8 @@ type ModeData = {
 };
 export interface GeometryMeshProps extends ObjectReadyProps {
     config: GeometryShapeConfig;
+    /** A layout applied to the shape (the object's layout.shape): its geometry reshaped, its ground holes drawn. */
+    shapeLayout?: ShapeLayout | null;
     modeConfig?: ModeConfig;
     materialSettings: MaterialSettings;
     animations?: ObjectAnimations;
@@ -25,7 +28,7 @@ export interface GeometryMeshProps extends ObjectReadyProps {
     /** Material for the solid path (defaults to a standard material). */
     children?: ReactNode;
 }
-export declare function useShapeGeometry(options: GeometryShapeConfig | null | undefined): BufferGeometry;
+export declare function useShapeGeometry(options: GeometryShapeConfig | null | undefined, shapeLayout?: ShapeLayout | null): BufferGeometry;
 export declare function volumeFill(geo: BufferGeometry, count: number, oversample?: number): Float32Array;
 /** area-weighted points on the skin — the keystone for the modes below */
 export declare function surfaceScatter(geo: BufferGeometry, count: number): Float32Array;
@@ -42,7 +45,7 @@ export declare function plexus(geo: BufferGeometry, count: number, radiusMul: nu
     segments: Pt[];
 };
 export declare function computeMode(geo: BufferGeometry, c: ModeConfig): ModeData;
-export declare function GeometryMesh({ config, materialSettings, animations, modeConfig, color, children, onObjectReady, onObjectDispose }: GeometryMeshProps): import("react").JSX.Element;
+export declare function GeometryMesh({ config, shapeLayout, materialSettings, animations, modeConfig, color, children, onObjectReady, onObjectDispose }: GeometryMeshProps): import("react").JSX.Element;
 export declare function FitGroup({ geometry, radius, children }: {
     geometry: BufferGeometry;
     radius?: number;

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

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