fixed camera init to avoid multiple calls to create camera and resuse the identical camera object in creating gl3d scene

Author: archmoj

package-lock.json

@@ -80,7 +80,7 @@
     "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.0.8",
     "gl-plot2d": "^1.4.2",
-    "gl-plot3d": "^2.1.1",
+    "gl-plot3d": "git://github.com/gl-vis/gl-plot3d.git#8974522a2b56120766d34d4e509f292a718b7f3e",
     "gl-pointcloud2d": "^1.0.2",
     "gl-scatter3d": "^1.2.0",
     "gl-select-box": "^1.0.3",

package.json

@@ -192,7 +192,7 @@ function render(scene) {
     scene.drawAnnotations(scene);
 }
 
-function tryCreatePlot(scene, camera, pixelRatio, canvas, gl) {
+function tryCreatePlot(scene, cameraObject, pixelRatio, canvas, gl) {
 
     var glplotOptions = {
         canvas: canvas,
@@ -204,7 +204,7 @@ function tryCreatePlot(scene, camera, pixelRatio, canvas, gl) {
         snapToData: true,
         autoScale: true,
         autoBounds: false,
-        camera: camera,
+        cameraObject: cameraObject,
         pixelRatio: pixelRatio
     };
 
@@ -238,9 +238,11 @@ function tryCreatePlot(scene, camera, pixelRatio, canvas, gl) {
     return true;
 }
 
-function initializeGLPlot(scene, camera, pixelRatio, canvas, gl) {
+function initializeGLPlot(scene, pixelRatio, canvas, gl) {
 
-    var success = tryCreatePlot(scene, camera, pixelRatio, canvas, gl);
+    scene.initializeGLCamera();
+
+    var success = tryCreatePlot(scene, scene.camera, pixelRatio, canvas, gl);
     /*
     * createPlot will throw when webgl is not enabled in the client.
     * Lets return an instance of the module with all functions noop'd.
@@ -281,8 +283,6 @@ function initializeGLPlot(scene, camera, pixelRatio, canvas, gl) {
         }, false);
     }
 
-    if(!scene.camera) scene.initializeGLCamera();
-
     scene.glplot.camera = scene.camera;
 
     scene.glplot.oncontextloss = function() {
@@ -351,9 +351,7 @@ function Scene(options, fullLayout) {
     this.convertAnnotations = Registry.getComponentMethod('annotations3d', 'convert');
     this.drawAnnotations = Registry.getComponentMethod('annotations3d', 'draw');
 
-    var camera = fullLayout.scene.camera;
-
-    initializeGLPlot(this, camera, this.pixelRatio);
+    initializeGLPlot(this, this.pixelRatio);
 
     this.enableGLCameraMouseListener();
 }
@@ -808,7 +806,7 @@ proto.setCamera = function setCamera(cameraData) {
 
         this.glplot.dispose();
 
-        initializeGLPlot(this, cameraData, pixelRatio);
+        initializeGLPlot(this, pixelRatio);
         this.glplot.camera._ortho = newOrtho;
     }
 };