Revert "filter gl3d alpha from rgba result when having only rgb"

This reverts commit 1f38246.

Author: archmoj

src/lib/gl_format_color.js

@@ -16,35 +16,20 @@ var Colorscale = require('../components/colorscale');
 var colorDflt = require('../components/color/attributes').defaultLine;
 var isArrayOrTypedArray = require('./array').isArrayOrTypedArray;
 
-function filterRGBA(colorIn, desiredType) {
-    var colorOut = rgba(colorIn, desiredType);
-
-    if(typeof colorIn === 'string' &&
-        !colorIn.indexOf('rgb') &&
-        colorIn.indexOf('rgba')
-    ) {
-        // drop alpha if not having rgb
-        colorOut = [colorOut[0], colorOut[1], colorOut[2]];
-    }
-    return colorOut;
-}
-
-var colorDfltRgba = filterRGBA(colorDflt);
+var colorDfltRgba = rgba(colorDflt);
 var opacityDflt = 1;
 
 function calculateColor(colorIn, opacityIn) {
     var colorOut = colorIn;
-
-    if(colorOut.length > 3) colorOut[3] *= opacityIn;
-    else if(opacityIn < 1) colorOut[3] = opacityIn;
-
+    colorOut[3] *= opacityIn;
     return colorOut;
 }
 
 function validateColor(colorIn) {
     if(isNumeric(colorIn)) return colorDfltRgba;
 
-    var colorOut = filterRGBA(colorIn);
+    var colorOut = rgba(colorIn);
+
     return colorOut.length ? colorOut : colorDfltRgba;
 }
 
@@ -69,7 +54,7 @@ function formatColor(containerIn, opacityIn, len) {
     if(isArrayColorIn) {
         getColor = function(c, i) {
             // FIXME: there is double work, considering that sclFunc does the opposite
-            return c[i] === undefined ? colorDfltRgba : filterRGBA(sclFunc(c[i]));
+            return c[i] === undefined ? colorDfltRgba : rgba(sclFunc(c[i]));
         };
     } else getColor = validateColor;
 
@@ -85,7 +70,7 @@ function formatColor(containerIn, opacityIn, len) {
             opacityi = getOpacity(opacityIn, i);
             colorOut[i] = calculateColor(colori, opacityi);
         }
-    } else colorOut = calculateColor(filterRGBA(colorIn), opacityIn);
+    } else colorOut = calculateColor(rgba(colorIn), opacityIn);
 
     return colorOut;
 }
@@ -111,7 +96,6 @@ function parseColorScale(cont, alpha) {
 }
 
 module.exports = {
-    filterRGBA: filterRGBA,
     formatColor: formatColor,
     parseColorScale: parseColorScale
 };

src/traces/scattergl/convert.js

@@ -10,12 +10,13 @@
 
 var isNumeric = require('fast-isnumeric');
 var svgSdf = require('svg-path-sdf');
+var rgba = require('color-normalize');
 
 var Registry = require('../../registry');
 var Lib = require('../../lib');
 var Drawing = require('../../components/drawing');
 var AxisIDs = require('../../plots/cartesian/axis_ids');
-var filterRGBA = require('../../lib/gl_format_color').filterRGBA;
+
 var formatColor = require('../../lib/gl_format_color').formatColor;
 var subTypes = require('../scatter/subtypes');
 var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
@@ -228,12 +229,12 @@ function convertMarkerStyle(trace) {
         optsOut.opacity = trace.opacity;
     } else {
         if(isOpen) {
-            optsOut.color = filterRGBA(optsIn.color, 'uint8');
+            optsOut.color = rgba(optsIn.color, 'uint8');
             optsOut.color[3] = 0;
-            optsOut.borderColor = filterRGBA(optsIn.color, 'uint8');
+            optsOut.borderColor = rgba(optsIn.color, 'uint8');
         } else {
-            optsOut.color = filterRGBA(optsIn.color, 'uint8');
-            optsOut.borderColor = filterRGBA(optsIn.line.color, 'uint8');
+            optsOut.color = rgba(optsIn.color, 'uint8');
+            optsOut.borderColor = rgba(optsIn.line.color, 'uint8');
         }
 
         optsOut.opacity = trace.opacity * optsIn.opacity;