@3driseai/3drise-viewer 0.1.33 → 0.1.35

package/dist/operations/runtime.js

@@ -387,12 +387,54 @@ function warmRoots(t) {
     });
     return out;
 }
+// Material properties that pick a different shader program (three's program cache key, roughly).
+const PROGRAM_TEXTURES = [
+    'map', 'normalMap', 'roughnessMap', 'metalnessMap', 'emissiveMap', 'aoMap', 'envMap', 'alphaMap', 'bumpMap',
+    'displacementMap', 'lightMap', 'specularMap', 'clearcoatMap', 'clearcoatNormalMap', 'clearcoatRoughnessMap',
+    'transmissionMap', 'thicknessMap', 'sheenColorMap', 'sheenRoughnessMap', 'iridescenceMap', 'iridescenceThicknessMap',
+    'anisotropyMap', 'specularIntensityMap', 'specularColorMap', 'gradientMap', 'matcap',
+];
+const PROGRAM_FLAGS = ['vertexColors', 'flatShading', 'wireframe', 'transparent', 'fog', 'toneMapped', 'dithering', 'premultipliedAlpha'];
+const PROGRAM_AMOUNTS = ['clearcoat', 'transmission', 'sheen', 'iridescence', 'anisotropy', 'dispersion', 'alphaTest', 'alphaHash'];
+/**
+ * What decides the shaders an effect builds on a primitive object: its meshes' materials and
+ * geometry layout. Two primitives with the same key get the same programs from the same effect,
+ * so a group's 90 boxes and cylinders are warmed once per key, not once each. Anything that
+ * isn't a primitive (a model, text, …) is its own key: warmed on its own, as before.
+ */
+function programKey(t) {
+    if (t.userData?.objectType !== 'mesh')
+        return `own:${t.uuid}`;
+    const parts = [];
+    t.traverse((c) => {
+        if (!c.isMesh || c.userData?.__opFxHelper)
+            return;
+        const g = c.geometry;
+        const geo = g ? `${Object.keys(g.attributes ?? {}).sort().join('+')}${g.index ? '|i' : ''}${Object.keys(g.morphAttributes ?? {}).length ? '|m' : ''}` : '';
+        const mesh = `${c.isSkinnedMesh ? 's' : ''}${c.isInstancedMesh ? 'n' : ''}${c.receiveShadow ? 'r' : ''}${c.castShadow ? 'c' : ''}`;
+        const mats = Array.isArray(c.material) ? c.material : c.material ? [c.material] : [];
+        for (const m of mats) {
+            const tex = PROGRAM_TEXTURES.filter(k => m[k]).join(',');
+            const flags = PROGRAM_FLAGS.filter(k => m[k]).join(',');
+            const amounts = PROGRAM_AMOUNTS.filter(k => Number(m[k]) > 0).join(',');
+            const custom = typeof m.customProgramCacheKey === 'function' ? m.customProgramCacheKey() : '';
+            parts.push([m.type, m.side, tex, flags, amounts, JSON.stringify(m.defines ?? null), custom, geo, mesh].join(';'));
+        }
+    });
+    return parts.sort().join('/');
+}
 /**
  * Warm an operation on these targets: build and compile everything its first real play
  * needs — shaders (in the background), and the CPU work it caches (surface samples,
- * geometry) — showing nothing, then take it off again. Queued, one at a time; each
- * (operation, target, its meshes, parameters) once. Targets with no meshes yet (a model
- * still loading) are skipped and warmed when it has landed.
+ * geometry) — showing nothing, then take it off again. Queued, one job at a time; each
+ * (operation, its shaders, parameters) once. Targets with no meshes yet (a model still
+ * loading) are skipped and warmed when it has landed.
+ *
+ * A group's members are warmed one per programKey: members that would build the same
+ * shaders share one warm. The others do their own CPU prep (surface samples) at their first
+ * play — a few ms each for a primitive — instead of all of it under the loading cover.
+ * Within a job the chosen roots are applied together and taken off together (one wait,
+ * not one per root): it is the same operation on different objects.
  */
 export function warmEffectOn(def, targets, params, self) {
     if (!isWarmable(def))
@@ -403,32 +445,38 @@ export function warmEffectOn(def, targets, params, self) {
         if (!ctx)
             return;
         const roots = targets.flatMap(warmRoots);
+        const picked = [];
         for (const t of def.multi ? roots : roots.slice(0, 1)) {
             if (!t.parent)
                 continue; // left the scene meanwhile
             const { count, sig } = meshSignature(t);
             if (!count)
                 continue; // nothing to warm yet (a model still loading)
-            const k = `${def.value}:${t.uuid}:${sig}:${paramsKey}`;
+            const pk = programKey(t);
+            const k = `${def.value}:${pk.startsWith('own:') ? `${pk}:${sig}` : pk}:${paramsKey}`;
             if (warmed.has(k) || isOperationOn(def.value, t))
                 continue;
             warmed.add(k);
-            const t0 = performance.now();
-            // a warm-only run: stages and compiles everything, animates nothing…
-            warmMode.on = true;
-            let res;
-            try {
-                res = def.apply(t, params, ctx);
-            }
-            finally {
-                warmMode.on = false;
-            }
-            noteWork(`warm ${def.value}`, performance.now() - t0);
-            await finished(res, { duration: 0 });
-            // …then quietly take it off again, unless something started it meanwhile
-            if (!isOperationOn(def.value, t))
-                await finished(def.revert(t, { ...params, duration: 0.001 }, ctx), { duration: 0 });
+            picked.push(t);
+        }
+        if (!picked.length)
+            return;
+        const t0 = performance.now();
+        // a warm-only run: stages and compiles everything, animates nothing…
+        const runs = [];
+        warmMode.on = true;
+        try {
+            for (const t of picked)
+                runs.push(def.apply(t, params, ctx));
+        }
+        finally {
+            warmMode.on = false;
         }
+        noteWork(`warm ${def.value}`, performance.now() - t0);
+        await Promise.all(runs.map(r => finished(r, { duration: 0 })));
+        // …then quietly take it off again, unless something started it meanwhile
+        await Promise.all(picked.filter(t => !isOperationOn(def.value, t))
+            .map(t => finished(def.revert(t, { ...params, duration: 0.001 }, ctx), { duration: 0 })));
     };
     warmQueue = warmQueue.then(job, job);
     return warmQueue;

package/dist/operations/types.d.ts

@@ -131,6 +131,11 @@ export interface OperationDefinition {
     apply: (target: Object3D, params: OperationParams, ctx: OperationContext) => void | Promise<void>;
     /** No revert = one-way (applies only). */
     revert?: (target: Object3D, params: OperationParams, ctx: OperationContext) => void | Promise<void>;
+    /**
+     * A parameter changed while it runs (a timeline track easing its speed): take the new params
+     * now, without replaying anything. Absent = the change is picked up on its next pass.
+     */
+    live?: (target: Object3D, params: OperationParams) => void;
     /**
      * A motion that repeats for as long as the effect is on (float, sway, rotate…).
      * Played as an object effect it follows the same playback as everything else:

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

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

package/dist/triggers/readiness.js

@@ -24,7 +24,7 @@
 import { useSyncExternalStore } from 'react';
 const TIMEOUT_MS = 15000;
 const COMPILE_TIMEOUT_MS = 5000;
-const BAKE_TIMEOUT_MS = 20000;
+const BAKE_TIMEOUT_MS = 5000;
 const log = (...a) => console.info('[3drise] scene', ...a);
 class SceneReadiness {
     status = 'idle';

package/dist/utils/cdnUrls.d.ts

@@ -0,0 +1,10 @@
+import { toCdn } from '@3driseai/3drise-core';
+export { toCdn };
+/**
+ * Route three.js asset loads through the CDN. DefaultLoadingManager covers every loader
+ * created without its own manager (viewer, useLoader/useTexture); core's manager covers
+ * loadAssets/loadGLTF. Idempotent. Called from ProjectLoader rather than at module load
+ * so bundlers can't tree-shake it away.
+ */
+export declare const installCdnUrls: () => void;
+//# sourceMappingURL=cdnUrls.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cdnUrls.d.ts","sourceRoot":"","sources":["../../src/utils/cdnUrls.ts"],"names":[],"mappings":"AACA,OAAO,EAAwC,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGpF,OAAO,EAAE,KAAK,EAAE,CAAC;AAIjB;;;;;GAKG;AACH,eAAO,MAAM,cAAc,QAAO,IAKjC,CAAC"}

package/dist/utils/cdnUrls.js

@@ -0,0 +1,18 @@
+import { DefaultLoadingManager } from 'three';
+import { loadingManager as coreLoadingManager, toCdn } from '@3driseai/3drise-core';
+// toCdn lives in core (utils/cdnUrls.ts) — the one place the origin/CDN hosts are defined.
+export { toCdn };
+let installed = false;
+/**
+ * Route three.js asset loads through the CDN. DefaultLoadingManager covers every loader
+ * created without its own manager (viewer, useLoader/useTexture); core's manager covers
+ * loadAssets/loadGLTF. Idempotent. Called from ProjectLoader rather than at module load
+ * so bundlers can't tree-shake it away.
+ */
+export const installCdnUrls = () => {
+    if (installed)
+        return;
+    installed = true;
+    DefaultLoadingManager.setURLModifier(toCdn);
+    coreLoadingManager.setURLModifier(toCdn);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3driseai/3drise-viewer",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -39,6 +39,6 @@
   },
   "dependencies": {
     "@3driseai/3drise-common": "^1.0.1",
-    "@3driseai/3drise-core": "^1.0.25"
+    "@3driseai/3drise-core": "^1.0.27"
   }
 }