#29 different camera format, and ensuing code unification

Author: monfera

src/plots/gl3d/scene.js

@@ -559,13 +559,12 @@ proto.destroy = function() {
 // for reset camera button in mode bar
 proto.setCameraToDefault = function setCameraToDefault() {
     // as in Gl3d.layoutAttributes
-    var lookAtInput = [
-        [1.25, 1.25, 1.25],
-        [0, 0, 0],
-        [0, 0, 1]
-    ];
-    this.glplot.camera.lookAt.apply(this, lookAtInput);
-    this.graphDiv.emit('plotly_relayout', lookAtInput);
+
+    this.setCamera({
+        eye: { x: 1.25, y: 1.25, z: 1.25 },
+        center: { x: 0, y: 0, z: 0 },
+        up: { x: 0, y: 0, z: 1 }
+    });
 };
 
 // get camera position in plotly coords from 'orbit-camera' coords
@@ -585,16 +584,22 @@ proto.getCamera = function getCamera() {
 
 // set camera position with a set of plotly coords
 proto.setCamera = function setCamera(cameraData) {
-    var up = cameraData.up;
-    var center = cameraData.center;
-    var eye = cameraData.eye;
-    var lookAtInput = [
-        [eye.x, eye.y, eye.z],
-        [center.x, center.y, center.z],
-        [up.x, up.y, up.z]
-    ];
-    this.glplot.camera.lookAt.apply(this, lookAtInput);
-    this.graphDiv.emit('plotly_relayout', lookAtInput);
+
+    // getOrbitCamera :: plotly_coords -> orbit_camera_coords
+    function getOrbitCamera(camera) {
+        return [
+            [camera.eye.x, camera.eye.y, camera.eye.z],
+            [camera.center.x, camera.center.y, camera.center.z],
+            [camera.up.x, camera.up.y, camera.up.z]
+        ];
+    }
+
+    var update = {};
+
+    update[this.id] = cameraData;
+
+    this.glplot.camera.lookAt.apply(this, getOrbitCamera(cameraData));
+    this.graphDiv.emit('plotly_relayout', update);
 };
 
 // save camera to user layout (i.e. gd.layout)

test/jasmine/tests/gl_plot_interact_test.js

@@ -351,11 +351,13 @@ describe('Test gl plot interactions', function() {
                 setTimeout(function() {
 
                     expect(relayoutCallback).toHaveBeenCalled(); // initiator: resetCameraDefault3d
-                    expect(relayoutCallback).toHaveBeenCalledWith([
-                        [1.25, 1.25, 1.25],
-                        [0, 0, 0],
-                        [0, 0, 1]
-                    ]);
+                    expect(relayoutCallback).toHaveBeenCalledWith({
+                        scene: {
+                            eye: { x: 1.25, y: 1.25, z: 1.25 },
+                            center: { x: 0, y: 0, z: 0 },
+                            up: { x: 0, y: 0, z: 1 }
+                        }
+                    });
 
                     expect(sceneLayout.camera.eye)
                         .toEqual({x: 0.1, y: 0.1, z: 1}, 'does not change the layout objects');
@@ -371,11 +373,13 @@ describe('Test gl plot interactions', function() {
                     setTimeout(function() {
 
                         expect(relayoutCallback).toHaveBeenCalled(); // initiator: resetCameraLastSave3d
-                        expect(relayoutCallback).toHaveBeenCalledWith([
-                            [1.25, 1.25, 1.25],
-                            [0, 0, 0],
-                            [0, 0, 1]
-                        ]); // looks like there's no real saved data so it reverts to default
+                        expect(relayoutCallback).toHaveBeenCalledWith({
+                            scene: {
+                                eye: { x: 1.25, y: 1.25, z: 1.25 },
+                                center: { x: 0, y: 0, z: 0 },
+                                up: { x: 0, y: 0, z: 1 }
+                            }
+                        }); // looks like there's no real saved data so it reverts to default
 
                         expect(sceneLayout.camera.eye)
                             .toEqual({x: 0.1, y: 0.1, z: 1}, 'does not change the layout objects');