@3driseai/3drise-viewer 0.1.1 → 0.1.2

package/dist/components/GeometryShape.d.ts

@@ -24,14 +24,11 @@ export interface GeometryMeshProps {
     /** Material for the solid path (defaults to a standard material). */
     children?: ReactNode;
 }
-export declare function useShapeGeometry(options: GeometryShapeConfig): BufferGeometry;
-/** interior fill via point-in-mesh ray-parity (closed meshes only) */
+export declare function useShapeGeometry(options: GeometryShapeConfig | null | undefined): BufferGeometry;
 export declare function volumeFill(geo: BufferGeometry, count: number, oversample?: number): Float32Array;
 /** area-weighted points on the skin — the keystone for the modes below */
 export declare function surfaceScatter(geo: BufferGeometry, count: number): Float32Array;
-/** fold into one wedge, mirror, rotate-copy around Z → kaleidoscope */
 export declare function symmetricScatter(geo: BufferGeometry, count: number, sym: number): Float32Array;
-/** blue-noise: oversample then reject anything closer than minDist (grid-hashed) */
 export declare function evenScatter(geo: BufferGeometry, count: number, spacing: number): Float32Array;
 export declare function meshVertices(geo: BufferGeometry): Float32Array;
 export declare function edges3D(geo: BufferGeometry, angleDeg: number): Pt[];

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,16 +2,37 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo } from 'react';
 import { EdgesGeometry, WireframeGeometry, Mesh, MeshBasicMaterial, Raycaster, Vector3, DoubleSide, } from 'three';
 import { Line } from '@react-three/drei';
-// ── Wire these to your project ───────────────────────────────────────────────
 import { shapeGenerators } from '../utils/shapes.js';
 import PointCloud from './PointCloud.js';
-// import type { ShapeConfig, DisplayMode } from './GeometryShapeController';
-/* ════════════════════════════════════════════════════════════════════════════
- * Geometry — one source the modes all read from.
- * ══════════════════════════════════════════════════════════════════════════ */
+const defaultModeConfig = {
+    mode: 'solid',
+    count: 1000,
+    symmetry: 3,
+    spacing: 0.1,
+    slices: 8,
+    linkRadius: 0.05,
+    angle: 18,
+    lineWidth: 1,
+};
+function normalizeShapeConfig(config) {
+    if (config && typeof config === 'object' && typeof config.type === 'string' && config.type in shapeGenerators) {
+        return config;
+    }
+    return { type: 'box' };
+}
+function normalizeModeConfig(config) {
+    return {
+        ...defaultModeConfig,
+        ...(config || {}),
+    };
+}
 export function useShapeGeometry(options) {
-    const key = JSON.stringify(options);
-    const geometry = useMemo(() => shapeGenerators[options.type](options), [options.type, key]); // eslint-disable-line react-hooks/exhaustive-deps
+    const safeOptions = useMemo(() => normalizeShapeConfig(options), [options]);
+    const key = JSON.stringify(safeOptions);
+    const geometry = useMemo(() => {
+        const generator = shapeGenerators[safeOptions.type] ?? shapeGenerators.box;
+        return generator(safeOptions);
+    }, [safeOptions.type, key]); // eslint-disable-line react-hooks/exhaustive-deps
     useEffect(() => () => geometry.dispose(), [geometry]);
     return geometry;
 }
@@ -41,10 +62,6 @@ function toPairs(arr) {
         out.push([arr[i], arr[i + 1], arr[i + 2]]);
     return out;
 }
-/* ════════════════════════════════════════════════════════════════════════════
- * POINT transforms → Float32Array of xyz.
- * ══════════════════════════════════════════════════════════════════════════ */
-/** interior fill via point-in-mesh ray-parity (closed meshes only) */
 export function volumeFill(geo, count, oversample = 80) {
     const probe = new Mesh(geo, new MeshBasicMaterial({ side: DoubleSide }));
     probe.updateMatrixWorld(true);
@@ -106,7 +123,6 @@ export function surfaceScatter(geo, count) {
     }
     return out;
 }
