Skip to content
Snippets Groups Projects
Commit 04fd3ade authored by Alexander Rose's avatar Alexander Rose
Browse files

improved canvas3d.resetCamera

parent 48985cd4
No related branches found
No related tags found
No related merge requests found
...@@ -140,7 +140,7 @@ namespace Canvas3D { ...@@ -140,7 +140,7 @@ namespace Canvas3D {
const multiSample = new MultiSamplePass(webgl, camera, drawPass, postprocessing, p.multiSample) const multiSample = new MultiSamplePass(webgl, camera, drawPass, postprocessing, p.multiSample)
let drawPending = false let drawPending = false
let cameraResetRequested = false let cameraResetRequested: boolean | Vec3 = false
function getLoci(pickingId: PickingId) { function getLoci(pickingId: PickingId) {
let loci: Loci = EmptyLoci let loci: Loci = EmptyLoci
...@@ -270,7 +270,8 @@ namespace Canvas3D { ...@@ -270,7 +270,8 @@ namespace Canvas3D {
runTask(scene.commit()).then(() => { runTask(scene.commit()).then(() => {
if (cameraResetRequested && !scene.isCommiting) { if (cameraResetRequested && !scene.isCommiting) {
camera.focus(scene.boundingSphere.center, scene.boundingSphere.radius) const dir = typeof cameraResetRequested === 'boolean' ? undefined : cameraResetRequested
camera.focus(scene.boundingSphere.center, scene.boundingSphere.radius, dir)
cameraResetRequested = false cameraResetRequested = false
} }
if (debugHelper.isEnabled) debugHelper.update() if (debugHelper.isEnabled) debugHelper.update()
...@@ -343,8 +344,7 @@ namespace Canvas3D { ...@@ -343,8 +344,7 @@ namespace Canvas3D {
handleResize, handleResize,
resetCamera: (dir?: Vec3) => { resetCamera: (dir?: Vec3) => {
if (scene.isCommiting) { if (scene.isCommiting) {
// TODO handle `dir` cameraResetRequested = dir || true
cameraResetRequested = true
} else { } else {
camera.focus(scene.boundingSphere.center, scene.boundingSphere.radius, dir) camera.focus(scene.boundingSphere.center, scene.boundingSphere.radius, dir)
requestDraw(true); requestDraw(true);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment