fix and 🔒 coloraxis for gl3d traces

Author: etpinard

src/lib/gl_format_color.js

@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var isNumeric = require('fast-isnumeric');
@@ -79,9 +78,11 @@ function formatColor(containerIn, opacityIn, len) {
 function parseColorScale(cont, alpha) {
     if(alpha === undefined) alpha = 1;
 
-    var colorscale = cont.reversescale ?
-        Colorscale.flipScale(cont.colorscale) :
-        cont.colorscale;
+    var cOpts = Colorscale.extractOpts(cont);
+
+    var colorscale = cOpts.reversescale ?
+        Colorscale.flipScale(cOpts.colorscale) :
+        cOpts.colorscale;
 
     return colorscale.map(function(elem) {
         var index = elem[0];

src/traces/cone/convert.js

@@ -13,6 +13,7 @@ var createConeMesh = require('gl-cone3d').createConeMesh;
 
 var simpleMap = require('../../lib').simpleMap;
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
+var extractOpts = require('../../components/colorscale').extractOpts;
 var zip3 = require('../../plots/gl3d/zip3');
 
 function Cone(scene, uid) {
@@ -80,8 +81,9 @@ function convert(scene, trace) {
         trace._len
     );
 
+    var cOpts = extractOpts(trace);
     coneOpts.colormap = parseColorScale(trace);
-    coneOpts.vertexIntensityBounds = [trace.cmin / trace._normMax, trace.cmax / trace._normMax];
+    coneOpts.vertexIntensityBounds = [cOpts.min / trace._normMax, cOpts.max / trace._normMax];
     coneOpts.coneOffset = anchor2coneOffset[trace.anchor];
 
     if(trace.sizemode === 'scaled') {

src/traces/isosurface/convert.js

@@ -6,15 +6,16 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var createMesh = require('gl-mesh3d');
 
+var Lib = require('../../lib');
+
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var str2RgbaArray = require('../../lib/str2rgbarray');
+var extractOpts = require('../../components/colorscale').extractOpts;
 var zip3 = require('../../plots/gl3d/zip3');
-var Lib = require('../../lib');
 
 function distinctVals(col) {
     return Lib.distinctVals(col).vals;
@@ -121,8 +122,9 @@ proto.update = function(data) {
         useFacetNormals: data.flatshading
     };
 
+    var cOpts = extractOpts(data);
     config.vertexIntensity = data._intensity;
-    config.vertexIntensityBounds = [data.cmin, data.cmax];
+    config.vertexIntensityBounds = [cOpts.min, cOpts.max];
     config.colormap = parseColorScale(data);
 
     // Update mesh

src/traces/mesh3d/convert.js

@@ -6,7 +6,6 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var createMesh = require('gl-mesh3d');
@@ -16,6 +15,7 @@ var convexHull = require('convex-hull');
 
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var str2RgbaArray = require('../../lib/str2rgbarray');
+var extractOpts = require('../../components/colorscale').extractOpts;
 var zip3 = require('../../plots/gl3d/zip3');
 
 function Mesh3DTrace(scene, mesh, uid) {
@@ -158,9 +158,10 @@ proto.update = function(data) {
     };
 
     if(data.intensity) {
+        var cOpts = extractOpts(data);
         this.color = '#fff';
         config.vertexIntensity = data.intensity;
-        config.vertexIntensityBounds = [data.cmin, data.cmax];
+        config.vertexIntensityBounds = [cOpts.min, cOpts.max];
         config.colormap = parseColorScale(data);
     } else if(data.vertexcolor) {
         this.color = data.vertexcolor[0];

src/traces/streamtube/convert.js

@@ -13,6 +13,7 @@ var createTubeMesh = tube2mesh.createTubeMesh;
 
 var Lib = require('../../lib');
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
+var extractOpts = require('../../components/colorscale').extractOpts;
 var zip3 = require('../../plots/gl3d/zip3');
 
 var axisName2scaleIndex = {xaxis: 0, yaxis: 1, zaxis: 2};
@@ -177,7 +178,8 @@ function convert(scene, trace) {
     // N.B. cmin/cmax correspond to the min/max vector norm
     // in the u/v/w arrays, which in general is NOT equal to max
     // intensity that colors the tubes.
-    meshData.vertexIntensityBounds = [trace.cmin / trace._normMax, trace.cmax / trace._normMax];
+    var cOpts = extractOpts(trace);
+    meshData.vertexIntensityBounds = [cOpts.min / trace._normMax, cOpts.max / trace._normMax];
 
     // pass gl-mesh3d lighting attributes
     var lp = trace.lightposition;

src/traces/surface/convert.js

@@ -18,6 +18,7 @@ var fill = require('ndarray-fill');
 var isArrayOrTypedArray = require('../../lib').isArrayOrTypedArray;
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var str2RgbaArray = require('../../lib/str2rgbarray');
+var extractOpts = require('../../components/colorscale').extractOpts;
 
 var interp2d = require('../heatmap/interp2d');
 var findEmpties = require('../heatmap/find_empties');
@@ -534,7 +535,8 @@ proto.update = function(data) {
         opacity: data.opacity
     };
 
-    params.intensityBounds = [data.cmin, data.cmax];
+    var cOpts = extractOpts(data);
+    params.intensityBounds = [cOpts.min, cOpts.max];
 
     // Refine surface color if necessary
     if(data.surfacecolor) {

src/traces/volume/convert.js

@@ -6,13 +6,13 @@
 * LICENSE file in the root directory of this source tree.
 */
 
-
 'use strict';
 
 var createMesh = require('gl-mesh3d');
 
 var parseColorScale = require('../../lib/gl_format_color').parseColorScale;
 var str2RgbaArray = require('../../lib/str2rgbarray');
+var extractOpts = require('../../components/colorscale').extractOpts;
 var zip3 = require('../../plots/gl3d/zip3');
 
 var findNearestOnAxis = require('../isosurface/convert').findNearestOnAxis;
@@ -103,8 +103,9 @@ proto.update = function(data) {
         useFacetNormals: data.flatshading
     };
 
+    var cOpts = extractOpts(data);
     config.vertexIntensity = data._intensity;
-    config.vertexIntensityBounds = [data.cmin, data.cmax];
+    config.vertexIntensityBounds = [cOpts.min, cOpts.max];
     config.colormap = parseColorScale(data);
 
     // Update mesh