Merge pull request #3550 from plotly/ortho-view-finalist

Orthographic projection for 3D plots - finalist

Author: archmoj

package-lock.json

@@ -57,18 +57,17 @@
     ]
   },
   "dependencies": {
-    "3d-view": "^2.0.0",
+    "@plotly/d3-sankey": "0.7.2",
     "alpha-shape": "^1.0.0",
     "array-range": "^1.0.1",
     "canvas-fit": "^1.5.0",
     "color-normalize": "^1.3.0",
     "convex-hull": "^1.0.3",
     "country-regex": "^1.1.0",
     "d3": "^3.5.12",
-    "@plotly/d3-sankey": "0.7.2",
-    "d3-sankey-circular": "0.32.0",
     "d3-force": "^1.0.6",
     "d3-interpolate": "1",
+    "d3-sankey-circular": "0.32.0",
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",
     "fast-isnumeric": "^1.1.2",
@@ -81,7 +80,7 @@
     "gl-mat4": "^1.2.0",
     "gl-mesh3d": "^2.0.7",
     "gl-plot2d": "^1.4.2",
-    "gl-plot3d": "^1.6.3",
+    "gl-plot3d": "^2.0.0",
     "gl-pointcloud2d": "^1.0.2",
     "gl-scatter3d": "^1.1.6",
     "gl-select-box": "^1.0.3",

package.json

@@ -348,7 +348,10 @@ function handleCamera3d(gd, ev) {
         var scene = fullLayout[sceneId]._scene;
 
         if(attr === 'resetDefault') {
-            aobj[key] = null;
+            aobj[key] = Lib.extendDeep({}, scene.cameraInitial);
+            aobj[key].up = null;
+            aobj[key].eye = null;
+            aobj[key].center = null;
         }
         else if(attr === 'resetLastSave') {
             aobj[key] = Lib.extendDeep({}, scene.cameraInitial);

src/components/modebar/buttons.js

@@ -600,7 +600,10 @@ exports.doCamera = function(gd) {
         var sceneLayout = fullLayout[sceneIds[i]];
         var scene = sceneLayout._scene;
 
-        scene.setCamera(sceneLayout.camera);
+        var cameraData = sceneLayout.camera;
+        var isOrtho = !!(cameraData && cameraData.projection && cameraData.projection.type === 'orthographic');
+
+        scene.setCamera(cameraData, isOrtho);
     }
 };