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

fix zoom to fit in ortho mode

Browse source
This commit is contained in:
Stewart Allen 2025-12-16 19:12:36 -05:00
commit a48c2891fb
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/moto/space.js
View file

@ -1293,7 +1293,11 @@ let Space = {
// Use maxDim directly (not half) for more conservative framing // Use maxDim directly (not half) for more conservative framing
desiredDistance = maxDim / Math.tan(fov / 2) * padding; desiredDistance = maxDim / Math.tan(fov / 2) * padding;
} else { } else {
desiredDistance = maxDim * padding; // For orthographic, calculate equivalent distance
// The ortho frustum size is proportional to distance * tan(fov/2)
// We want similar framing to perspective mode
const fov = perspective * (Math.PI / 180);
desiredDistance = maxDim / Math.tan(fov / 2) * padding;
} }
// Get current view angles or use defaults // Get current view angles or use defaults
@ -1316,9 +1320,19 @@ let Space = {
panZ: newPanZ, panZ: newPanZ,
}); });
const currentDist = camera.position.distanceTo(viewControl.getTarget()); if (camera.isPerspectiveCamera) {
const scale = desiredDistance / currentDist; const currentDist = camera.position.distanceTo(viewControl.getTarget());
viewControl.setPosition({ scale }); const scale = desiredDistance / currentDist;
viewControl.setPosition({ scale });
} else {
// For orthographic, set zoom directly based on viewing size
// The camera frustum height is determined by the orthographic bounds
// We want the object to fit within the view with padding
const currentDist = camera.position.distanceTo(viewControl.getTarget());
const targetScaleSave = desiredDistance / currentDist;
// Reset scale accumulation and set absolute zoom
viewControl.setPosition({ scale: targetScaleSave / viewControl.getPosition(true).scale });
}
viewControl.update(); viewControl.update();
if (then) then(); if (then) then();