Merge pull request #3171 from plotly/issue-704_fetch-master

Finalist - Fix to remove webgl warnings resulted from blank texts in scatter3d

Author: archmoj

package-lock.json

@@ -68,7 +68,7 @@
     "d3-force": "^1.0.6",
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",
-    "fast-isnumeric": "^1.1.1",
+    "fast-isnumeric": "^1.1.2",
     "font-atlas-sdf": "^1.3.3",
     "gl-cone3d": "^1.2.0",
     "gl-contour2d": "^1.1.4",
@@ -80,7 +80,7 @@
     "gl-plot2d": "^1.3.1",
     "gl-plot3d": "^1.5.10",
     "gl-pointcloud2d": "^1.0.1",
-    "gl-scatter3d": "^1.0.12",
+    "gl-scatter3d": "^1.0.13",
     "gl-select-box": "^1.0.2",
     "gl-spikes2d": "^1.0.1",
     "gl-streamtube3d": "^1.1.0",

package.json

@@ -0,0 +1,59 @@
+{
+  "data": [
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [0,0,0,0,0,0,0,0,0,0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    },
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [1,1,1,1,1,1,1,1,1,1,1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "text": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    },
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [2,2,2,2,2,2,2,2,2,2,2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "text": [0,1e-3,0.1,"A","B","C","D","E","F","G",null,"I",null,"K","L","M","N",{"text":"X", "value":10.01},"Y","Zzz"],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    },
+    {
+      "x": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19],
+      "y": [3,3,3,3,3,3,3,3,3,3,3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+      "z": [0,1,0,2,0,3,0,4,0,5,0, 6, 0, 7, 0, 8, 0, 9, 0, 10],
+
+      "text": [0,0.0,-0,-0.0,"","0","  ","E","\n","G",null,"I",null,"K",null,null,null,"X"],
+
+      "type": "scatter3d",
+      "mode":"lines+text",
+      "line":{ "width": 5 }
+    }
+
+  ],
+  "layout": {
+    "title":"scatter3d lines with good/bad/no input texts (including undefined, null & blank variations) should be displayed well on WEBGL",
+    "width": 1200,
+    "height": 900,
+    "scene":{
+      "camera":{
+        "eye":{"x":-1.25,"y":1.25,"z":1.25},
+        "center":{"x":0,"y":0,"z":0},
+        "up":{"x":0,"y":0,"z":1}
+      }
+    }
+  }
+}

test/image/baselines/gl3d_scatter3d-blank-text.png

@@ -510,6 +510,27 @@ describe('Test gl3d plots', function() {
         .then(done);
     });
 
+
+    it('@gl should avoid passing blank texts to webgl', function(done) {
+        function assertIsFilled(msg) {
+            var fullLayout = gd._fullLayout;
+            expect(fullLayout.scene._scene.glplot.objects[0].glyphBuffer.length).not.toBe(0, msg);
+        }
+
+        Plotly.plot(gd, [{
+            type: 'scatter3d',
+            mode: 'text',
+            x: [1, 2, 3],
+            y: [2, 3, 1],
+            z: [3, 1, 2]
+        }])
+        .then(function() {
+            assertIsFilled('not to be empty text');
+        })
+        .catch(failTest)
+        .then(done);
+    });
+
 });
 
 describe('Test gl3d modebar handlers', function() {