fixup createCamera function and added jasmine tests

archmoj · archmoj · commit 3a64174a1584 · 2019-02-19T19:37:43.000-05:00
diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js
@@ -231,19 +231,23 @@ function tryCreatePlot(scene, camera, canvas, gl) {
         scene.glplot = createPlot(glplotOptions);
     }
     catch(e) {
-        /*
-        * createPlot will throw when webgl is not enabled in the client.
-        * Lets return an instance of the module with all functions noop'd.
-        * The destroy method - which will remove the container from the DOM
-        * is overridden with a function that removes the container only.
-        */
-        return showNoWebGlMsg(scene);
+        return false;
     }
+
+    return true;
 }
 
 function initializeGLPlot(scene, camera, canvas, gl) {
 
-    tryCreatePlot(scene, camera, canvas, gl);
+    var success = tryCreatePlot(scene, camera, 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.
+    * The destroy method - which will remove the container from the DOM
+    * is overridden with a function that removes the container only.
+    */
+    if(!success) return showNoWebGlMsg(scene);
+
 
     var gd = scene.graphDiv;
 
diff --git a/test/jasmine/tests/gl3d_plot_interact_test.js b/test/jasmine/tests/gl3d_plot_interact_test.js
@@ -568,6 +568,99 @@ describe('Test gl3d plots', function() {
         .then(done);
     });
 
+    it('@gl should set the camera projection type to perspective if the camera.projection.type is not set', function(done) {
+        Plotly.plot(gd, {
+            data: [{
+                type: 'scatter3d',
+                x: [1, 2, 3],
+                y: [2, 3, 1],
+                z: [3, 1, 2]
+            }],
+            layout: {
+                scene: {
+                    camera: {
+                    }
+                }
+            }
+        })
+        .then(delay(20))
+        .then(function() {
+            expect(gd._fullLayout.scene.camera.projection.type === 'perspective').toBe(true);
+        })
+        .then(function() {
+            expect(gd._fullLayout.scene._scene.glplot.camera._ortho).toBe(false);
+        })
+        .then(done);
+    });
+
+    it('@gl should set the camera projection type to orthographic if the camera.projection.type is set to orthographic', function(done) {
+        Plotly.plot(gd, {
+            data: [{
+                type: 'scatter3d',
+                x: [1, 2, 3],
+                y: [2, 3, 1],
+                z: [3, 1, 2]
+            }],
+            layout: {
+                scene: {
+                    camera: {
+                        projection: {
+                            type: 'orthographic'
+                        }
+                    }
+                }
+            }
+        })
+        .then(delay(20))
+        .then(function() {
+            expect(gd._fullLayout.scene.camera.projection.type === 'orthographic').toBe(true);
+        })
+        .then(function() {
+            expect(gd._fullLayout.scene._scene.glplot.camera._ortho).toBe(true);
+        })
+        .then(done);
+    });
+
+    it('@gl should enable orthographic & perspective projections using relayout', function(done) {
+        Plotly.plot(gd, {
+            data: [{
+                type: 'scatter3d',
+                x: [1, 2, 3],
+                y: [2, 3, 1],
+                z: [3, 1, 2]
+            }],
+            layout: {
+                scene: {
+                    camera: {
+                        projection: {
+                            type: 'perspective'
+                        }
+                    }
+                }
+            }
+        })
+        .then(delay(20))
+        .then(function() {
+            return Plotly.relayout(gd, 'scene.camera.projection.type', 'orthographic');
+        })
+        .then(function() {
+            expect(gd._fullLayout.scene.camera.projection.type === 'orthographic').toBe(true);
+        })
+        .then(function() {
+            expect(gd._fullLayout.scene._scene.glplot.camera._ortho).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);
+        })
+        .then(function() {
+            expect(gd._fullLayout.scene._scene.glplot.camera._ortho).toBe(false);
+        })
+        .then(done);
+    });
+
     it('@gl should be able to reversibly change trace type', function(done) {
         var _mock = Lib.extendDeep({}, mock2);
         var sceneLayout = { aspectratio: { x: 1, y: 1, z: 1 } };
diff --git a/test/jasmine/tests/plot_api_react_test.js b/test/jasmine/tests/plot_api_react_test.js
@@ -1896,6 +1896,7 @@ describe('Test Plotly.react + interactions under uirevision:', function() {
             var sceneLayout = gd._fullLayout.scene;
             var cameraOld = sceneLayout.camera;
             sceneLayout._scene.setCamera({
+                projection: {type: 'perspective'},
                 eye: {x: 2, y: 2, z: 2},
                 center: cameraOld.center,
                 up: cameraOld.up
