no need to duplicate camera on gl-plot3d scene

Author: archmoj

src/plots/gl3d/scene.js

@@ -293,7 +293,7 @@ function initializeGLPlot(scene, canvas, gl) {
 
     scene.glplot.canvas.addEventListener('wheel', function(e) {
         if(gd._context._scrollZoom.gl3d) {
-            if(scene.glplot.camera._ortho) {
+            if(scene.camera._ortho) {
                 var s = (e.deltaX > e.deltaY) ? 1.1 : 1.0 / 1.1;
                 var o = scene.glplot.getAspectratio();
                 scene.glplot.setAspectratio({
@@ -326,8 +326,6 @@ function initializeGLPlot(scene, canvas, gl) {
         }, false);
     }
 
-    scene.glplot.camera = scene.camera;
-
     scene.glplot.oncontextloss = function() {
         scene.recoverContext();
     };
@@ -779,7 +777,7 @@ proto.destroy = function() {
 
     this.camera.mouseListener.enabled = false;
     this.container.removeEventListener('wheel', this.camera.wheelListener);
-    this.camera = this.glplot.camera = null;
+    this.camera = null;
     this.glplot.dispose();
     this.container.parentNode.removeChild(this.container);
     this.glplot = null;
@@ -808,19 +806,19 @@ function getLayoutCamera(camera) {
 
 // get camera position in plotly coords from 'gl-plot3d' coords
 proto.getCamera = function() {
-    this.glplot.camera.view.recalcMatrix(this.camera.view.lastT());
-    return getLayoutCamera(this.glplot.camera);
+    this.camera.view.recalcMatrix(this.camera.view.lastT());
+    return getLayoutCamera(this.camera);
 };
 
 // set gl-plot3d camera position and scene aspects with a set of plotly coords
 proto.setViewport = function(sceneLayout) {
     var cameraData = sceneLayout.camera;
 
-    this.glplot.camera.lookAt.apply(this, getCameraArrays(cameraData));
+    this.camera.lookAt.apply(this, getCameraArrays(cameraData));
     this.glplot.setAspectratio(sceneLayout.aspectratio);
 
     var newOrtho = (cameraData.projection.type === 'orthographic');
-    var oldOrtho = this.glplot.camera._ortho;
+    var oldOrtho = this.camera._ortho;
 
     if(newOrtho !== oldOrtho) {
         this.glplot.redraw();
@@ -837,7 +835,7 @@ proto.setViewport = function(sceneLayout) {
         this.glplot.dispose();
 
         initializeGLPlot(this);
-        this.glplot.camera._ortho = newOrtho;
+        this.camera._ortho = newOrtho;
     }
 };
 

test/jasmine/tests/gl3d_plot_interact_test.js

@@ -93,7 +93,7 @@ describe('Test gl3d before/after plot', function() {
         })
         .then(delay(20))
         .then(function() {
-            var cameraBefore = gd._fullLayout.scene._scene.glplot.camera;
+            var cameraBefore = gd._fullLayout.scene._scene.camera;
             expect(cameraBefore.up[0]).toBeCloseTo(0, 2, 'cameraBefore.up[0]');
             expect(cameraBefore.up[1]).toBeCloseTo(0, 2, 'cameraBefore.up[1]');
             expect(cameraBefore.up[2]).toBeCloseTo(1, 2, 'cameraBefore.up[2]');
@@ -108,7 +108,7 @@ describe('Test gl3d before/after plot', function() {
         .then(_clickThere)
         .then(delay(20))
         .then(function() {
-            var cameraAfter = gd._fullLayout.scene._scene.glplot.camera;
+            var cameraAfter = gd._fullLayout.scene._scene.camera;
             expect(cameraAfter.up[0]).toBeCloseTo(0, 2, 'cameraAfter.up[0]');
             expect(cameraAfter.up[1]).toBeCloseTo(0, 2, 'cameraAfter.up[1]');
             expect(cameraAfter.up[2]).toBeCloseTo(1, 2, 'cameraAfter.up[2]');
@@ -123,7 +123,7 @@ describe('Test gl3d before/after plot', function() {
         .then(_clickOtherplace)
         .then(delay(20))
         .then(function() {
-            var cameraFinal = gd._fullLayout.scene._scene.glplot.camera;
+            var cameraFinal = gd._fullLayout.scene._scene.camera;
             expect(cameraFinal.up[0]).toBeCloseTo(0, 2, 'cameraFinal.up[0]');
             expect(cameraFinal.up[1]).toBeCloseTo(0, 2, 'cameraFinal.up[1]');
             expect(cameraFinal.up[2]).toBeCloseTo(1, 2, 'cameraFinal.up[2]');
@@ -300,7 +300,7 @@ describe('Test gl3d plots', function() {
         .then(delay(20))
         .then(function() {
             expect(gd._fullLayout.scene.camera.projection.type === 'perspective').toBe(true);
-            expect(gd._fullLayout.scene._scene.glplot.camera._ortho === false).toBe(true);
+            expect(gd._fullLayout.scene._scene.camera._ortho === false).toBe(true);
         })
         .then(done);
     });
@@ -326,7 +326,7 @@ describe('Test gl3d plots', function() {
         .then(delay(20))
         .then(function() {
             expect(gd._fullLayout.scene.camera.projection.type === 'orthographic').toBe(true);
-            expect(gd._fullLayout.scene._scene.glplot.camera._ortho === true).toBe(true);
+            expect(gd._fullLayout.scene._scene.camera._ortho === true).toBe(true);
         })
         .then(done);
     });
@@ -355,28 +355,28 @@ describe('Test gl3d plots', function() {
         })
         .then(function() {
             expect(gd._fullLayout.scene.camera.projection.type === 'orthographic').toBe(true);
-            expect(gd._fullLayout.scene._scene.glplot.camera._ortho === true).toBe(true);
+            expect(gd._fullLayout.scene._scene.camera._ortho === true).toBe(true);
         })
         .then(function() {
             return Plotly.relayout(gd, 'scene.camera.eye.z', 2);
         })
         .then(function() {
             expect(gd._fullLayout.scene.camera.projection.type === 'orthographic').toBe(true);
-            expect(gd._fullLayout.scene._scene.glplot.camera._ortho === true).toBe(true);
+            expect(gd._fullLayout.scene._scene.camera._ortho === true).toBe(true);
         })
         .then(function() {
             return Plotly.relayout(gd, 'scene.camera.projection.type', 'perspective');
         })
         .then(function() {
             expect(gd._fullLayout.scene.camera.projection.type === 'perspective').toBe(true);
-            expect(gd._fullLayout.scene._scene.glplot.camera._ortho === false).toBe(true);
+            expect(gd._fullLayout.scene._scene.camera._ortho === false).toBe(true);
         })
         .then(function() {
             return Plotly.relayout(gd, 'scene.camera.eye.z', 3);
         })
         .then(function() {
             expect(gd._fullLayout.scene.camera.projection.type === 'perspective').toBe(true);
-            expect(gd._fullLayout.scene._scene.glplot.camera._ortho === false).toBe(true);
+            expect(gd._fullLayout.scene._scene.camera._ortho === false).toBe(true);
         })
         .then(done);
     });