moved certain condition checks to convert step

Author: archmoj

src/traces/mesh3d/convert.js

@@ -14,6 +14,7 @@ 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');
@@ -91,12 +92,40 @@ function delaunayCells(delaunayaxis, positions) {
     return triangulate(b);
 }
 
+// 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]
+        ) {
+            return false;
+        }
+    }
+    return true;
+}
+
 proto.update = function(data) {
     var scene = this.scene;
     var layout = scene.fullSceneLayout;
 
     this.data = data;
 
+    var numVertices = data.x.length;
+
     var positions = zip3(
         toDataCoords(layout.xaxis, data.x, scene.dataScale[0], data.xcalendar),
         toDataCoords(layout.yaxis, data.y, scene.dataScale[1], data.ycalendar),
@@ -105,6 +134,18 @@ proto.update = function(data) {
 
     var cells;
     if(data.i && data.j && data.k) {
+
+        if(
+            data.i.length !== data.j.length ||
+            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])
+        ) {
+            data.visible = false;
+            return;
+        }
         cells = zip3(
             toIndex(data.i),
             toIndex(data.j),

src/traces/mesh3d/defaults.js

@@ -48,45 +48,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         traceOut.visible = false;
         return;
     }
-
-    // test for size of indices
-    if(
-        traceIn.i && Lib.isArrayOrTypedArray(traceIn.i) &&
-        traceIn.j && Lib.isArrayOrTypedArray(traceIn.j) &&
-        traceIn.k && Lib.isArrayOrTypedArray(traceIn.k)
-    ) {
-        if(traceIn.k.length !== 0 && (
-            traceIn.i.length !== traceIn.j.length ||
-            traceIn.j.length !== traceIn.k.length)) {
-            traceOut.visible = false;
-            return;
-        }
-    }
-
-    var allIndices = readComponents(['i', 'j', 'k']);
-    if(allIndices) {
-        var numVertices = coords[0].length;
-        allIndices.forEach(function(indices) {
-            indices.forEach(function(index) {
-                if(!Lib.isIndex(index, numVertices)) {
-                    traceOut.visible = false;
-                    return;
-                }
-            });
-        });
-
-        var numFaces = allIndices[0].length;
-        for(var q = 0; q < numFaces; q++) {
-            if(
-                allIndices[0][q] === allIndices[1][q] ||
-                allIndices[0][q] === allIndices[2][q] ||
-                allIndices[1][q] === allIndices[2][q]
-            ) {
-                traceOut.visible = false;
-                return;
-            }
-        }
-    }
+    readComponents(['i', 'j', 'k']);
 
     var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleTraceDefaults');
     handleCalendarDefaults(traceIn, traceOut, ['x', 'y', 'z'], layout);

test/jasmine/tests/mesh3d_test.js

@@ -76,7 +76,7 @@ describe('Test mesh3d', function() {
             expect(gd._fullData[0].visible).toBe(exp, msg);
         }
 
-        it('@gl mesh3d should be invisible when the indices are not integer', function(done) {
+        it('@gl mesh3d should be visible when the indices are not integer', function(done) {
             Plotly.plot(gd, [{
                 x: [0, 1, 0.5, 0.5],
                 y: [0, 0.5, 1, 0.5],