@3driseai/3drise-viewer 0.1.18 → 0.1.20

package/dist/components/particles/GrinderSparksParticles.d.ts

@@ -1,11 +1,14 @@
 import React from 'react';
-import type { AnimationOptions, GrinderSparksParticlesConfig } from '@3driseai/3drise-core';
+import type { ObjectAnimations, GrinderSparksParticlesConfig } from '@3driseai/3drise-core';
 import type { ObjectReadyProps } from '../../types/objectReady';
 export interface GrinderSparksParticlesProps extends ObjectReadyProps {
+    /** Scene object id: the controller finds the live-edit handle by it. */
+    id?: string;
     /** World size of the object (units); the object's transform scales it further. */
     size: number;
     config: GrinderSparksParticlesConfig;
-    animations?: AnimationOptions[];
+    /** Per-domain keyframes; the `particles` domain drives this object's config knobs. */
+    animations?: ObjectAnimations;
 }
 declare const GrinderSparksParticles: React.FC<GrinderSparksParticlesProps>;
 export default GrinderSparksParticles;

package/dist/components/particles/GrinderSparksParticles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GrinderSparksParticles.d.ts","sourceRoot":"","sources":["../../../src/components/particles/GrinderSparksParticles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsD,MAAM,OAAO,CAAC;AAG3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAK5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACjE,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,4BAA4B,CAAC;IACrC,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACnC;AAspBD,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CA6BjE,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"GrinderSparksParticles.d.ts","sourceRoot":"","sources":["../../../src/components/particles/GrinderSparksParticles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmE,MAAM,OAAO,CAAC;AAIxF,OAAO,KAAK,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAM5F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACjE,wEAAwE;IACxE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,4BAA4B,CAAC;IACrC,sFAAsF;IACtF,UAAU,CAAC,EAAE,gBAAgB,CAAC;CACjC;AA8pBD,QAAA,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAiDjE,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/dist/components/particles/GrinderSparksParticles.js

@@ -1,11 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, useLayoutEffect, useMemo, useRef } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from 'react';
 import * as THREE from 'three';
 import { useFrame } from '@react-three/fiber';
-import { applyGenerativeAnimations } from '../../utils/handleGenerativeEffectsAnimations.js';
+import { GENERATIVE_PARTICLES_ANIMATABLE } from '@3driseai/3drise-core';
+import { applyConfigKeyframeAnimations } from '../../utils/configAnimations.js';
 import { createPointerUniforms, stepPointerField, usePointerField } from '../../utils/pointerField.js';
 import { createTrailUniforms, applyTrailConfig, createCpuTrail } from '../../utils/particleTrails.js';
 import { useObjectReady } from '../../hooks/useObjectReady.js';
+import { useConfigLiveHandle } from '../../hooks/useConfigLive.js';
 /**
  * Grinder Sparks — Slow-motion grinder sparks: drag-limited ballistics, radiative cooling on the blackbody scale, carbon bursts, floor bounces and reflections; the cursor moves the grinder, aims the spray or sweeps the air. Use for industrial and cinematic scenes.
  */
@@ -133,9 +135,11 @@ const SLOWMO = 0.2; // physics seconds per shown second (a high-speed camera)
 const H_STEP = 1 / 120; // shown-time step (physics step = H_STEP * SLOWMO)
 const TR = 0.006; // physics seconds per trail unit (the shutter) for streaks
 const TR_MODE = { streak: TR, comet: 0.03, echo: 0.04 }; // arcs and smoulder look back further
-const C0 = [-0.8, 0.95, 0]; // contact point at rest (m)
-const SPRAY_MID = [0.1, 0.6, 0];
-const BOUNDS = { center: [0.2, 0.7, 0], radius: 2.3 };
+// The rig is laid out so the spray (wheel on the left, sparks flying right) straddles the object origin:
+// the editor's selection box and gizmo centre on the visible spray, not on the wheel.
+const C0 = [-1.3, 0.95, 0]; // contact point at rest (m)
+const SPRAY_MID = [-0.4, 0.6, 0];
+const BOUNDS = { center: [-0.2, 0.7, 0], radius: 2.3 };
 const RHO_C = 7800 * 600; // steel density x heat capacity
 const SIGMA = 5.67e-8, EPS = 0.8, T_AIR = 300;
 const EL0 = -0.26; // rest elevation of the fan (rad)
