@3driseai/3drise-viewer 0.1.29 → 0.1.30

package/dist/components/text/useTextObject.js

@@ -9,10 +9,12 @@ import { createPlayback } from './engine/playback.js';
 import { VARIANTS } from './engine/variants.js';
 import { layoutOutline, layoutStrokeFont } from './engine/glyphs.js';
 import { loadOutline, loadStrokes } from './fonts/index.js';
+import { extentOf } from './engine/methods.js';
+import { stopRaycast } from '../../utils/pickProxy.js';
 /** One em of the font in world units: the object's own size, so a text of 0.5 m high default. The parent transform does the rest. */
 export const TEXT_EM = 0.5;
 // Keys that are not look knobs.
-const BASE_KEYS = new Set(['type', 'enabled', 'text', 'font', 'drawMethod', 'drawDuration', 'drawEase', 'drawStagger', 'drawAngle',
+const BASE_KEYS = new Set(['type', 'shown', 'text', 'font', 'drawMethod', 'drawDuration', 'drawEase', 'drawStagger', 'drawAngle',
     'eraseMethod', 'eraseDuration', 'eraseEase', 'eraseStagger', 'eraseAngle', 'autoPlay', 'loop', 'yoyo', 'holdTime', 'hiddenTime']);
 /** Animation keys that bake a schedule into the geometry: a change rebuilds. */
 const ANIM_STRUCTURAL = ['drawMethod', 'drawStagger', 'drawAngle', 'eraseMethod', 'eraseStagger', 'eraseAngle'];
@@ -36,6 +38,8 @@ export function useTextObject(look, props) {
     const S = staticOf(look);
     const rootRef = useRef(null);
     const innerRef = useRef(null);
+    // Hover / click land on one plane over the text's box (em units, inside the em-scaled group), never on a letter.
+    const proxyRef = useRef(null);
     const cfg = useMemo(() => withConfigDefaults(DEFAULT_TEXT_OBJECTS[look], config), [config, look]);
     useObjectReady(rootRef, cfg, onObjectReady, onObjectDispose);
     const cfgRef = useRef(cfg);
@@ -71,10 +75,18 @@ export function useTextObject(look, props) {
             const now = cfgRef.current;
             syncAnim(now);
             built = V.build(layout, lookCfg(now), anim.current);
+            stopRaycast(built.object);
             innerRef.current.add(built.object);
             inst.current = built;
+            const e = extentOf(layout.strokes);
+            const pad = 0.12; // em: a little air around the glyphs
+            const proxy = proxyRef.current;
+            if (proxy) {
+                proxy.position.set((e.x0 + e.x1) / 2, (e.y0 + e.y1) / 2, 0);
+                proxy.scale.set(e.w + 2 * pad, e.h + 2 * pad, 1);
+            }
             pb.current.reset(anim.current);
-            if (now.enabled === false)
+            if (now.shown === false)
                 pb.current.hide();
         });
         return () => { dead = true; if (built) {
@@ -84,24 +96,24 @@ export function useTextObject(look, props) {
                 inst.current = null;
         } };
     }, [look, rebuildKey, lookCfg, syncAnim]);
-    // `enabled` is the trigger: on draws, off erases (then stays hidden). Loop / yoyo restart the cycle.
-    const prev = useRef({ enabled: cfg.enabled, loop: cfg.loop, yoyo: cfg.yoyo });
+    // `shown` is the trigger: on draws, off erases (then stays hidden). Loop / yoyo restart the cycle.
+    const prev = useRef({ shown: cfg.shown, loop: cfg.loop, yoyo: cfg.yoyo });
     useEffect(() => {
         const p = prev.current;
-        const changedEnabled = p.enabled !== cfg.enabled;
+        const changedShown = p.shown !== cfg.shown;
         const changedPlay = p.loop !== cfg.loop || p.yoyo !== cfg.yoyo;
-        prev.current = { enabled: cfg.enabled, loop: cfg.loop, yoyo: cfg.yoyo };
+        prev.current = { shown: cfg.shown, loop: cfg.loop, yoyo: cfg.yoyo };
         if (!inst.current)
             return;
-        if (changedEnabled) {
-            if (cfg.enabled === false)
+        if (changedShown) {
+            if (cfg.shown === false)
                 pb.current.playErase(anim.current);
             else
                 pb.current.restart(anim.current);
         }
-        else if (changedPlay && cfg.enabled !== false)
+        else if (changedPlay && cfg.shown !== false)
             pb.current.restart(anim.current);
-    }, [cfg.enabled, cfg.loop, cfg.yoyo]);
+    }, [cfg.shown, cfg.loop, cfg.yoyo]);
     const scale = useMemo(() => new THREE.Vector3(), []);
     useFrame((state, dt) => {
         const i = inst.current;
@@ -114,5 +126,5 @@ export function useTextObject(look, props) {
         root.getWorldScale(scale);
         i.update(st, state.clock.elapsedTime, px * Math.abs(scale.x) * TEXT_EM);
     });
-    return { rootRef, innerRef };
+    return { rootRef, innerRef, proxyRef };
 }

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,gCAAgC,CAAC;AAC9D,eAAO,MAAM,qBAAqB,aAmBhC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,gCAAgC,CAAC;AAC9D,eAAO,MAAM,qBAAqB,aAqBhC,CAAC"}

