@3driseai/3drise-viewer 0.1.6 → 0.1.7

package/dist/components/CustomPrimitive.js

@@ -76,7 +76,7 @@ const CustomPrimitive = memo(({ createdObject, onObjectReady, onObjectDispose, h
     //   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 } }) }, createdObject.id);
+        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);
     if (!resolvedObject) {
         return null;
     }

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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"}

package/dist/components/GeometryShape.js

@@ -2,9 +2,16 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef } from 'react';
 import { useObjectReady } from '../hooks/useObjectReady.js';
 import { EdgesGeometry, WireframeGeometry, Mesh, MeshBasicMaterial, Raycaster, Vector3, DoubleSide, } from 'three';
-import { Line } from '@react-three/drei';
+import { buildSegmentQuadGeometry } from '@3driseai/3drise-core';
 import { shapeGenerators } from '../utils/shapes.js';
 import PointCloud from './PointCloud.js';
+/**
+ * World-space half-thickness of a line ribbon at `lineWidth: 1`. Line modes are
+ * built as quad meshes rather than line primitives so that materials apply to
+ * them — see buildSegmentQuadGeometry — which means width is a world unit here,
+ * not a screen-space pixel count. Matches the edges builder's default.
+ */
+const LINE_THICKNESS_UNIT = 0.008;
 const defaultModeConfig = {
     mode: 'solid',
     count: 1000,
@@ -312,13 +319,22 @@ export function GeometryMesh({ config, materialSettings, animations, modeConfig
     const geometry = useShapeGeometry(config);
     const safeModeConfig = normalizeModeConfig(modeConfig);
     const data = useModeData(geometry, safeModeConfig);
+    // Line modes are ribbons of quads, not line primitives, so the material
+    // system reaches them the same way it reaches edges. Built before the
+    // branches below because hooks cannot run conditionally.
+    const lineSegments = data.kind === 'lines' ? data.points : data.kind === 'plexus' ? data.segments : null;
+    const lineThickness = (safeModeConfig.lineWidth ?? 1) * LINE_THICKNESS_UNIT;
+    const lineGeometry = useMemo(() => (lineSegments && lineSegments.length
+        ? buildSegmentQuadGeometry(lineSegments, lineThickness)
+        : null), [lineSegments, lineThickness]);
+    useEffect(() => () => { lineGeometry?.dispose(); }, [lineGeometry]);
     // if (data.kind === 'points') return <PointCloud positions={data.positions} color={color} size={modeConfig.mode === 'vertices' ? 0.035 : 0.02} />;
     if (data.kind === 'points')
         return _jsx(PointCloud, { positions: data.positions, animations: animations, materialSettings: materialSettings, onObjectReady: reportReady, onObjectDispose: reportDispose });
     if (data.kind === 'lines')
-        return data.points.length ? _jsx(Line, { ref: rootRef, points: data.points, segments: true, color: color, lineWidth: safeModeConfig.lineWidth }) : null;
+        return lineGeometry ? (_jsx("mesh", { ref: rootRef, geometry: lineGeometry, children: children ?? _jsx("meshBasicMaterial", { color: color, side: DoubleSide }) })) : null;
     if (data.kind === 'plexus')
-        return (_jsxs("group", { ref: rootRef, children: [_jsx(PointCloud, { positions: data.positions, animations: animations, materialSettings: materialSettings }), data.segments.length > 0 && _jsx(Line, { points: data.segments, segments: true, color: color, lineWidth: safeModeConfig.lineWidth, transparent: true, opacity: 0.45 })] }));
+        return (_jsxs("group", { ref: rootRef, children: [_jsx(PointCloud, { positions: data.positions, animations: animations, materialSettings: materialSettings }), lineGeometry && (_jsx("mesh", { geometry: lineGeometry, children: children ?? _jsx("meshBasicMaterial", { color: color, side: DoubleSide, transparent: true, opacity: 0.45 }) }))] }));
     return (_jsx("mesh", { ref: rootRef, geometry: geometry, children: children ?? _jsx("meshPhongMaterial", { color: color, side: DoubleSide }) }));
 }
 export function FitGroup({ geometry, radius = 1.7, children }) {

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

@@ -1 +1 @@
-{"version":3,"file":"ObjectNode.d.ts","sourceRoot":"","sources":["../../src/components/ObjectNode.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAe,qBAAqB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,KAAK,eAAe,GAAG,gBAAgB,GAAG;IACtC,IAAI,EAAE,cAAc,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC7G,CAAC;AA0BF,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAyGzC,CAAC;AACF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"ObjectNode.d.ts","sourceRoot":"","sources":["../../src/components/ObjectNode.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,KAAK,EAAe,qBAAqB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,KAAK,eAAe,GAAG,gBAAgB,GAAG;IACtC,IAAI,EAAE,cAAc,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;CAC7G,CAAC;AAgBF,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAyGzC,CAAC;AACF,eAAe,UAAU,CAAC"}

package/dist/components/ObjectNode.js

@@ -13,15 +13,7 @@ import LightObject from "./LightObject.js";
 import EnvironmentObject from "./EnvironmentObject.js";
 import Galaxy from "./Galaxy.js";
 import GridGenerator from "./GridsGenerator.js";
-const SELF_MANAGED_MATERIAL = new Set([
-    'effect',
-    // 'gallery',
-    'earth',
-    'space',
-    'shootingStars',
-    'grid',
-    // 'moon'
-]);
+import { SELF_MANAGED_MATERIAL } from "../constants.js";
 // const EffectsLayer: React.FC<{ effects: CreatedObjectSettings['effects'] }> = ({ effects }) =>
 //     effects?.length ? (
 //         <>

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

@@ -1 +1 @@
-{"version":3,"file":"ParticlesR3f.d.ts","sourceRoot":"","sources":["../../src/components/ParticlesR3f.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAO7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,iBAAkB,SAAQ,gBAAgB;IAChD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChD;AAMD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAkG7C,CAAC;AACF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"ParticlesR3f.d.ts","sourceRoot":"","sources":["../../src/components/ParticlesR3f.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAO7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG/D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,iBAAkB,SAAQ,gBAAgB;IAChD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChD;AAMD,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAoJ7C,CAAC;AACF,eAAe,YAAY,CAAC"}

package/dist/components/ParticlesR3f.js

@@ -5,8 +5,9 @@ import { useFrame } from '@react-three/fiber';
 import { useParticlePositions } from '../hooks/useParticlePositions.js';
 import { useParticlesColors } from '../hooks/useParticlesColors.js';
 import { useParticlesTextures } from '../hooks/useParticlesTextures.js';
-import { handleShapeAnimation, buildShaderEffectsMaterial, structureKey } from '@3driseai/3drise-core';
+import { handleShapeAnimation, buildShaderEffectsMaterial, structureKey, SELF_OWNED_MATERIAL_KEY, applyVertexEffects, partitionShaderEffects, LOCAL_POINTER_SCALE } from '@3driseai/3drise-core';
 import { update3driseShaderUniforms } from '../hooks/use3driseShader.js';
+import { ownsShaderEffectsMaterial } from '../utils/pointsMaterialOwnership.js';
 function normalizeEffects(raw) {
     return Array.isArray(raw) ? raw : [];
 }
@@ -71,42 +72,92 @@ const ParticlesR3f = ({ particlesSettings, duration = 1, transitionSettings, onO
     const activeEffects = useMemo(() => normalizeEffects(particlesSettings.animations?.material?.shaderEffects), [particlesSettings.animations?.material?.shaderEffects]);
     const pointerRadius = particlesSettings.animations?.material
         ?.shaderEffectsPointerRadius ?? 0.4;
-    const effectsKey = useMemo(() => structureKey(activeEffects), [activeEffects]);
-    const material = useMemo(() => buildShaderEffectsMaterial({
-        effects: activeEffects,
+    // Position effects displace the geometry from the CPU and leave `.material`
+    // alone, so they compose with any material. Only the rest still need the
+    // shader shell — and only the shell takes ownership of `.material`.
+    const { position: positionEffects, shell: shellEffects } = useMemo(() => partitionShaderEffects(activeEffects), [activeEffects]);
+    const hasPositionEffects = positionEffects.some(effect => effect.enabled);
+    const effectsKey = useMemo(() => structureKey(shellEffects), [shellEffects]);
+    const ownsMaterial = ownsShaderEffectsMaterial(particlesSettings.materialSettings, shellEffects);
+    const material = useMemo(() => ownsMaterial ? buildShaderEffectsMaterial({
+        effects: shellEffects,
         initialColor: color,
         initialOpacity: opacity,
         initialPointSize: pointSize,
         initialParticleUVScale: particleUVScale,
         initialPointerEffectRadius: pointerRadius,
-    }), 
+    }) : null, 
     // Rebuild when the structural set of effects changes; not on parameter tweaks.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [effectsKey]);
+    [effectsKey, ownsMaterial]);
+    // With position effects on, the attribute gets its own buffer: the shape
+    // animation writes this frame's morph into it, and the effects displace from
+    // a snapshot of that into the same buffer. Without a separate buffer the
+    // shape animation would read back its own displaced output next frame.
+    const displayPositions = useMemo(() => (hasPositionEffects && basePositions.current
+        ? new Float32Array(basePositions.current)
+        : basePositions.current), [hasPositionEffects, basePositions.current]);
+    const frameBaseRef = useRef(null);
     useEffect(() => {
         materialRef.current = material;
         return () => {
-            material.dispose();
+            material?.dispose();
         };
     }, [material]);
+    // Tell useMaterialApplication's traversal to leave this object alone while we
+    // own its material. Set imperatively rather than through a `userData` prop:
+    // R3F replaces the whole object on every render, which would wipe the
+    // applyTexture handle stashed above.
+    useEffect(() => {
+        const points = pointsRef.current;
+        if (!points)
+            return;
+        points.userData[SELF_OWNED_MATERIAL_KEY] = ownsMaterial;
+        return () => {
+            if (points.userData)
+                delete points.userData[SELF_OWNED_MATERIAL_KEY];
+        };
+    }, [ownsMaterial]);
     useFrame((state, delta) => {
-        const mat = materialRef.current;
-        if (!mat || !pointsRef.current || !basePositions.current)
+        if (!pointsRef.current || !basePositions.current)
             return;
+        const mat = materialRef.current;
         if (meshSettings.visible) {
+            // Geometry animation is independent of who owns the material.
             handleShapeAnimation(delta, speed, animationProgress, pointsRef, basePositions, targetPositions);
-            handleColorsAnimation(materialRef, delta, speed);
+            if (mat)
+                handleColorsAnimation(materialRef, delta, speed);
         }
+        if (hasPositionEffects && displayPositions && displayPositions !== basePositions.current) {
+            if (!frameBaseRef.current || frameBaseRef.current.length !== displayPositions.length)
+                frameBaseRef.current = new Float32Array(displayPositions.length);
+            // Snapshot the shape-animated positions as this frame's baseline so
+            // the effects do not compound over time.
+            frameBaseRef.current.set(displayPositions);
+            const moved = applyVertexEffects(frameBaseRef.current, displayPositions, positionEffects, {
+                time: state.clock.getElapsedTime(),
+                pointerX: state.pointer.x * LOCAL_POINTER_SCALE,
+                pointerY: state.pointer.y * LOCAL_POINTER_SCALE,
+                pointerRadius: pointerRadius * LOCAL_POINTER_SCALE,
+            });
+            if (moved) {
+                const attribute = pointsRef.current.geometry?.attributes?.position;
+                if (attribute)
+                    attribute.needsUpdate = true;
+            }
+        }
+        if (!mat)
+            return;
         if (prevTexture.current)
             mat.uniforms.uTexture.value = prevTexture.current;
         if (currentTexture.current)
             mat.uniforms.uTargetTexture.value = currentTexture.current;
         mat.uniforms.uHasTexture.value = !!currentTexture.current;
         handleTextureAnimation(materialRef, delta, speed);
-        update3driseShaderUniforms(mat.uniforms, activeEffects, state.clock.getElapsedTime(), { x: state.pointer.x, y: state.pointer.y }, { pointerRadius });
+        update3driseShaderUniforms(mat.uniforms, shellEffects, state.clock.getElapsedTime(), { x: state.pointer.x, y: state.pointer.y }, { pointerRadius });
     });
     if (!basePositions.current)
         return null;
-    return (_jsxs("points", { name: name, ref: pointsRef, raycast: () => null, position: [0, 0, 0], rotation: [0, 0, 0], scale: [1, 1, 1], children: [_jsxs("bufferGeometry", { children: [_jsx("bufferAttribute", { attach: "attributes-position", count: basePositions.current.length / 3, array: basePositions.current, itemSize: 3, args: [basePositions.current, 3] }), uvs && (_jsx("bufferAttribute", { attach: "attributes-aUV", count: uvs.length / 2, array: uvs, itemSize: 2, args: [uvs, 2] }))] }), _jsx("primitive", { object: material, attach: "material" })] }));
+    return (_jsxs("points", { name: name, ref: pointsRef, raycast: () => null, position: [0, 0, 0], rotation: [0, 0, 0], scale: [1, 1, 1], children: [_jsxs("bufferGeometry", { children: [_jsx("bufferAttribute", { attach: "attributes-position", count: (displayPositions ?? basePositions.current).length / 3, array: displayPositions ?? basePositions.current, itemSize: 3, args: [displayPositions ?? basePositions.current, 3] }), uvs && (_jsx("bufferAttribute", { attach: "attributes-aUV", count: uvs.length / 2, array: uvs, itemSize: 2, args: [uvs, 2] }))] }), material && _jsx("primitive", { object: material, attach: "material" })] }));
 };
 export default ParticlesR3f;

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

@@ -1 +1 @@
-{"version":3,"file":"PointCloud.d.ts","sourceRoot":"","sources":["../../src/components/PointCloud.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAM7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,eAAgB,SAAQ,gBAAgB;IAC9C,SAAS,EAAE,YAAY,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CACjC;AAyBD,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAmFzC,CAAC;AACF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"PointCloud.d.ts","sourceRoot":"","sources":["../../src/components/PointCloud.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAO7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,UAAU,eAAgB,SAAQ,gBAAgB;IAC9C,SAAS,EAAE,YAAY,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CACjC;AAyBD,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA0HzC,CAAC;AACF,eAAe,UAAU,CAAC"}

package/dist/components/PointCloud.js

@@ -4,7 +4,8 @@ import { useEffect, useMemo, useRef } from 'react';
 import { useFrame } from '@react-three/fiber';
 import { useParticlesColors } from '../hooks/useParticlesColors.js';
 import { useParticlesTextures } from '../hooks/useParticlesTextures.js';
-import { buildShaderEffectsMaterial, structureKey } from '@3driseai/3drise-core';
+import { buildShaderEffectsMaterial, structureKey, SELF_OWNED_MATERIAL_KEY, applyVertexEffects, partitionShaderEffects, LOCAL_POINTER_SCALE } from '@3driseai/3drise-core';
+import { ownsShaderEffectsMaterial } from '../utils/pointsMaterialOwnership.js';
 import { update3driseShaderUniforms } from '../hooks/use3driseShader.js';
 function normalizeEffects(raw) {
     return Array.isArray(raw) ? raw : [];
@@ -77,27 +78,66 @@ const PointCloud = ({ positions, materialSettings, animations, onObjectReady, on
     const activeEffects = useMemo(() => normalizeEffects(animations?.material?.shaderEffects), [animations?.material?.shaderEffects]);
     const pointerRadius = animations?.material
         ?.shaderEffectsPointerRadius ?? 0.4;
-    const effectsKey = useMemo(() => structureKey(activeEffects), [activeEffects]);
-    const material = useMemo(() => buildShaderEffectsMaterial({
-        effects: activeEffects,
+    // Position effects displace the geometry from the CPU and leave `.material`
+    // alone, so they compose with any material. Only the rest still need the
+    // shader shell — and only the shell takes ownership of `.material`.
+    const { position: positionEffects, shell: shellEffects } = useMemo(() => partitionShaderEffects(activeEffects), [activeEffects]);
+    const hasPositionEffects = positionEffects.some(effect => effect.enabled);
+    const effectsKey = useMemo(() => structureKey(shellEffects), [shellEffects]);
+    const ownsMaterial = ownsShaderEffectsMaterial(materialSettings, shellEffects);
+    // A separate buffer to displace into, so `positions` stays the authored
+    // baseline and effects never accumulate frame over frame.
+    const displayPositions = useMemo(() => (hasPositionEffects && positions ? new Float32Array(positions) : positions), [positions, hasPositionEffects]);
+    const material = useMemo(() => ownsMaterial ? buildShaderEffectsMaterial({
+        effects: shellEffects,
         initialColor: color,
         initialOpacity: opacity,
         initialPointSize: pointSize,
         initialParticleUVScale: particleUVScale,
         initialPointerEffectRadius: pointerRadius,
-    }), 
+    }) : null, 
     // Rebuild when the structural set of effects changes; not on parameter tweaks.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [effectsKey]);
+    [effectsKey, ownsMaterial]);
     useEffect(() => {
         materialRef.current = material;
         return () => {
-            material.dispose();
+            material?.dispose();
         };
     }, [material]);
+    // Tell useMaterialApplication's traversal to leave this object alone while we
+    // own its material. Set imperatively rather than through a `userData` prop:
+    // R3F replaces the whole object on every render, which would wipe the
+    // applyTexture handle stashed above.
+    useEffect(() => {
+        const points = pointsRef.current;
+        if (!points)
+            return;
+        points.userData[SELF_OWNED_MATERIAL_KEY] = ownsMaterial;
+        return () => {
+            if (points.userData)
+                delete points.userData[SELF_OWNED_MATERIAL_KEY];
+        };
+    }, [ownsMaterial]);
     useFrame((state, delta) => {
+        const points = pointsRef.current;
+        if (!points)
+            return;
+        if (hasPositionEffects && displayPositions !== positions) {
+            const moved = applyVertexEffects(positions, displayPositions, positionEffects, {
+                time: state.clock.getElapsedTime(),
+                pointerX: state.pointer.x * LOCAL_POINTER_SCALE,
+                pointerY: state.pointer.y * LOCAL_POINTER_SCALE,
+                pointerRadius: pointerRadius * LOCAL_POINTER_SCALE,
+            });
+            if (moved) {
+                const attribute = points.geometry?.attributes?.position;
+                if (attribute)
+                    attribute.needsUpdate = true;
+            }
+        }
         const mat = materialRef.current;
-        if (!mat || !pointsRef.current)
+        if (!mat)
             return;
         handleColorsAnimation(materialRef, delta, speed);
         if (prevTexture.current)
@@ -106,10 +146,10 @@ const PointCloud = ({ positions, materialSettings, animations, onObjectReady, on
             mat.uniforms.uTargetTexture.value = currentTexture.current;
         mat.uniforms.uHasTexture.value = !!currentTexture.current;
         handleTextureAnimation(materialRef, delta, speed);
-        update3driseShaderUniforms(mat.uniforms, activeEffects, state.clock.getElapsedTime(), { x: state.pointer.x, y: state.pointer.y }, { pointerRadius });
+        update3driseShaderUniforms(mat.uniforms, shellEffects, state.clock.getElapsedTime(), { x: state.pointer.x, y: state.pointer.y }, { pointerRadius });
     });
     if (!positions)
         return null;
-    return (_jsxs("points", { ref: pointsRef, raycast: () => null, position: [0, 0, 0], rotation: [0, 0, 0], scale: [1, 1, 1], children: [_jsxs("bufferGeometry", { children: [_jsx("bufferAttribute", { attach: "attributes-position", count: positions.length / 3, array: positions, itemSize: 3, args: [positions, 3] }), uvs && (_jsx("bufferAttribute", { attach: "attributes-aUV", count: uvs.length / 2, array: uvs, itemSize: 2, args: [uvs, 2] }))] }), _jsx("primitive", { object: material, attach: "material" })] }));
+    return (_jsxs("points", { ref: pointsRef, raycast: () => null, position: [0, 0, 0], rotation: [0, 0, 0], scale: [1, 1, 1], children: [_jsxs("bufferGeometry", { children: [_jsx("bufferAttribute", { attach: "attributes-position", count: displayPositions.length / 3, array: displayPositions, itemSize: 3, args: [displayPositions, 3] }), uvs && (_jsx("bufferAttribute", { attach: "attributes-aUV", count: uvs.length / 2, array: uvs, itemSize: 2, args: [uvs, 2] }))] }), material && _jsx("primitive", { object: material, attach: "material" })] }));
 };
 export default PointCloud;

package/dist/constants.d.ts

@@ -1,2 +1,3 @@
 export declare const dataCenterServer = "https://3drise.ai/api/data/";
+export declare const SELF_MANAGED_MATERIAL: Set<string>;
 //# sourceMappingURL=constants.d.ts.map

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"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,gCAAgC,CAAC;AAC9D,eAAO,MAAM,qBAAqB,aAKhC,CAAC"}

package/dist/constants.js

@@ -4,3 +4,9 @@ const isLocalHostRuntime = typeof window !== 'undefined' &&
     (window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1');
 // export const dataCenterServer = isLocalHostRuntime ? LOCAL_DATA_CENTER_SERVER : PRODUCTION_DATA_CENTER_SERVER;
 export const dataCenterServer = PRODUCTION_DATA_CENTER_SERVER;
+export const SELF_MANAGED_MATERIAL = new Set([
+    'effect',
+    'space',
+    'grid',
+    // 'moon'
+]);

package/dist/hooks/useMaterialApplication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMaterialApplication.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialApplication.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAI/D,eAAO,MAAM,sBAAsB,GAAI,QAAQ,cAAc,EAAE,kBAAkB,gBAAgB,EAAE,4BAA4B,OAAO,EAAE,YAAY,MAAM,IAAI,KAAG,IAqIhK,CAAC"}
+{"version":3,"file":"useMaterialApplication.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialApplication.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,eAAO,MAAM,sBAAsB,GAAI,QAAQ,cAAc,EAAE,kBAAkB,gBAAgB,EAAE,4BAA4B,OAAO,EAAE,YAAY,MAAM,IAAI,KAAG,IAuIhK,CAAC"}

package/dist/hooks/useMaterialApplication.js

@@ -8,8 +8,6 @@
 import { useEffect, useRef } from 'react';
 import { createAndApplyMaterial, MATERIAL_INSTANCE_KEY, MaterialRegistryAPI, ObjectManager, resolveTextures, traverseSkippingEdgesAndEffects } from '@3driseai/3drise-core';
 import { resolveObject3D } from "../utils/resolveObject3D.js";
-// TEST: 0=raw defaults, 1=+DoubleSide, 2=+transparent, 3=+metalness/roughness
-const TEST_MATERIAL_MODE = 1;
 export const useMaterialApplication = (source, materialSettings, shouldApply3driseMaterial, onApplied) => {
     // Track all material instances we've created so we can release them on change/unmount
     // const { getTypeByName } = useObjectTypes();
@@ -29,7 +27,8 @@ export const useMaterialApplication = (source, materialSettings, shouldApply3dri
         // attached refs, so this is the first point the object reliably exists.
         const obj = resolveObject3D(source);
         if (!obj || !materialSettings || materialSettings.materialType === 'advanced' ||
-            materialSettings.materialVariant === '3dRiseShader' || (shouldApply3driseMaterial === false))
+            materialSettings.materialVariant === '3dRiseShader'
+            || (shouldApply3driseMaterial === false))
             return;
         handleSettingsChange(obj, materialSettings);
         return () => {

package/dist/hooks/useMaterialOptions.d.ts

@@ -1,5 +1,5 @@
 import { MaterialRegistryAPI } from '@3driseai/3drise-core';
-import type { CreatedObjectType, DisplayMode, MaterialSettings, SelectOptions } from '@3driseai/3drise-core';
+import type { CreatedObjectType, MaterialSettings, ModeGroup, SelectOptions } from '@3driseai/3drise-core';
 type RegistryMaterialType = Exclude<Parameters<typeof MaterialRegistryAPI.getVariants>[0], undefined>;
 export interface UseMaterialOptionsReturn {
     selectedType: RegistryMaterialType;
@@ -9,6 +9,6 @@ export interface UseMaterialOptionsReturn {
     handleTypeChange: (type: RegistryMaterialType) => void;
     handleVariantChange: (variant: string) => void;
 }
-export declare const useMaterialOptions: (initialSettings: MaterialSettings, onSettingsChange?: (newSettings: MaterialSettings) => void, objectType?: CreatedObjectType, displayMode?: DisplayMode) => UseMaterialOptionsReturn;
+export declare const useMaterialOptions: (initialSettings: MaterialSettings, onSettingsChange?: (newSettings: MaterialSettings) => void, objectType?: CreatedObjectType, surface?: ModeGroup) => UseMaterialOptionsReturn;
 export {};
 //# sourceMappingURL=useMaterialOptions.d.ts.map

package/dist/hooks/useMaterialOptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMaterialOptions.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE7G,KAAK,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAEtG,MAAM,WAAW,wBAAwB;IACrC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,aAAa,CAAC;IACnC,cAAc,EAAE,aAAa,CAAC;IAC9B,gBAAgB,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACvD,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClD;AAED,eAAO,MAAM,kBAAkB,GAAI,iBAAiB,gBAAgB,EAAE,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,KAAK,IAAI,EAAE,aAAY,iBAA0B,EAAE,cAAa,WAAqB,KAAG,wBA4G9M,CAAC"}
+{"version":3,"file":"useMaterialOptions.d.ts","sourceRoot":"","sources":["../../src/hooks/useMaterialOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAA2B,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3G,KAAK,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAEtG,MAAM,WAAW,wBAAwB;IACrC,YAAY,EAAE,oBAAoB,CAAC;IACnC,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,aAAa,CAAC;IACnC,cAAc,EAAE,aAAa,CAAC;IAC9B,gBAAgB,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACvD,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClD;AAED,eAAO,MAAM,kBAAkB,GAAI,iBAAiB,gBAAgB,EAAE,mBAAmB,CAAC,WAAW,EAAE,gBAAgB,KAAK,IAAI,EAAE,aAAY,iBAA0B,EAAE,UAAS,SAAkB,KAAG,wBA0FvM,CAAC"}

package/dist/hooks/useMaterialOptions.js

@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
-import { MaterialRegistryAPI } from '@3driseai/3drise-core';
+import { MaterialRegistryAPI, materialTypeFitsSurface } from '@3driseai/3drise-core';
 import { FrontSide } from 'three';
-export const useMaterialOptions = (initialSettings, onSettingsChange, objectType = 'mesh', displayMode = 'solid') => {
+export const useMaterialOptions = (initialSettings, onSettingsChange, objectType = 'mesh', surface = 'mesh') => {
     // Ensure we always have a valid material type
     const validType = (initialSettings.materialType || 'basic');
     const [selectedType, setSelectedType] = useState(validType);
@@ -18,35 +18,17 @@ export const useMaterialOptions = (initialSettings, onSettingsChange, objectType
         setSelectedVariant(initialSettings.materialVariant || variants[0] || '');
     }, [initialSettings.materialType, initialSettings.materialVariant]);
     const allmaterialTypes = MaterialRegistryAPI.getTypes();
-    const is3dRiseShaderMaterial = initialSettings.materialType === 'particles' || initialSettings.materialType === 'custom';
-    const isLineMaterial = initialSettings.materialType === 'line';
-    const meshMaterialTypes = allmaterialTypes.filter(type => type !== 'particles' && type !== 'custom' && type !== 'line');
-    const lineMaterialTypes = allmaterialTypes.filter(type => type === 'line');
-    const dRiseShaderMaterialTypes = allmaterialTypes.filter(type => type === 'particles' || type === 'custom');
-    const materialTypeOptions = () => {
-        if (objectType === 'mesh') {
-            return allmaterialTypes.map((type) => ({
-                value: type,
-                label: type.charAt(0).toUpperCase() + type.slice(1)
-            }));
-        }
-        if (is3dRiseShaderMaterial) {
-            return dRiseShaderMaterialTypes.map((type) => ({
-                value: type,
-                label: type.charAt(0).toUpperCase() + type.slice(1)
-            }));
-        }
-        if (isLineMaterial) {
-            return lineMaterialTypes.map((type) => ({
-                value: type,
-                label: type.charAt(0).toUpperCase() + type.slice(1)
-            }));
-        }
-        return meshMaterialTypes.map((type) => ({
-            value: type,
-            label: type.charAt(0).toUpperCase() + type.slice(1)
-        }));
-    };
+    // Offer only the families that can actually draw on this object's surface.
+    // A <points> takes the `particles` family and nothing else; every other
+    // surface takes everything except it. Note this keys off the surface, never
+    // off the currently selected material — the previous version did the latter,
+    // which meant an object could never get back to a family once it left it.
+    const materialTypeOptions = () => allmaterialTypes
+        .filter((type) => materialTypeFitsSurface(type, surface))
+        .map((type) => ({
+        value: type,
+        label: type.charAt(0).toUpperCase() + type.slice(1)
+    }));
     // is3dRiseShaderMaterial ?
     // dRiseShaderMaterialTypes.map((type: string) => ({
     //   value: type,

package/dist/hooks/useObjectEdges.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useObjectEdges.d.ts","sourceRoot":"","sources":["../../src/hooks/useObjectEdges.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAiK/D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,cAAc,GAAG,IAAI,CA6ChH"}
+{"version":3,"file":"useObjectEdges.d.ts","sourceRoot":"","sources":["../../src/hooks/useObjectEdges.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAmH/D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,cAAc,GAAG,IAAI,CA6ChH"}

package/dist/hooks/useObjectEdges.js

@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { BoxGeometry, BufferGeometry, CylinderGeometry, EdgesGeometry, Group, LineSegments, Mesh, MeshBasicMaterial, Points, PointsMaterial, Quaternion, Vector3, Float32BufferAttribute, } from 'three';
+import { BoxGeometry, CylinderGeometry, EdgesGeometry, Group, LineSegments, Mesh, MeshBasicMaterial, Points, PointsMaterial, Quaternion, Vector3, } from 'three';
 import { useFrame } from '@react-three/fiber';
-import { collectMeshes, computeThreshold, buildSubdividedEdgeGeometry, EDGES_GROUP_KEY, animateUniforms, cacheChildrenWithMaterials, findById } from '@3driseai/3drise-core';
+import { collectMeshes, computeThreshold, buildSubdividedEdgeGeometry, buildSegmentQuadGeometry, EDGES_GROUP_KEY, animateUniforms, cacheChildrenWithMaterials, findById } from '@3driseai/3drise-core';
 import { useMaterialApplication } from './useMaterialApplication.js';
 import { resolveObject3D } from '../utils/resolveObject3D.js';
 ;
@@ -9,52 +9,6 @@ import { resolveObject3D } from '../utils/resolveObject3D.js';
 const DEFAULT_TUBE_RADIUS = 0.01;
 const DEFAULT_CUBE_SIZE = 0.02;
 // ─── Builders ────────────────────────────────────────────────────────────────
-function edgesGeoToQuadMesh(edgesGeo, thickness = 0.008) {
-    const src = edgesGeo.attributes.position;
-    const segCount = src.count / 2; // each segment = 2 vertices
-    const positions = [];
-    const uvs = [];
-    const indices = [];
-    const start = new Vector3();
-    const end = new Vector3();
-    const dir = new Vector3();
-    const up = new Vector3(0, 1, 0);
-    const right = new Vector3();
-    for (let i = 0; i < segCount; i++) {
-        start.fromBufferAttribute(src, i * 2);
-        end.fromBufferAttribute(src, i * 2 + 1);
-        dir.subVectors(end, start).normalize();
-        // Perpendicular axis — fallback to X if segment is vertical
-        right.crossVectors(dir, up).normalize();
-        if (right.lengthSq() < 0.0001) {
-            right.set(1, 0, 0);
-        }
-        const rx = right.x * thickness;
-        const ry = right.y * thickness;
-        const rz = right.z * thickness;
-        const base = i * 4;
-        // v0  start-bottom   uv(0,0)
-        positions.push(start.x - rx, start.y - ry, start.z - rz);
-        uvs.push(0, 0);
-        // v1  end-bottom     uv(1,0)
-        positions.push(end.x - rx, end.y - ry, end.z - rz);
-        uvs.push(1, 0);
-        // v2  start-top      uv(0,1)
-        positions.push(start.x + rx, start.y + ry, start.z + rz);
-        uvs.push(0, 1);
-        // v3  end-top        uv(1,1)
-        positions.push(end.x + rx, end.y + ry, end.z + rz);
-        uvs.push(1, 1);
-        indices.push(base, base + 1, base + 2);
-        indices.push(base + 1, base + 3, base + 2);
-    }
-    const geo = new BufferGeometry();
-    geo.setAttribute("position", new Float32BufferAttribute(positions, 3));
-    geo.setAttribute("uv", new Float32BufferAttribute(uvs, 2));
-    geo.setIndex(indices);
-    geo.computeVertexNormals();
-    return new Mesh(geo);
-}
 function buildLineGroup(object, localParent) {
     const g = new Group();
     for (const { mesh, matrixRelativeToRoot } of collectMeshes(object, localParent)) {
@@ -64,7 +18,7 @@ function buildLineGroup(object, localParent) {
         const quaternion = new Quaternion();
         const scale = new Vector3();
         matrixRelativeToRoot.decompose(position, quaternion, scale);
-        const quadMesh = edgesGeoToQuadMesh(edgesGeo);
+        const quadMesh = new Mesh(buildSegmentQuadGeometry(edgesGeo.attributes.position));
         quadMesh.position.copy(position);
         quadMesh.quaternion.copy(quaternion);
         quadMesh.scale.copy(scale);

package/dist/utils/pointsMaterialOwnership.d.ts

@@ -0,0 +1,9 @@
+import type { MaterialSettings } from '@3driseai/3drise-core';
+import type { ShaderEffect } from '@3driseai/3drise-core';
+/** The one particles variant that is built dynamically rather than by the registry. */
+export declare const SHADER_EFFECTS_VARIANT = "3dRiseShader";
+/** True when at least one shader effect is switched on. */
+export declare function hasActiveShaderEffects(effects?: ShaderEffect[] | null): boolean;
+export declare function ownsShaderEffectsMaterial(materialSettings?: MaterialSettings | null, effects?: ShaderEffect[] | null): boolean;
+export default ownsShaderEffectsMaterial;
+//# sourceMappingURL=pointsMaterialOwnership.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"pointsMaterialOwnership.d.ts","sourceRoot":"","sources":["../../src/utils/pointsMaterialOwnership.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,uFAAuF;AACvF,eAAO,MAAM,sBAAsB,iBAAiB,CAAC;AAErD,2DAA2D;AAC3D,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,OAAO,CAE/E;AAED,wBAAgB,yBAAyB,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,EAAE,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,GAAG,OAAO,CAM9H;AAED,eAAe,yBAAyB,CAAC"}

package/dist/utils/pointsMaterialOwnership.js

@@ -0,0 +1,14 @@
+/** The one particles variant that is built dynamically rather than by the registry. */
+export const SHADER_EFFECTS_VARIANT = '3dRiseShader';
+/** True when at least one shader effect is switched on. */
+export function hasActiveShaderEffects(effects) {
+    return Array.isArray(effects) && effects.some((effect) => effect?.enabled);
+}
+export function ownsShaderEffectsMaterial(materialSettings, effects) {
+    // Effects only exist inside the shell, so their presence decides ownership.
+    if (hasActiveShaderEffects(effects))
+        return true;
+    const variant = materialSettings?.materialVariant;
+    return !variant || variant === SHADER_EFFECTS_VARIANT;
+}
+export default ownsShaderEffectsMaterial;

package/package.json

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