@@ -223,7 +227,7 @@ void main() {
   vec4 mv = modelViewMatrix * vec4(p * uSize, 1.0);
   float lum = dot(L, vec3(0.3, 0.5, 0.2));
   float px = uSize * uViewH * (0.0045 + 0.004 * aD) * (1.0 + 0.8 * min(lum, 2.0)) / -mv.z;
-  ${mirror ? 'px *= 1.6; float fade = uFloorReflect * 0.45 * exp(-position.y * 1.2) * smoothstep(3.0, 1.5, length(position.xz - vec2(0.4, 0.0)));' : 'float fade = 1.0;'}
+  ${mirror ? 'px *= 1.6; float fade = uFloorReflect * 0.45 * exp(-position.y * 1.2) * smoothstep(3.0, 1.5, length(position.xz - vec2(-0.1, 0.0)));' : 'float fade = 1.0;'}
   vCol = L * uIntensity;
   vA = uOpacity * fade * step(600.0, aT);
   gl_PointSize = clamp(px, 1.0, 40.0) * step(0.001, vA);
@@ -263,7 +267,7 @@ void main() {
   float r2 = dot(d, d);
   float E = uContact.w * max(d.y, 0.0) / pow(r2 + 0.02, 1.5);
   vec3 c = blackbody(2100.0); c /= max(max(c.r, c.g), c.b);
-  float edge = smoothstep(2.8, 1.8, length(vP.xz - vec2(0.3, 0.0)));
+  float edge = smoothstep(2.8, 1.8, length(vP.xz - vec2(-0.2, 0.0)));
   vec3 rgb = c * uColor * E * 0.14 * uIntensity * edge;
   float I = max(max(rgb.r, rgb.g), rgb.b);
   if (I < 0.001) discard;
@@ -538,7 +542,7 @@ function build(u, c, size) {
             vel[j] = vx;
             vel[j + 1] = vy;
             vel[j + 2] = vz;
-            if (t < 700 || age[i] > 6 || x > 3.5 || x < -2.5 || Math.abs(z) > 3 || y > 3.5) {
+            if (t < 700 || age[i] > 6 || x > 3.0 || x < -3.0 || Math.abs(z) > 3 || y > 3.5) {
                 st[i] = 2;
                 hold[i] = 0.05;
                 T[i] = 0;
@@ -571,7 +575,7 @@ function build(u, c, size) {
     mirror.frustumCulled = false;
     const fgeo = new THREE.CircleGeometry(2.8, 64);
     fgeo.rotateX(-Math.PI / 2);
-    fgeo.translate(0.3, 0.002, 0);
+    fgeo.translate(-0.2, 0.002, 0);
     const fmat = new THREE.ShaderMaterial({
         uniforms: u, vertexShader: floorVertex, fragmentShader: floorFragment,
         transparent: true, depthWrite: false, blending: THREE.AdditiveBlending,
@@ -718,9 +722,12 @@ const DEFAULTS = {
     trailColor: '#ff7a2e',
     trailShare: 1,
 };
-const GrinderSparksParticles = ({ size, config, animations, onObjectReady, onObjectDispose }) => {
+/** Knobs that rebuild the simulation: they change on commit, never through the live path. */
+const STRUCTURAL = ['particleCount', 'seed', 'quality'];
+/** Knobs an animation (or mouse move) may drive per frame — generated from applyConfig. */
+const ANIMATABLE = new Set(GENERATIVE_PARTICLES_ANIMATABLE.grinderSparks.map((p) => p.value));
+const GrinderSparksParticles = ({ id, size, config, animations, onObjectReady, onObjectDispose }) => {
     const rootRef = useRef(null);
-    const animCache = useRef({});
     useObjectReady(rootRef, config, onObjectReady, onObjectDispose);
     const s = size > 0 ? size : 1;
     const cfg = useMemo(() => ({ ...DEFAULTS, ...config }), [config]);
@@ -733,11 +740,28 @@ const GrinderSparksParticles = ({ size, config, animations, onObjectReady, onObj
         applyConfig(uniforms, cfg, s);
         instance.apply(cfg);
     }, [instance, uniforms, cfg, s]);
+    // Slider drags and keyframe animations are both overrides on the committed config.
+    // This is the one place they are merged and pushed, so they compose instead of
+    // overwriting each other; the animation wins, because it is the active driver.
+    const keyframes = animations?.particles?.animations;
+    const animOverride = useRef({});
+    const animFrom = useRef({});
+    const animStart = useRef(0);
+    // Editing a keyframe restarts its cycle rather than dropping the user mid-way.
+    useEffect(() => { animStart.current = performance.now(); animFrom.current = {}; }, [keyframes]);
+    const push = useCallback((overrides) => {
+        const merged = { ...cfg, ...overrides, ...animOverride.current };
+        const z = merged.size;
+        applyConfig(uniforms, merged, z && z > 0 ? z : s);
+    }, [cfg, uniforms, s]);
+    const live = useConfigLiveHandle(rootRef, id, 'particles', cfg, STRUCTURAL, push);
     const pointer = usePointerField();
     useFrame((state, delta) => {
         instance.update(Math.min(delta, 0.1), state.camera, pointer);
-        if (animations?.length)
-            applyGenerativeAnimations(instance.materials, animations, animCache.current, Date.now(), false);
+        if (keyframes?.length) {
+            applyConfigKeyframeAnimations(keyframes, animFrom.current, cfg, animOverride.current, performance.now() - animStart.current, ANIMATABLE);
+            push(live.current);
+        }
     });
     return (_jsx("group", { ref: rootRef, children: _jsx("primitive", { object: instance.object }) }));
 };

package/dist/components/particles/NeonRainParticles.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import type { ObjectAnimations, NeonRainParticlesConfig } from '@3driseai/3drise-core';
+import type { ObjectReadyProps } from '../../types/objectReady';
+export interface NeonRainParticlesProps extends ObjectReadyProps {
+    /** Scene object id: the controller finds the live-edit handle by it. */
+    id?: string;
+    /** World size of the object (units); the object's transform scales it further. */
+    size: number;
+    config: NeonRainParticlesConfig;
+    /** Per-domain keyframes; the `particles` domain drives this object's config knobs. */
+    animations?: ObjectAnimations;
+}
+declare const NeonRainParticles: React.FC<NeonRainParticlesProps>;
+export default NeonRainParticles;
+//# sourceMappingURL=NeonRainParticles.d.ts.map

package/dist/components/particles/NeonRainParticles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NeonRainParticles.d.ts","sourceRoot":"","sources":["../../../src/components/particles/NeonRainParticles.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmE,MAAM,OAAO,CAAC;AAIxF,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAMvF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC5D,wEAAwE;IACxE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,uBAAuB,CAAC;IAChC,sFAAsF;IACtF,UAAU,CAAC,EAAE,gBAAgB,CAAC;CACjC;AAinBD,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAiDvD,CAAC;AAEF,eAAe,iBAAiB,CAAC"}