package/dist/constants.js

@@ -17,6 +17,8 @@ export const SELF_MANAGED_MATERIAL = new Set([
     'environment',
     // Land objects draw with the terrain material (TERRAIN_PATCH).
     'land',
+    // Text looks (plain, handwriting, neon…) draw with their own shaders; 3d text is a mesh and takes a material.
+    'text',
     // The water surface owns its shader — one material for both hosts, built
     // around the wave field. Left out of this set, useMaterialApplication
     // overwrites it with whatever the registry has under materialType, which for

package/dist/index.d.ts

@@ -15,13 +15,13 @@ export { cameraManager } from './utils/CameraSingleton';
 export { applyAnchorSettings, createCurves, createSunPosition, randomRange, } from './utils/utils3d';
 export { applyAnchorSettings as applyAnchorSettingsLegacy } from './utils/anchorUtils';
 export * from './utils/shapes';
+export * from './utils/pickProxy';
 export { hasHoverAnimation } from './utils/hasHoverAnimation';
 export { findById } from './utils/sceneQuery';
 export { hasFrameRenderer, registerFrameRenderer, renderFrame } from './utils/frameRenderer';
 export type { FrameRenderer } from './utils/frameRenderer';
 export { resolveObject3D } from './utils/resolveObject3D';
 export type { Object3DRefLike, Object3DSource } from './utils/resolveObject3D';
-export * from './utils/textEffects';
 export { applyTerrainUniforms, applyTerrainTextures } from './utils/terrainUniforms';
 export { useTerrainTextures } from './hooks/useTerrainTextures';
 export { terrainHeightAt } from './utils/terrainHeight';

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -18,11 +18,11 @@ export { cameraManager } from './utils/CameraSingleton.js';
 export { applyAnchorSettings, createCurves, createSunPosition, randomRange, } from './utils/utils3d.js';
 export { applyAnchorSettings as applyAnchorSettingsLegacy } from './utils/anchorUtils.js';
 export * from './utils/shapes.js';
+export * from './utils/pickProxy.js';
 export { hasHoverAnimation } from './utils/hasHoverAnimation.js';
 export { findById } from './utils/sceneQuery.js';
 export { hasFrameRenderer, registerFrameRenderer, renderFrame } from './utils/frameRenderer.js';
 export { resolveObject3D } from './utils/resolveObject3D.js';
-export * from './utils/textEffects.js';
 export { applyTerrainUniforms, applyTerrainTextures } from './utils/terrainUniforms.js';
 export { useTerrainTextures } from './hooks/useTerrainTextures.js';
 export { terrainHeightAt } from './utils/terrainHeight.js';

package/dist/operations/catalogue/flock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flock.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/flock.ts"],"names":[],"mappings":";AA6CA,wBAwHG"}
+{"version":3,"file":"flock.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/flock.ts"],"names":[],"mappings":";AA+CA,wBAyJG"}

package/dist/operations/catalogue/flock.js

@@ -4,6 +4,8 @@
 // streams — out and up, or all toward one side of the screen — accelerating
 // until they are gone. Birds always face the way they fly, so on revert they
 // fly back in (head first) and settle into place as the surface re-forms.
+// With Disappear off (an object effect's default) the birds stay perched on every
+// spot of the surface (the surface itself gone): a flutter now and then, heads turning.
 import { BufferAttribute, BufferGeometry, Vector3 } from 'three';
 import { defineOperation } from '../types.js';
 import { addLayer, forEachMeshMaterial, removeLayer } from './shaderLayers.js';
@@ -36,17 +38,19 @@ function birdGeometry() {
 export default defineOperation({
     value: 'flock',
     label: 'Flock',
-    description: 'Turn the targets into a flock of birds that takes off and flies away — reverting flies them home',
+    description: 'Turn the targets into a flock of birds that takes off and flies away (or, Disappear off, stays perched) — reverting flies them home',
     channel: 'visual',
     multi: true,
     toggles: true,
-    usableIn: ['interaction', 'action'],
+    usableIn: ['interaction', 'action', 'object'],
+    objectParams: { disappear: false },
     params: {
         direction: { type: 'select', label: 'Take-off order', default: 'down', options: DIRECTION_OPTIONS },
-        exit: { type: 'select', label: 'Fly', default: 'away', options: [{ value: 'away', label: 'Out and up' }, { value: 'left', label: 'To the right' }, { value: 'right', label: 'To the left' }, { value: 'up', label: 'Straight up' }] },
+        disappear: { type: 'boolean', label: 'Disappear', default: true, hint: 'Off: the birds stay perched on the object' },
+        exit: { type: 'select', label: 'Fly', default: 'away', showWhen: { disappear: ['true'] }, options: [{ value: 'away', label: 'Out and up' }, { value: 'left', label: 'To the right' }, { value: 'right', label: 'To the left' }, { value: 'up', label: 'Straight up' }] },
         birds: { type: 'number', label: 'Birds', default: 1400, min: 100, max: 12000, step: 100 },
         birdSize: { type: 'number', label: 'Bird size', default: 1, min: 0.3, max: 4, step: 0.05, unit: '×' },
-        speed: { type: 'number', label: 'Speed', default: 1, min: 0.2, max: 4, step: 0.05, unit: '×' },
+        speed: { type: 'number', label: 'Speed', default: 1, min: 0.2, max: 4, step: 0.05, unit: '×', showWhen: { disappear: ['true'] } },
         edgeColor: { type: 'color', label: 'Edge colour', default: '#ffffff' },
         scale: { type: 'number', label: 'Pattern', default: 2.5, min: 0.5, max: 12, step: 0.1 },
         duration: { type: 'number', label: 'Duration', default: 3.4, min: 0.3, max: 14, step: 0.1, unit: 's' },
@@ -57,7 +61,7 @@ export default defineOperation({
             const field = createFieldState(target);
             field.edgeWidth.value = 0.04;
             const own = {
-                field, exit: { value: new Vector3(1, 0, 0) }, mode: { value: 0 }, speed: { value: 1 }, dirSign: { value: 1 }, bird: { value: 1 }, mats: new Set(),
+                field, exit: { value: new Vector3(1, 0, 0) }, mode: { value: 0 }, speed: { value: 1 }, dirSign: { value: 1 }, bird: { value: 1 }, keep: { value: 0 }, mats: new Set(),
             };
             const sample = sampleSurfaceCached(target, Math.round(Number(p.birds)), 53);
             const n = sample.count;
@@ -68,7 +72,7 @@ export default defineOperation({
                 attributes: { aFlkP: [pos, 3], aFlkN: [sample.normal.slice(0, n * 3), 3], aFlkR: [sample.random.slice(0, n * 4), 4] },
                 layerKey: 'flockInstances', roughness: 0.65, metalness: 0, doubleSided: true,
                 layer: {
-                    uniforms: { ...fieldUniforms(P, field), uFlkExit: own.exit, uFlkMode: own.mode, uFlkSpeed: own.speed, uFlkDirSign: own.dirSign, uFlkBird: own.bird },
+                    uniforms: { ...fieldUniforms(P, field), uFlkExit: own.exit, uFlkMode: own.mode, uFlkSpeed: own.speed, uFlkDirSign: own.dirSign, uFlkBird: own.bird, uFlkKeep: own.keep },
                     common: fieldGlsl(P),
                     vertexPars: /* glsl */ `
                     attribute float aWing; attribute vec3 aFlkP; attribute vec3 aFlkN; attribute vec4 aFlkR;
@@ -98,12 +102,33 @@ export default defineOperation({
                       vec3 right = normalize(cross(fwd, vec3(0.0, 1.0, 0.0)) + vec3(1e-4));
                       vec3 up = cross(right, fwd);
                       return mat3(right, up, fwd);
-                    }`,
-                    normal: `{ objectNormal = flkFrame(clamp(flkAge(), 0.0, 1.0)) * objectNormal; }`,
+                    }
+                    // perched: sitting on its spot, up along the surface normal, turning its head now and then
+                    mat3 flkPerch() {
+                      vec3 up = normalize(aFlkN + vec3(1e-4));
+                      vec3 any = abs(up.y) < 0.9 ? vec3(0.0, 1.0, 0.0) : vec3(1.0, 0.0, 0.0);
+                      vec3 right0 = normalize(cross(up, any));
+                      float yaw = aFlkR.z * 6.2832 + step(0.6, aFlkR.y) * 0.35 * sin(uFlkTime * (0.4 + 0.5 * aFlkR.w) + aFlkR.x * 30.0);
+                      vec3 right = right0 * cos(yaw) + cross(up, right0) * sin(yaw);
+                      vec3 fwd = cross(right, up);
+                      return mat3(right, up, fwd);
+                    }
+                    float flkHeld() { return uFlkKeep * step(0.9999, uFlkProgress); }`,
+                    normal: `{ objectNormal = (uFlkKeep > 0.5 ? flkPerch() : flkFrame(clamp(flkAge(), 0.0, 1.0))) * objectNormal; }`,
                     vertex: /* glsl */ `
                     {
                       float a = flkAge();
                       if (a <= 0.0) { transformed *= 0.0; }
+                      else if (uFlkKeep > 0.5) {
+                        // perched on its spot; a brief flutter now and then
+                        vec3 v = transformed;
+                        float flutter = smoothstep(0.93, 1.0, sin(uFlkTime * (0.5 + 0.4 * aFlkR.x) + aFlkR.z * 60.0)) * flkHeld();
+                        v.y += abs(aWing) * sin(uFlkTime * 22.0 + aFlkR.y * 6.28) * 0.38 * flutter;
+                        v.y += abs(aWing) * 0.12;                       // wings held slightly up at rest
+                        float size = uFlkExtent * 0.03 * uFlkBird * (0.8 + 0.4 * aFlkR.w);
+                        float sc = smoothstep(0.0, 0.06, a);
+                        transformed = flkPerch() * (v * size * sc) + aFlkN * uFlkExtent * 0.008;
+                      }
                       else {
                         a = min(a, 1.0);
                         vec3 v = transformed;
@@ -139,6 +164,15 @@ export default defineOperation({
             s.exit.value.copy(p.exit === 'left' ? r : r.negate());
         }
         s.mesh.visible = true;
+        s.keep.value = p.disappear === false ? 1 : 0;
+        if (s.keep.value) {
+            // keep: the surface becomes birds (0 → 1), perched, and holds
+            return runProgress(target, s.field, 1, {
+                duration: Number(p.duration) / (1 + LIFE), ease: 'none', hold: true,
+                onComplete: () => hideMeshes(target, KEY, true),
+            });
+        }
+        hideMeshes(target, KEY, false);
         return runProgress(target, s.field, 1 + LIFE, {
             duration: Number(p.duration), ease: 'power1.in',
             onComplete: () => { hideMeshes(target, KEY, true); s.mesh.visible = false; },
@@ -151,8 +185,9 @@ export default defineOperation({
         hideMeshes(target, KEY, false);
         s.mesh.visible = true;
         s.dirSign.value = -1;
+        // from a hold it only has part of the way to go: keep the same speed
         return runProgress(target, s.field, 0, {
-            duration: Number(p.duration), ease: 'power1.out',
+            duration: Number(p.duration) * Math.min(1, Math.max(0.1, s.field.progress.value / (1 + LIFE))), ease: s.keep.value ? 'none' : 'power1.out',
             onComplete: () => {
                 s.mats.forEach(m => removeLayer(m, KEY));
                 disposeFxInstances(s.mesh);

package/dist/operations/catalogue/inkBloom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inkBloom.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/inkBloom.ts"],"names":[],"mappings":";AAmDA,wBA4GG"}
+{"version":3,"file":"inkBloom.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/inkBloom.ts"],"names":[],"mappings":";AA4EA,wBAyHG"}

package/dist/operations/catalogue/inkBloom.js

@@ -4,10 +4,12 @@
 // so the ink reads as clean curling threads that fray, sink and thin out, not
 // as soft blobs. Normal blending (dark on light), so it works on light scenes.
 // Reverting draws the ink back into the object.
+// With Disappear off (an object effect's default) the object stays stained with ink,
+// filaments hanging in the water around it, swaying but never thinning out.
 import { BufferAttribute, BufferGeometry, LineSegments, NormalBlending, ShaderMaterial } from 'three';
 import { defineOperation } from '../types.js';
 import { addLayer, forEachMeshMaterial, removeLayer, uniformDecl } from './shaderLayers.js';
-import { DIRECTION_OPTIONS, createFieldState, fieldGlsl, fieldUniforms, hideMeshes, runProgress, setFieldParams, surfaceLayer, } from './transitionField.js';
+import { DIRECTION_OPTIONS, createFieldState, fieldGlsl, fieldUniforms, hideMeshes, runProgress, setFieldParams, setReveal, surfaceLayer, } from './transitionField.js';
 import { sampleSurfaceCached } from './surfaceSample.js';
 import { hideUntilWarm } from './warmup.js';
 const P = 'Ink';
@@ -16,6 +18,28 @@ const STATE = '__opInk';
 const LIFE = 0.9;
 /** Points per filament (its trail through the water). */
 const TRAIL = 12;
+/** Keep: a wisp hangs this far along its path. */
+const KEEP_AGE = 0.35;
+/** The surface: stained along the front and gone behind it — or, keeping, stained all over and staying. */
+function inkLayer(field, mixC, keep) {
+    const base = surfaceLayer(P, field, 'stain');
+    return {
+        ...base,
+        uniforms: { ...base.uniforms, uInkMix: mixC, uInkKeep: keep },
+        fragment: /* glsl */ `
+        if (uInkKeep > 0.5) {
+          float InkD = InkField(vInkQ) - InkThreshold();
+          float stained = smoothstep(0.0, uInkEdgeWidth, -InkD);
+          // painting the object in: nothing ahead of the front, full ink right behind it
+          if (uInkReveal > 0.5) { if (InkD > 0.0) discard; stained = 1.0; }
+          // ink: a slow swirl of slightly lighter ink moving through it
+          float swirl = 0.8 + 0.4 * fxNoise(vInkQ * 5.0 + vec3(uInkTime * 0.12, -uInkTime * 0.08, 0.0));
+          vec3 ink = mix(uInkEdgeColor, outgoingLight, uInkMix) * swirl;
+          outgoingLight = mix(outgoingLight, ink, stained);
+        } else {${base.fragment}
+        }`,
+    };
+}
 function buildFilaments(target, count) {
     const s = sampleSurfaceCached(target, count, 29);
     const segs = TRAIL - 1;
@@ -45,18 +69,21 @@ function buildFilaments(target, count) {
 export default defineOperation({
     value: 'inkBloom',
     label: 'Ink bloom',
-    description: 'Bleed the targets into fine curling ink filaments, like a drop in water — reverting draws the ink back in',
+    description: 'Bleed the targets into fine curling ink filaments, like a drop in water (or, Disappear off, keep them inked) — reverting draws the ink back in',
     channel: 'visual',
     multi: true,
     toggles: true,
-    usableIn: ['interaction', 'action'],
+    usableIn: ['interaction', 'action', 'object'],
+    objectParams: { disappear: false },
+    presence: 'paint',
     params: {
         direction: { type: 'select', label: 'Direction', default: 'noise', options: DIRECTION_OPTIONS },
+        disappear: { type: 'boolean', label: 'Disappear', default: true, hint: 'Off: the object stays inked, filaments hanging around it' },
         edgeColor: { type: 'color', label: 'Ink colour', default: '#16203a' },
         tint: { type: 'number', label: 'Object colour', default: 0.15, min: 0, max: 1, step: 0.05, hint: 'How much of the object’s own colour the ink keeps' },
         filaments: { type: 'number', label: 'Filaments', default: 9000, min: 1000, max: 40000, step: 500 },
         opacity: { type: 'number', label: 'Density', default: 0.55, min: 0.05, max: 1, step: 0.05 },
-        sink: { type: 'number', label: 'Sink', default: 1, min: -2, max: 3, step: 0.05, unit: '×', hint: 'Negative rises like smoke' },
+        sink: { type: 'number', label: 'Sink', default: 1, min: -2, max: 3, step: 0.05, unit: '×', hint: 'Negative rises like smoke', showWhen: { disappear: ['true'] } },
         scale: { type: 'number', label: 'Pattern', default: 2.5, min: 0.5, max: 12, step: 0.1 },
         duration: { type: 'number', label: 'Duration', default: 3.6, min: 0.3, max: 14, step: 0.1, unit: 's' },
     },
@@ -65,8 +92,8 @@ export default defineOperation({
         if (!st) {
             const field = createFieldState(target);
             field.edgeWidth.value = 0.12;
-            const mixC = { value: 0.15 }, sink = { value: 1 }, opacity = { value: 0.55 };
-            const uniforms = { ...fieldUniforms(P, field), uInkMix: mixC, uInkSink: sink, uInkOpacity: opacity };
+            const mixC = { value: 0.15 }, sink = { value: 1 }, opacity = { value: 0.55 }, keep = { value: 0 };
+            const uniforms = { ...fieldUniforms(P, field), uInkMix: mixC, uInkSink: sink, uInkOpacity: opacity, uInkKeep: keep };
             const decl = Object.keys(uniforms).map(n => uniformDecl(n, uniforms[n].value)).join('\n');
             const mat = new ShaderMaterial({
                 uniforms: uniforms,
@@ -88,6 +115,8 @@ vec3 inkAt(vec3 p0, vec3 n0, vec4 r, float a) {
 void main() {
   float birth = InkBirthOf(InkField(InkNorm(position)));
   float a = (uInkProgress - birth) / ${LIFE.toFixed(2)};
+  // keep: the wisp hangs part-way along its path, swaying along it
+  a = mix(a, min(a, ${KEEP_AGE} * (0.92 + 0.08 * sin(uInkTime * 0.7 + aR.w * 6.2832))), uInkKeep);
   // the trail: this vertex sits a little back along the wisp's own path
   float trail = 0.22 * (0.6 + 0.8 * aR.w);
   float ak = clamp(a - aK * trail, 0.0, 1.0);
@@ -114,9 +143,9 @@ void main() {
             lines.renderOrder = 10;
             target.add(lines);
             hideUntilWarm(lines);
-            st = { field, mixC, sink, opacity, lines, mats: new Set() };
+            st = { field, mixC, sink, opacity, keep, lines, mats: new Set() };
             const own = st;
-            const layer = surfaceLayer(P, field, 'stain');
+            const layer = inkLayer(field, mixC, keep);
             forEachMeshMaterial(target, (m, mesh) => {
                 if (mesh.userData?.__opFxHelper)
                     return;
@@ -131,6 +160,12 @@ void main() {
         s.sink.value = Number(p.sink);
         s.opacity.value = Number(p.opacity);
         s.lines.visible = true;
+        s.keep.value = p.disappear === false ? 1 : 0;
+        hideMeshes(target, KEY, false);
+        if (s.keep.value) {
+            // keep: the ink spreads over the whole object (0 → 1) and holds
+            return runProgress(target, s.field, 1, { duration: Number(p.duration) / (1 + LIFE), ease: 'none', hold: true });
+        }
         return runProgress(target, s.field, 1 + LIFE, {
             duration: Number(p.duration), ease: 'none',
             onComplete: () => { hideMeshes(target, KEY, true); s.lines.visible = false; },
@@ -141,9 +176,11 @@ void main() {
         if (!s)
             return;
         hideMeshes(target, KEY, false);
+        setReveal(s.field, p);
         s.lines.visible = true;
+        // from a hold it only has part of the way to go: keep the same speed
         return runProgress(target, s.field, 0, {
-            duration: Number(p.duration), ease: 'none',
+            duration: Number(p.duration) * Math.min(1, Math.max(0.1, s.field.progress.value / (1 + LIFE))), ease: 'none',
             onComplete: () => {
                 s.mats.forEach(m => removeLayer(m, KEY));
                 s.lines.removeFromParent();

package/dist/operations/catalogue/liquidMetal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"liquidMetal.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/liquidMetal.ts"],"names":[],"mappings":";AA6EA,wBA8CG"}
+{"version":3,"file":"liquidMetal.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/liquidMetal.ts"],"names":[],"mappings":";AAgGA,wBAwDG"}

package/dist/operations/catalogue/liquidMetal.js

@@ -2,6 +2,9 @@
 // from the top down and flows out into a puddle on the ground (higher parts
 // travel further), with slow ripples running across the pool while it lies
 // there. Reverting pulls it back up into shape and the chrome fades off.
+// With Disappear off (an object effect's default) the object turns to chrome and
+// stays, unmelted: the studio reflection turns slowly, a soft ripple runs over it.
+// The chrome comes in along a front (Direction) so it can paint the object in.
 //
 // The chrome is a procedural studio environment (sky gradient, horizon band,
 // two soft boxes) reflected about the surface normal, so it reads as metal in
@@ -11,22 +14,25 @@ import { gsap } from 'gsap';
 import { Color } from 'three';
 import { defineOperation } from '../types.js';
 import { addLayer, forEachMeshMaterial, removeLayer } from './shaderLayers.js';
-import { createFieldState, fieldGlsl, fieldUniforms, runProgress, syncRoot } from './transitionField.js';
+import { DIRECTION_OPTIONS, createFieldState, fieldGlsl, fieldUniforms, runProgress, setFieldParams, setReveal, syncRoot } from './transitionField.js';
 const P = 'Liq';
 const KEY = 'liquidMetal';
 const STATE = '__opLiquid';
+/** The chrome comes in over this much of the progress; the melt runs after it. */
+const CHROME = 0.2;
 function layerFor(st) {
     return {
-        uniforms: { ...fieldUniforms(P, st.field), uLiqTint: st.tint, uLiqSpread: st.spread },
-        common: `varying float vLiqM;\nvarying vec3 vLiqView;\n${fieldGlsl(P)}`,
+        uniforms: { ...fieldUniforms(P, st.field), uLiqTint: st.tint, uLiqSpread: st.spread, uLiqKeep: st.keep },
+        common: `varying float vLiqM;\nvarying vec3 vLiqView;\nvarying vec3 vLiqQ;\n${fieldGlsl(P)}`,
         vertex: /* glsl */ `
         {
           mat4 toRoot = uLiqRootInv * modelMatrix;
           vec3 rl = (toRoot * vec4(transformed, 1.0)).xyz;
           vec3 q = LiqNorm(rl);
+          vLiqQ = q;
           float E = uLiqExtent;
-          // melt runs after the chrome has come in; the top gives way first
-          float mp = clamp((uLiqProgress - 0.18) / 0.82, 0.0, 1.0);
+          // melt runs after the chrome has come in; the top gives way first (never in keep)
+          float mp = clamp((uLiqProgress - 0.18) / 0.82, 0.0, 1.0) * (1.0 - uLiqKeep);
           float wob = 0.12 * (fxNoise(q * 4.0) - 0.5);
           float m = clamp(mp * 1.3 - (1.0 - q.y) * 0.3 + wob, 0.0, 1.0);
           m = m * m;   // slow start: it sags before it runs
@@ -48,7 +54,13 @@ function layerFor(st) {
         }`,
         fragment: /* glsl */ `
         {
-          float chrome = smoothstep(0.0, 0.2, uLiqProgress);
+          // the chrome comes in along a front over the first part of the progress
+          float tc = clamp(uLiqProgress / ${CHROME}, 0.0, 1.0) * (1.0 + 2.0 * uLiqEdgeWidth) - uLiqEdgeWidth;
+          float d = LiqField(vLiqQ) - tc;
+          float chrome = smoothstep(0.0, 0.08, -d);
+          // painting the object in: nothing ahead of the front, full chrome right behind it
+          if (uLiqReveal > 0.5) { if (d > 0.0) discard; chrome = 1.0; }
+          float held = uLiqKeep * step(0.9999, uLiqProgress);
           vec3 nv = normalize(cross(dFdx(vLiqView), dFdy(vLiqView)));
           #if defined( STANDARD ) || defined( PHONG ) || defined( LAMBERT ) || defined( TOON )
             vec3 n = normalize(mix(normal, nv, smoothstep(0.05, 0.5, vLiqM)));
@@ -56,8 +68,12 @@ function layerFor(st) {
             vec3 n = nv;
           #endif
           vec3 v = normalize(vLiqView);
+          // holding as chrome: a soft ripple runs over the surface, the studio turns slowly
+          n = normalize(n + held * 0.04 * vec3(sin(vLiqQ.y * 22.0 - uLiqTime * 1.6), 0.0, cos(vLiqQ.x * 19.0 - uLiqTime * 1.3)));
           vec3 rv = reflect(v, n);
           vec3 rw = normalize((vec4(rv, 0.0) * viewMatrix).xyz);   // view → world direction
+          float ra = held * uLiqTime * 0.25;
+          rw = vec3(rw.x * cos(ra) - rw.z * sin(ra), rw.y, rw.x * sin(ra) + rw.z * cos(ra));
           // studio: dark floor, bright sky, a crisp horizon band and two soft boxes
           float up = rw.y;
           vec3 env = mix(vec3(0.05), vec3(0.85, 0.9, 1.0), smoothstep(-0.15, 0.6, up));
@@ -66,6 +82,8 @@ function layerFor(st) {
           env += vec3(1.2) * smoothstep(0.9, 0.98, dot(rw, normalize(vec3(-0.7, 0.35, -0.3))));
           float fres = 0.65 + 0.35 * pow(1.0 - abs(dot(n, -v)), 3.0);
           vec3 metal = uLiqTint * env * fres;
+          // a bright lip right at the front
+          metal *= 1.0 + 1.5 * (1.0 - smoothstep(0.0, 0.05, abs(d))) * step(0.0001, uLiqProgress) * step(uLiqProgress, ${CHROME} - 0.0001);
           outgoingLight = mix(outgoingLight, metal, chrome);
         }`,
     };
@@ -73,21 +91,26 @@ function layerFor(st) {
 export default defineOperation({
     value: 'liquidMetal',
     label: 'Liquid metal',
-    description: 'Turn the targets to chrome and melt them into a rippling pool — reverting pulls them back into shape',
+    description: 'Turn the targets to chrome and melt them into a rippling pool (or, Disappear off, keep them as chrome) — reverting pulls them back into shape',
     channel: 'visual',
     multi: true,
     toggles: true,
-    usableIn: ['interaction', 'action'],
+    usableIn: ['interaction', 'action', 'object'],
+    objectParams: { disappear: false },
+    presence: 'paint',
     params: {
+        direction: { type: 'select', label: 'Direction', default: 'up', options: DIRECTION_OPTIONS, hint: 'How the chrome comes in' },
         tint: { type: 'color', label: 'Metal', default: '#dfe7ee' },
-        spread: { type: 'number', label: 'Pool size', default: 1, min: 0.2, max: 3, step: 0.05, unit: '×' },
+        disappear: { type: 'boolean', label: 'Disappear', default: true, hint: 'Off: the object turns to chrome and stays' },
+        spread: { type: 'number', label: 'Pool size', default: 1, min: 0.2, max: 3, step: 0.05, unit: '×', showWhen: { disappear: ['true'] } },
         duration: { type: 'number', label: 'Duration', default: 3.4, min: 0.3, max: 12, step: 0.1, unit: 's' },
     },
-    apply(target, p) {
+    apply(target, p, ctx) {
         let st = target.userData[STATE];
         if (!st) {
             const field = createFieldState(target);
-            const own = { field, tint: { value: new Color() }, spread: { value: 1 }, mats: new Set() };
+            field.edgeWidth.value = 0.04;
+            const own = { field, tint: { value: new Color() }, spread: { value: 1 }, keep: { value: 0 }, mats: new Set() };
             // ripples keep moving while it lies melted
             own.tick = () => { own.field.time.value += gsap.ticker.deltaRatio() / 60; syncRoot(target, own.field); };
             const layer = layerFor(own);
@@ -102,16 +125,22 @@ export default defineOperation({
             target.userData[STATE] = st;
         }
         const s = st;
+        setFieldParams(s.field, p, target, ctx);
         s.tint.value.set(String(p.tint));
         s.spread.value = Number(p.spread);
+        s.keep.value = p.disappear === false ? 1 : 0;
+        // keep: only the chrome comes in (the melt is off), then it holds — its own ticker keeps the time running
+        if (s.keep.value)
+            return runProgress(target, s.field, 1, { duration: Number(p.duration) * CHROME * 1.5, ease: 'none', clock: false });
         return runProgress(target, s.field, 1, { duration: Number(p.duration), ease: 'power1.inOut', clock: false });
     },
     revert(target, p) {
         const s = target.userData[STATE];
         if (!s)
             return;
+        setReveal(s.field, p);
         return runProgress(target, s.field, 0, {
-            duration: Number(p.duration), ease: 'power1.inOut', clock: false,
+            duration: Number(p.duration) * (s.keep.value ? CHROME * 1.5 : 1) * Math.min(1, Math.max(0.1, s.field.progress.value)), ease: s.keep.value ? 'none' : 'power1.inOut', clock: false,
             onComplete: () => {
                 gsap.ticker.remove(s.tick);
                 s.mats.forEach(m => removeLayer(m, KEY));

package/dist/operations/catalogue/particleSwarm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"particleSwarm.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/particleSwarm.ts"],"names":[],"mappings":";AAiCA,wBAsGG"}
+{"version":3,"file":"particleSwarm.d.ts","sourceRoot":"","sources":["../../../src/operations/catalogue/particleSwarm.ts"],"names":[],"mappings":";AAoCA,wBAwHG"}