Merge pull request #3141 from plotly/rev-bounds3d_fetched-master

Supporting reversed ranges in 3d scenes - upgrade of various gl-vis modules - resolves issue #1940
plotly · Oct 24, 2018 · 581890c · 581890c
2 parents 94c9d98 + 1b08a4c
commit 581890c
Show file tree

Hide file tree

Showing 9 changed files with 373 additions and 35 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -70,21 +70,21 @@
     "es6-promise": "^3.0.2",
     "fast-isnumeric": "^1.1.1",
     "font-atlas-sdf": "^1.3.3",
-    "gl-cone3d": "^1.1.0",
+    "gl-cone3d": "^1.2.0",
     "gl-contour2d": "^1.1.4",
-    "gl-error3d": "^1.0.7",
+    "gl-error3d": "^1.0.8",
     "gl-heatmap2d": "^1.0.4",
-    "gl-line3d": "^1.1.2",
+    "gl-line3d": "^1.1.3",
     "gl-mat4": "^1.2.0",
-    "gl-mesh3d": "^2.0.0",
+    "gl-mesh3d": "^2.0.1",
     "gl-plot2d": "^1.3.1",
     "gl-plot3d": "^1.5.10",
     "gl-pointcloud2d": "^1.0.1",
-    "gl-scatter3d": "^1.0.11",
+    "gl-scatter3d": "^1.0.12",
     "gl-select-box": "^1.0.2",
     "gl-spikes2d": "^1.0.1",
-    "gl-streamtube3d": "^1.0.0",
-    "gl-surface3d": "^1.3.5",
+    "gl-streamtube3d": "^1.1.0",
+    "gl-surface3d": "^1.3.6",
     "gl-text": "^1.1.6",
     "glslify": "^6.3.1",
     "has-hover": "^1.0.1",

diff --git a/src/plots/gl3d/scene.js b/src/plots/gl3d/scene.js
@@ -435,16 +435,11 @@ proto.plot = function(sceneData, fullLayout, layout) {
     }
     var dataScale = [1, 1, 1];
     for(j = 0; j < 3; ++j) {
-        if(dataBounds[0][j] > dataBounds[1][j]) {
+        if(dataBounds[1][j] === dataBounds[0][j]) {
             dataScale[j] = 1.0;
         }
         else {
-            if(dataBounds[1][j] === dataBounds[0][j]) {
-                dataScale[j] = 1.0;
-            }
-            else {
-                dataScale[j] = 1.0 / (dataBounds[1][j] - dataBounds[0][j]);
-            }
+            dataScale[j] = 1.0 / (dataBounds[1][j] - dataBounds[0][j]);
         }
     }
 
@@ -560,6 +555,13 @@ proto.plot = function(sceneData, fullLayout, layout) {
                 sceneBounds[0][i] -= d / 32.0;
                 sceneBounds[1][i] += d / 32.0;
             }
+
+            if(axis.autorange === 'reversed') {
+                // swap bounds:
+                var tmp = sceneBounds[0][i];
+                sceneBounds[0][i] = sceneBounds[1][i];
+                sceneBounds[1][i] = tmp;
+            }
         } else {
             var range = axis.range;
             sceneBounds[0][i] = axis.r2l(range[0]);

diff --git a/test/image/baselines/gl3d_cone-newplot_reversed_ranges.png b/test/image/baselines/gl3d_cone-newplot_reversed_ranges.png
diff --git a/...aselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png b/...aselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png
diff --git a/test/image/baselines/gl3d_streamtube_reversed_ranges.png b/test/image/baselines/gl3d_streamtube_reversed_ranges.png
diff --git a/test/image/mocks/gl3d_cone-newplot_reversed_ranges.json b/test/image/mocks/gl3d_cone-newplot_reversed_ranges.json
@@ -0,0 +1,147 @@
+{
+  "data": [
+    {
+      "x": [
+        0.2
+      ],
+      "y": [
+        0.4
+      ],
+      "z": [
+        -0.6
+      ],
+      "u": [
+        1
+      ],
+      "v": [
+        1
+      ],
+      "w": [
+        0
+      ],
+      "type": "cone"
+    },
+    {
+      "x": [
+        0.4
+      ],
+      "y": [
+        -0.6
+      ],
+      "z": [
+        0.2
+      ],
+      "u": [
+        1
+      ],
+      "v": [
+        0
+      ],
+      "w": [
+        1
+      ],
+      "type": "cone"
+    },
+    {
+      "x": [
+        -0.6
+      ],
+      "y": [
+        0.2
+      ],
+      "z": [
+        0.4
+      ],
+      "u": [
+        0
+      ],
+      "v": [
+        1
+      ],
+      "w": [
+        1
+      ],
+      "type": "cone"
+    },
+    {
+      "x": [
+        -0.2
+      ],
+      "y": [
+        -0.4
+      ],
+      "z": [
+        0.6
+      ],
+      "u": [
+        -1
+      ],
+      "v": [
+        -1
+      ],
+      "w": [
+        0
+      ],
+      "type": "cone"
+    },
+    {
+      "x": [
+        -0.4
+      ],
+      "y": [
+        0.6
+      ],
+      "z": [
+        -0.2
+      ],
+      "u": [
+        -1
+      ],
+      "v": [
+        0
+      ],
+      "w": [
+        -1
+      ],
+      "type": "cone"
+    },
+    {
+      "x": [
+        0.6
+      ],
+      "y": [
+        -0.2
+      ],
+      "z": [
+        -0.4
+      ],
+      "u": [
+        0
+      ],
+      "v": [
+        -1
+      ],
+      "w": [
+        -1
+      ],
+      "type": "cone"
+    }
+  ],
+  "layout": {
+    "height": 758,
+    "width": 1310,
+    "title": "Cone objects with Y-axis using autorange: 'reversed'",
+    "scene": {
+      "yaxis": {
+        "autorange": "reversed"
+      },
+      "camera": {
+        "eye": {
+          "x": 1,
+          "y": -1.5,
+          "z": 1.25
+        }
+      }
+    }
+  }
+}