Merge pull request #3369 from plotly/2630-mesh3d-dont-modify-messy-data

Mesh3d cell data checks

Author: archmoj

src/traces/mesh3d/convert.js

@@ -52,7 +52,53 @@ proto.handlePick = function(selection) {
 };
 
 function parseColorArray(colors) {
-    return colors.map(str2RgbaArray);
+    var b = [];
+    var len = colors.length;
+    for(var i = 0; i < len; i++) {
+        b[i] = str2RgbaArray(colors[i]);
+    }
+    return b;
+}
+
+// Unpack position data
+function toDataCoords(axis, coord, scale, calendar) {
+    var b = [];
+    var len = coord.length;
+    for(var i = 0; i < len; i++) {
+        b[i] = axis.d2l(coord[i], 0, calendar) * scale;
+    }
+    return b;
+}
+
+// Round indices if passed as floats
+function toRoundIndex(a) {
+    var b = [];
+    var len = a.length;
+    for(var i = 0; i < len; i++) {
+        b[i] = Math.round(a[i]);
+    }
+    return b;
+}
+
+function delaunayCells(delaunayaxis, positions) {
+    var d = ['x', 'y', 'z'].indexOf(delaunayaxis);
+    var b = [];
+    var len = positions.length;
+    for(var i = 0; i < len; i++) {
+        b[i] = [positions[i][(d + 1) % 3], positions[i][(d + 2) % 3]];
+    }
+    return triangulate(b);
+}
+
+// Validate indices
+function hasValidIndices(list, numVertices) {
+    var len = list.length;
+    for(var i = 0; i < len; i++) {
+        if(list[i] <= -0.5 || list[i] >= numVertices - 0.5) { // Note: the indices would be rounded -0.49 is valid.
+            return false;
+        }
+    }
+    return true;
 }
 
 proto.update = function(data) {
@@ -61,33 +107,37 @@ proto.update = function(data) {
 
     this.data = data;
 
-    // Unpack position data
-    function toDataCoords(axis, coord, scale, calendar) {
-        return coord.map(function(x) {
-            return axis.d2l(x, 0, calendar) * scale;
-        });
-    }
+    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),
-        toDataCoords(layout.zaxis, data.z, scene.dataScale[2], data.zcalendar));
+        toDataCoords(layout.zaxis, data.z, scene.dataScale[2], data.zcalendar)
+    );
 
     var cells;
     if(data.i && data.j && data.k) {
-        cells = zip3(data.i, data.j, data.k);
-    }
-    else if(data.alphahull === 0) {
+
+        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)
+        ) {
+            return;
+        }
+        cells = zip3(
+            toRoundIndex(data.i),
+            toRoundIndex(data.j),
+            toRoundIndex(data.k)
+        );
+    } else if(data.alphahull === 0) {
         cells = convexHull(positions);
-    }
-    else if(data.alphahull > 0) {
+    } else if(data.alphahull > 0) {
         cells = alphaShape(data.alphahull, positions);
-    }
-    else {
-        var d = ['x', 'y', 'z'].indexOf(data.delaunayaxis);
-        cells = triangulate(positions.map(function(c) {
-            return [c[(d + 1) % 3], c[(d + 2) % 3]];
-        }));
+    } else {
+        cells = delaunayCells(data.delaunayaxis, positions);
     }
 
     var config = {
@@ -113,16 +163,13 @@ proto.update = function(data) {
         config.vertexIntensity = data.intensity;
         config.vertexIntensityBounds = [data.cmin, data.cmax];
         config.colormap = parseColorScale(data.colorscale);
-    }
-    else if(data.vertexcolor) {
+    } else if(data.vertexcolor) {
         this.color = data.vertexcolor[0];
         config.vertexColors = parseColorArray(data.vertexcolor);
-    }
-    else if(data.facecolor) {
+    } else if(data.facecolor) {
         this.color = data.facecolor[0];
         config.cellColors = parseColorArray(data.facecolor);
-    }
-    else {
+    } else {
         this.color = data.color;
         config.meshColor = str2RgbaArray(data.color);
     }

src/traces/mesh3d/defaults.js

@@ -34,18 +34,20 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
     }
 
     var coords = readComponents(['x', 'y', 'z']);
-    var indices = readComponents(['i', 'j', 'k']);
-
     if(!coords) {
         traceOut.visible = false;
         return;
     }
 
-    if(indices) {
-        // otherwise, convert all face indices to ints
-        indices.forEach(function(index) {
-            for(var i = 0; i < index.length; ++i) index[i] |= 0;
-        });
+    readComponents(['i', 'j', 'k']);
+    // three indices should be all provided or not
+    if(
+        (traceOut.i && (!traceOut.j || !traceOut.k)) ||
+        (traceOut.j && (!traceOut.k || !traceOut.i)) ||
+        (traceOut.k && (!traceOut.i || !traceOut.j))
+    ) {
+        traceOut.visible = false;
+        return;
     }
 
     var handleCalendarDefaults = Registry.getComponentMethod('calendars', 'handleTraceDefaults');