-/** fold into one wedge, mirror, rotate-copy around Z → kaleidoscope */
 export function symmetricScatter(geo, count, sym) {
     const base = surfaceScatter(geo, Math.max(1, Math.floor(count / (2 * sym))));
     const w = (Math.PI * 2) / sym;
@@ -125,7 +141,6 @@ export function symmetricScatter(geo, count, sym) {
     }
     return new Float32Array(out);
 }
-/** blue-noise: oversample then reject anything closer than minDist (grid-hashed) */
 export function evenScatter(geo, count, spacing) {
     const cand = surfaceScatter(geo, count * 6);
     const minD = (spacing * bboxDiag(geo)) / Math.sqrt(count);
@@ -169,9 +184,6 @@ export function meshVertices(geo) {
     }
     return out;
 }
-/* ════════════════════════════════════════════════════════════════════════════
- * LINE transforms → segment endpoint pairs (Pt[]).
- * ══════════════════════════════════════════════════════════════════════════ */
 export function edges3D(geo, angleDeg) {
     const e = new EdgesGeometry(geo, angleDeg);
     const pts = toPairs(e.attributes.position.array);
@@ -228,9 +240,6 @@ export function contourSlices(geo, slices, axis = 1) {
     }
     return out;
 }
-/* ════════════════════════════════════════════════════════════════════════════
- * PLEXUS → points + links to near neighbours.
- * ══════════════════════════════════════════════════════════════════════════ */
 export function plexus(geo, count, radiusMul, maxLinks = 6) {
     const pts = surfaceScatter(geo, count);
     const n = pts.length / 3;
@@ -288,24 +297,23 @@ export function computeMode(geo, c) {
     }
 }
 function useModeData(geometry, config) {
-    console.log('useModeData', config);
-    const key = [config.mode, config.count, config.symmetry, config.spacing, config.slices, config.linkRadius, config.angle].join('|');
-    return useMemo(() => computeMode(geometry, config), [geometry, key]); // eslint-disable-line react-hooks/exhaustive-deps
+    const safeConfig = normalizeModeConfig(config);
+    const key = [safeConfig.mode, safeConfig.count, safeConfig.symmetry, safeConfig.spacing, safeConfig.slices, safeConfig.linkRadius, safeConfig.angle].join('|');
+    return useMemo(() => computeMode(geometry, safeConfig), [geometry, key]); // eslint-disable-line react-hooks/exhaustive-deps
 }
-const defaultModeConfig = { mode: 'solid', count: 1000, symmetry: 3, spacing: 0.1, slices: 8, linkRadius: 0.05, angle: 18, lineWidth: 1 };
 export function GeometryMesh({ config, materialSettings, animations, modeConfig = defaultModeConfig, color = '#ffffff', children }) {
     const geometry = useShapeGeometry(config);
-    const data = useModeData(geometry, modeConfig);
+    const safeModeConfig = normalizeModeConfig(modeConfig);
+    const data = useModeData(geometry, safeModeConfig);
     // 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 });
     if (data.kind === 'lines')
-        return data.points.length ? _jsx(Line, { points: data.points, segments: true, color: color, lineWidth: modeConfig.lineWidth }) : null;
+        return data.points.length ? _jsx(Line, { points: data.points, segments: true, color: color, lineWidth: safeModeConfig.lineWidth }) : null;
     if (data.kind === 'plexus')
-        return (_jsxs("group", { children: [_jsx(PointCloud, { positions: data.positions, animations: animations, materialSettings: materialSettings }), data.segments.length > 0 && _jsx(Line, { points: data.segments, segments: true, color: color, lineWidth: modeConfig.lineWidth, transparent: true, opacity: 0.45 })] }));
+        return (_jsxs("group", { 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 (_jsx("mesh", { geometry: geometry, children: children ?? _jsx("meshPhongMaterial", { color: color, side: DoubleSide }) }));
 }
-/* ── Optional host-owned auto-fit (generators return raw geometry). ── */
 export function FitGroup({ geometry, radius = 1.7, children }) {
     const { scale, position } = useMemo(() => {
         geometry.computeBoundingSphere();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3driseai/3drise-viewer",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",