Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep the camera position when switching to inspector (fix #607) #717

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/lib/cameras.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,9 @@ function setOrthoCamera(camera, dir, ratio) {
camera.position.copy(info.position);
camera.rotation.copy(info.rotation);
}

export function copyCameraPosition(sourceCamera, targetCamera) {
sourceCamera.getWorldPosition(targetCamera.position);
sourceCamera.getWorldQuaternion(targetCamera.quaternion);
targetCamera.updateMatrixWorld();
}
5 changes: 5 additions & 0 deletions src/lib/viewport.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import TransformControls from './TransformControls.js';
import EditorControls from './EditorControls.js';

import { copyCameraPosition } from './cameras';
import { initRaycaster } from './raycaster';
import Events from './Events';

Expand Down Expand Up @@ -225,6 +226,10 @@ export function Viewport(inspector) {
.forEach((element) => {
element.style.display = 'none';
});
copyCameraPosition(
inspector.cameras.original.object3D,
inspector.cameras.perspective
);
} else {
disableControls();
inspector.cameras.original.setAttribute('camera', 'active', 'true');
Expand Down