experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restoring the camera from a bookmark requires restoring the orbit controls as

Browse Source 
well, otherwise the orbit controls will try to 'look at' the target of (0,0,0)
and introduce an undesired rotation. This is extremely non-obvious in the 2d
(orthographic) projection case. Fix is to always initialize position0, zoom0,
and target0 in the orbit controls when creating a camera.

Extract makeOrbitControls out from duplicated code in makeCamera2D and
makeCamera3D.
Change: 138710960
This commit is contained in:
Charles Nicholson 2016-11-09 18:10:18 -08:00 committed by TensorFlower Gardener
parent 55ff052d2c
commit e01b641fc2
1 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tensorflow/tensorboard/components/vz_projector/scatterPlot.ts
View File

@ -189,6 +189,29 @@ export class ScatterPlot {
cameraControls.addEventListener('end', () => {}); cameraControls.addEventListener('end', () => {});
} }
private makeOrbitControls(
camera: THREE.Camera, cameraDef: CameraDef, enableRotate: boolean) {
if (this.orbitCameraControls != null) {
this.orbitCameraControls.dispose();
}
const occ =
new (THREE as any).OrbitControls(camera, this.renderer.domElement);
occ.target0 = new THREE.Vector3(
cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
occ.position0 = new THREE.Vector3().copy(camera.position);
occ.zoom0 = cameraDef.zoom;
occ.enableRotate = enableRotate;
occ.autoRotate = false;
occ.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
occ.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
occ.mouseButtons.PAN = THREE.MOUSE.RIGHT;
occ.reset();
this.camera = camera;
this.orbitCameraControls = occ;
this.addCameraControlsEventListeners(this.orbitCameraControls);
}
private makeCamera3D(cameraDef: CameraDef, w: number, h: number) { private makeCamera3D(cameraDef: CameraDef, w: number, h: number) {
let camera: THREE.PerspectiveCamera; let camera: THREE.PerspectiveCamera;
{ {
@ -202,23 +225,10 @@ export class ScatterPlot {
cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]); cameraDef.target[0], cameraDef.target[1], cameraDef.target[2]);
camera.lookAt(at); camera.lookAt(at);
camera.zoom = cameraDef.zoom; camera.zoom = cameraDef.zoom;
camera.updateProjectionMatrix();
} }
const occ =
new (THREE as any).OrbitControls(camera, this.renderer.domElement);
occ.enableRotate = true;
occ.rotateSpeed = ORBIT_MOUSE_ROTATION_SPEED;
occ.mouseButtons.ORBIT = THREE.MOUSE.LEFT;
occ.mouseButtons.PAN = THREE.MOUSE.RIGHT;
if (this.orbitCameraControls != null) {
this.orbitCameraControls.dispose();
}
this.camera = camera; this.camera = camera;
this.orbitCameraControls = occ; this.makeOrbitControls(camera, cameraDef, true);
this.addCameraControlsEventListeners(this.orbitCameraControls);
} }
private makeCamera2D(cameraDef: CameraDef, w: number, h: number) { private makeCamera2D(cameraDef: CameraDef, w: number, h: number) {
@ -246,25 +256,10 @@ export class ScatterPlot {
camera.up = new THREE.Vector3(0, 1, 0); camera.up = new THREE.Vector3(0, 1, 0);
camera.lookAt(target); camera.lookAt(target);
camera.zoom = cameraDef.zoom; camera.zoom = cameraDef.zoom;
camera.updateProjectionMatrix();
} }
const occ =
new (THREE as any).OrbitControls(camera, this.renderer.domElement);
occ.target = target;
occ.enableRotate = false;
occ.enableDamping = false;
occ.autoRotate = false;
occ.mouseButtons.ORBIT = null;
occ.mouseButtons.PAN = THREE.MOUSE.LEFT;
if (this.orbitCameraControls != null) {
this.orbitCameraControls.dispose();
}
this.camera = camera; this.camera = camera;
this.orbitCameraControls = occ; this.makeOrbitControls(camera, cameraDef, false);
this.addCameraControlsEventListeners(occ);
} }
private makeDefaultCameraDef(dimensionality: number): CameraDef { private makeDefaultCameraDef(dimensionality: number): CameraDef {