AI_Assistant/openscad-playground
Watch
1
0
Fork
You've already forked openscad-playground
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

axes: use axes viewer for snapping logic (model viewer wiggles b/c of the prompt)

Browse source
This commit is contained in:
ochafik 2024-12-26 19:12:24 +00:00 • committed by Olivier Chafik
commit ecdc04af39
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/ViewerPanel.tsx
View file

@ -79,10 +79,11 @@ export default function ViewerPanel({className, style}: {className?: string, sty
}, [ref.current, otherRef.current]); }, [ref.current, otherRef.current]);
} }
// Cycle through predefined views when user clicks on the axes viewer
useEffect(() => { useEffect(() => {
let mouseDownSpherePoint: [number, number, number] | undefined; let mouseDownSpherePoint: [number, number, number] | undefined;
function getSpherePoint() { function getSpherePoint() {
const orbit = modelViewerRef.current.getCameraOrbit(); const orbit = axesViewerRef.current.getCameraOrbit();
return spherePoint(orbit.theta, orbit.phi); return spherePoint(orbit.theta, orbit.phi);
} }
function onMouseDown(e: MouseEvent) { function onMouseDown(e: MouseEvent) {
@ -100,13 +101,14 @@ export default function ViewerPanel({className, style}: {className?: string, sty
if (clickDist > euclEps) { if (clickDist > euclEps) {
return; return;
} }
// Cycle through orbits // Note: unlike the axes viewer, the model viewer has a prompt that makes the model wiggle around, we only fetch it to get the radius.
const orbit = modelViewerRef.current.getCameraOrbit(); const axesOrbit = axesViewerRef.current.getCameraOrbit();
const [currentIndex, dist, radDist] = getClosestPredefinedOrbitIndex(orbit.theta, orbit.phi); const modelOrbit = modelViewerRef.current.getCameraOrbit();
const [currentIndex, dist, radDist] = getClosestPredefinedOrbitIndex(axesOrbit.theta, axesOrbit.phi);
const newIndex = dist < euclEps && radDist < radEps ? (currentIndex + 1) % PREDEFINED_ORBITS.length : currentIndex; const newIndex = dist < euclEps && radDist < radEps ? (currentIndex + 1) % PREDEFINED_ORBITS.length : currentIndex;
const [name, theta, phi] = PREDEFINED_ORBITS[newIndex]; const [name, theta, phi] = PREDEFINED_ORBITS[newIndex];
Object.assign(orbit, {theta, phi}); Object.assign(modelOrbit, {theta, phi});
const newOrbit = modelViewerRef.current.cameraOrbit = axesViewerRef.current.cameraOrbit = orbit.toString(); const newOrbit = modelViewerRef.current.cameraOrbit = axesViewerRef.current.cameraOrbit = modelOrbit.toString();
toastRef.current?.show({severity: 'info', detail: `${name} view`, life: 1000,}); toastRef.current?.show({severity: 'info', detail: `${name} view`, life: 1000,});
setInteractionPrompt('none'); setInteractionPrompt('none');
} }
@ -119,7 +121,7 @@ export default function ViewerPanel({className, style}: {className?: string, sty
window.removeEventListener('mousedown', onMouseDown); window.removeEventListener('mousedown', onMouseDown);
window.removeEventListener('mouseup', onMouseUp); window.removeEventListener('mouseup', onMouseUp);
}; };
}, [axesViewerRef.current]); });
return ( return (
<div className={className} <div className={className}