diff --git a/devtools/test_dashboard/test_gl3d.js b/devtools/test_dashboard/test_gl3d.js index 902cb8e0305..dce47915ce0 100644 --- a/devtools/test_dashboard/test_gl3d.js +++ b/devtools/test_dashboard/test_gl3d.js @@ -35,5 +35,6 @@ plots['marker-arrays'] = require('@mocks/gl3d_marker-arrays.json'); plots['scatter3d-colorscale'] = require('@mocks/gl3d_scatter3d-colorscale.json'); plots['autocolorscale'] = require('@mocks/gl3d_autocolorscale.json'); plots['nan-holes'] = require('@mocks/gl3d_nan-holes.json'); +plots['tetrahedra'] = require('@mocks/gl3d_tet.json'); plotButtons(plots, figDir); diff --git a/src/traces/mesh3d/convert.js b/src/traces/mesh3d/convert.js index 22fabd640f4..12f4297ce84 100644 --- a/src/traces/mesh3d/convert.js +++ b/src/traces/mesh3d/convert.js @@ -123,13 +123,13 @@ proto.update = function(data) { config.vertexIntensity = data.intensity; config.colormap = parseColorScale(data.colorscale); } - else if(data.vertexColor) { - this.color = data.vertexColor[0]; - config.vertexColors = parseColorArray(data.vertexColor); + else if(data.vertexcolor) { + this.color = data.vertexcolors[0]; + config.vertexColors = parseColorArray(data.vertexcolor); } - else if(data.faceColor) { - this.color = data.faceColor[0]; - config.cellColors = parseColorArray(data.faceColor); + else if(data.facecolor) { + this.color = data.facecolor[0]; + config.cellColors = parseColorArray(data.facecolor); } else { this.color = data.color; diff --git a/src/traces/mesh3d/defaults.js b/src/traces/mesh3d/defaults.js index 36c09511e6d..03ec5559900 100644 --- a/src/traces/mesh3d/defaults.js +++ b/src/traces/mesh3d/defaults.js @@ -72,8 +72,8 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout else { traceOut.showscale = false; - if('vertexColor' in traceIn) coerce('vertexColor'); - else if('faceColor' in traceIn) coerce('faceColor'); + if('vertexcolor' in traceIn) coerce('vertexcolor'); + else if('facecolor' in traceIn) coerce('facecolor'); else coerce('color', defaultColor); } diff --git a/test/image/baselines/gl3d_tet.png b/test/image/baselines/gl3d_tet.png new file mode 100644 index 00000000000..d780f943827 Binary files /dev/null and b/test/image/baselines/gl3d_tet.png differ diff --git a/test/image/mocks/gl3d_tet.json b/test/image/mocks/gl3d_tet.json new file mode 100644 index 00000000000..0876e77b435 --- /dev/null +++ b/test/image/mocks/gl3d_tet.json @@ -0,0 +1,21 @@ +{ + "data": [ + { + "type":"mesh3d", + "y":[0, 0, 1, 2], + "x":[0, 1, 2, 0], + "z":[0, 2, 0, 1], + "i":[0, 0, 0, 1], + "j":[1, 2, 3, 2], + "k":[2, 3, 1, 3], + "facecolors": [ + "rgb(0, 0, 0)", + "rgb(255, 0, 0)", + "rgb(0, 255, 0)", + "rgb(0, 0, 255)" + ] + }], + "layout": { + "title": "Tetrahedra" + } +}