pass 2 removed some extra checks

Author: archmoj

src/traces/mesh3d/convert.js

@@ -14,7 +14,6 @@ var triangulate = require('delaunay-triangulate');
 var alphaShape = require('alpha-shape');
 var convexHull = require('convex-hull');
 
-var isIndex = require('../../lib').isIndex;
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var str2RgbaArray = require('../../lib/str2rgbarray');
 var zip3 = require('../../plots/gl3d/zip3');
@@ -71,8 +70,8 @@ function toDataCoords(axis, coord, scale, calendar) {
     return b;
 }
 
-// round indices if passed as floats
-function toIndex(a) {
+// Round indices if passed as floats
+function toRoundIndex(a) {
     var b = [];
     var len = a.length;
     for(var i = 0; i < len; i++) {
@@ -81,7 +80,6 @@ function toIndex(a) {
     return b;
 }
 
-// create cells
 function delaunayCells(delaunayaxis, positions) {
     var d = ['x', 'y', 'z'].indexOf(delaunayaxis);
     var b = [];
@@ -92,26 +90,11 @@ function delaunayCells(delaunayaxis, positions) {
     return triangulate(b);
 }
 
-// validate indices
+// Validate indices
 function hasValidIndices(list, numVertices) {
     var len = list.length;
     for(var i = 0; i < len; i++) {
-        if(!isIndex(list[i], numVertices)) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// avoid pointing to an identical vertex twice
-function isTriangle(lists) {
-    var len = lists[0].length;
-    for(var i = 0; i < len; i++) {
-        if(
-            lists[0][i] === lists[1][i] ||
-            lists[1][i] === lists[2][i] ||
-            lists[2][i] === lists[0][i]
-        ) {
+        if(list[i] < 0 || list[i] >= numVertices) {
             return false;
         }
     }
@@ -140,16 +123,14 @@ proto.update = function(data) {
             data.j.length !== data.k.length ||
             !hasValidIndices(data.i, numVertices) ||
             !hasValidIndices(data.j, numVertices) ||
-            !hasValidIndices(data.k, numVertices) ||
-            !isTriangle([data.i, data.j, data.k])
+            !hasValidIndices(data.k, numVertices)
         ) {
-            data.visible = false;
             return;
         }
         cells = zip3(
-            toIndex(data.i),
-            toIndex(data.j),
-            toIndex(data.k)
+            toRoundIndex(data.i),
+            toRoundIndex(data.j),
+            toRoundIndex(data.k)
         );
     } else if(data.alphahull === 0) {
         cells = convexHull(positions);

test/jasmine/tests/mesh3d_test.js

@@ -82,18 +82,18 @@ describe('Test mesh3d', function() {
                 y: [0, 0.5, 1, 0.5],
                 z: [0, 0.5, 0.5, 1],
                 i: [0, 0, 0, 1.00001],
-                j: [1, 1, 2, 2],
-                k: [2, 3, 3, 2.99999],
+                j: [1, 1, 2, 1.99999],
+                k: [2, 3, 3, 3.00001],
                 type: 'mesh3d'
             }])
             .then(function() {
-                assertVisibility(false, 'not to be visible');
+                assertVisibility(true, 'to be visible');
             })
             .catch(failTest)
             .then(done);
         });
 
-        it('@gl mesh3d should be invisible when the indices are equal or greater than the number of vertices', function(done) {
+        it('@gl mesh3d should be visible when the indices are equal or greater than the number of vertices', function(done) {
             Plotly.plot(gd, [{
                 x: [0, 1, 0.5, 0.5],
                 y: [0, 0.5, 1, 0.5],
@@ -104,13 +104,13 @@ describe('Test mesh3d', function() {
                 type: 'mesh3d'
             }])
             .then(function() {
-                assertVisibility(false, 'not to be visible');
+                assertVisibility(true, 'to be visible');
             })
             .catch(failTest)
             .then(done);
         });
 
-        it('@gl mesh3d should be invisible when the indices are negative', function(done) {
+        it('@gl mesh3d should be visible when the indices are negative', function(done) {
             Plotly.plot(gd, [{
                 x: [0, 1, 0.5, 0.5],
                 y: [0, 0.5, 1, 0.5],
@@ -121,13 +121,13 @@ describe('Test mesh3d', function() {
                 type: 'mesh3d'
             }])
             .then(function() {
-                assertVisibility(false, 'not to be visible');
+                assertVisibility(true, 'to be visible');
             })
             .catch(failTest)
             .then(done);
         });
 
-        it('@gl mesh3d should be invisible when the indices have different sizes', function(done) {
+        it('@gl mesh3d should be visible when the indices have different sizes', function(done) {
             Plotly.plot(gd, [{
                 x: [0, 1, 0.5, 0.5],
                 y: [0, 0.5, 1, 0.5],
@@ -138,24 +138,7 @@ describe('Test mesh3d', function() {
                 type: 'mesh3d'
             }])
             .then(function() {
-                assertVisibility(false, 'not to be visible');
-            })
-            .catch(failTest)
-            .then(done);
-        });
-
-        it('@gl mesh3d should be invisible when the indices of a triangle point to identical vertex twice', function(done) {
-            Plotly.plot(gd, [{
-                x: [0, 1, 0.5, 0.5],
-                y: [0, 0.5, 1, 0.5],
-                z: [0, 0.5, 0.5, 1],
-                i: [0, 0, 0, 1],
-                j: [1, 1, 2, 3],
-                k: [2, 3, 3, 3],
-                type: 'mesh3d'
-            }])
-            .then(function() {
-                assertVisibility(false, 'not to be visible');
+                assertVisibility(true, 'to be visible');
             })
             .catch(failTest)
             .then(done);
@@ -222,6 +205,23 @@ describe('Test mesh3d', function() {
             .catch(failTest)
             .then(done);
         });
+
+        it('@gl mesh3d should be visible when values are passed in string format', function(done) {
+            Plotly.plot(gd, [{
+                x: ['0', '1', '0.5', '0.5'],
+                y: ['0', '0.5', '1', '0.5'],
+                z: ['0', '0.5', '0.5', '1'],
+                i: ['0', '0', '0', '1'],
+                j: ['1', '1', '2', '2'],
+                k: ['2', '3', '3', '3'],
+                type: 'mesh3d'
+            }]).then(function() {
+                assertVisibility(true, 'not to be visible');
+            })
+            .catch(failTest)
+            .then(done);
+        });
+
     });
 
 });