diff --git a/package-lock.json b/package-lock.json
index fa44b391d9b..63504c24c3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1762,11 +1762,11 @@
}
},
"color-alpha": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/color-alpha/-/color-alpha-1.0.3.tgz",
- "integrity": "sha512-ap5UCPpnpsSQu09ccl/5cNQDJlSFvkuXHMBY1+1vu6iKj6H9zw7Sz852snsETFsrYlPUnvTByCFAnYVynKJb9A==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/color-alpha/-/color-alpha-1.0.4.tgz",
+ "integrity": "sha512-lr8/t5NPozTSqli+duAN+x+no/2WaKTeWvxhHGN+aXT6AJ8vPlzLa7UriyjWak0pSC2jHol9JgjBYnnHsGha9A==",
"requires": {
- "color-parse": "^1.2.0"
+ "color-parse": "^1.3.8"
}
},
"color-convert": {
@@ -1793,24 +1793,24 @@
}
},
"color-name": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"color-normalize": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/color-normalize/-/color-normalize-1.3.0.tgz",
- "integrity": "sha512-BfOC/x9Q7bmrR1t/Mflfr9c4ZEbr3B+Sz3pWNG6xkcB8mFtF8z32MStJK0NSBmFVhHtFlfXQKOYC/ADbqmxHzg==",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/color-normalize/-/color-normalize-1.5.0.tgz",
+ "integrity": "sha512-rUT/HDXMr6RFffrR53oX3HGWkDOP9goSAQGBkUaAYKjOE2JxozccdGyufageWDlInRAjm/jYPrf/Y38oa+7obw==",
"requires": {
"clamp": "^1.0.1",
- "color-rgba": "^2.1.0",
+ "color-rgba": "^2.1.1",
"dtype": "^2.0.0"
}
},
"color-parse": {
- "version": "1.3.7",
- "resolved": "https://registry.npmjs.org/color-parse/-/color-parse-1.3.7.tgz",
- "integrity": "sha512-8G6rPfyTZhWYKU7D2hwywTjA4YlqX/Z7ClqTEzh5ENc5QkLOff0u8EuyNZR6xScEBhWpAyiDrrVGNUE/Btg2LA==",
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/color-parse/-/color-parse-1.3.8.tgz",
+ "integrity": "sha512-1Y79qFv0n1xair3lNMTNeoFvmc3nirMVBij24zbs1f13+7fPpQClMg5b4AuKXLt3szj7BRlHMCXHplkce6XlmA==",
"requires": {
"color-name": "^1.0.0",
"defined": "^1.0.0",
@@ -1818,12 +1818,12 @@
}
},
"color-rgba": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/color-rgba/-/color-rgba-2.1.0.tgz",
- "integrity": "sha512-yAmMouVOLRAtYJwP52qymiscIMpw2g7VO82pkW+a88BpW1AZ+O6JDxAAojLljGO0pQkkvZLLN9oQNTEgT+RFiw==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/color-rgba/-/color-rgba-2.1.1.tgz",
+ "integrity": "sha512-VaX97wsqrMwLSOR6H7rU1Doa2zyVdmShabKrPEIFywLlHoibgD3QW9Dw6fSqM4+H/LfjprDNAUUW31qEQcGzNw==",
"requires": {
"clamp": "^1.0.1",
- "color-parse": "^1.3.7",
+ "color-parse": "^1.3.8",
"color-space": "^1.14.6"
}
},
@@ -3369,6 +3369,7 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+ "dev": true,
"requires": {
"d": "1",
"es5-ext": "^0.10.14",
@@ -5189,27 +5190,48 @@
}
},
"gl-text": {
- "version": "1.1.6",
- "resolved": "https://registry.npmjs.org/gl-text/-/gl-text-1.1.6.tgz",
- "integrity": "sha512-OB+Nc5JKO1gyYYqBOJrYvCvRXIecfVpIKP7AviQNY63jrWPM9hUFSwZG7sH/paVnR1yCZBVirqOPfiFeF1Qo4g==",
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/gl-text/-/gl-text-1.1.7.tgz",
+ "integrity": "sha512-dEvuxqjgfWI3OeA4GwJ7ERFZEJbo6M/Bqn438L4T+xCuCbIFO0s12WUu3DVy+UyKHXLTVPWLcZKLpzVp8nNZoA==",
"requires": {
"bit-twiddle": "^1.0.2",
- "color-normalize": "^1.1.0",
+ "color-normalize": "^1.5.0",
"css-font": "^1.2.0",
"detect-kerning": "^2.1.2",
- "es6-weak-map": "^2.0.2",
+ "es6-weak-map": "^2.0.3",
"flatten-vertex-data": "^1.0.2",
"font-atlas": "^2.1.0",
"font-measure": "^1.2.2",
- "gl-util": "^3.0.7",
+ "gl-util": "^3.1.2",
"is-plain-obj": "^1.1.0",
"object-assign": "^4.1.1",
"parse-rect": "^1.2.0",
"parse-unit": "^1.0.1",
"pick-by-alias": "^1.2.0",
- "regl": "^1.3.6",
- "to-px": "^1.0.1",
+ "regl": "^1.3.11",
+ "to-px": "^1.1.0",
"typedarray-pool": "^1.1.0"
+ },
+ "dependencies": {
+ "es6-weak-map": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+ "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+ "requires": {
+ "d": "1",
+ "es5-ext": "^0.10.46",
+ "es6-iterator": "^2.0.3",
+ "es6-symbol": "^3.1.1"
+ }
+ },
+ "to-px": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/to-px/-/to-px-1.1.0.tgz",
+ "integrity": "sha512-bfg3GLYrGoEzrGoE05TAL/Uw+H/qrf2ptr9V3W7U0lkjjyYnIfgxmVLUfhQ1hZpIQwin81uxhDjvUkDYsC0xWw==",
+ "requires": {
+ "parse-unit": "^1.0.1"
+ }
+ }
}
},
"gl-texture2d": {
@@ -5223,17 +5245,17 @@
}
},
"gl-util": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/gl-util/-/gl-util-3.0.8.tgz",
- "integrity": "sha512-UPKIeAbWU/TNCWZNlpvR2r9TCojhSTA11cSWTqsRNkxg6V1+PXmyyYkldGJGGAkGi8kRUNRbPaoj0U12BslzdQ==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/gl-util/-/gl-util-3.1.2.tgz",
+ "integrity": "sha512-8czWhGTGp/H4S35X1UxGbFlJ1hjtTFhm2mc85GcymEi1CDf633WJgtkCddEiSjIa4BnNxBrqOIhj6jlF6naPqw==",
"requires": {
- "es6-weak-map": "^2.0.2",
"is-browser": "^2.0.1",
"is-firefox": "^1.0.3",
"is-plain-obj": "^1.1.0",
"number-is-integer": "^1.0.1",
"object-assign": "^4.1.0",
- "pick-by-alias": "^1.2.0"
+ "pick-by-alias": "^1.2.0",
+ "weak-map": "^1.0.5"
}
},
"gl-vao": {
@@ -8375,9 +8397,9 @@
}
},
"parenthesis": {
- "version": "3.1.5",
- "resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.5.tgz",
- "integrity": "sha512-9KbfUp3+gD0MIl4AGfLBwVNvcPf1fokUJtYxql511chVNnS8DrYFazqBfZDqD4GV76XUhQbbxmZJPPOsV4GIbw=="
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/parenthesis/-/parenthesis-3.1.6.tgz",
+ "integrity": "sha512-2fobSoJQTFoIKJ2kXw8QupNtKJ93lNwRgwBxf8YxMNWnWwvMVzqs/baseqWhHP1bRQGf0cv75UtO71nUO5dFuA=="
},
"parents": {
"version": "1.0.1",
@@ -9266,50 +9288,68 @@
"integrity": "sha512-tmt6CRhRqbcsYDWNwv+iG7GGOXdgoOBC7lKzoPMgnzpt3WKBQ3c8i7AxgbvTRZzty29hrW92fAJeZkPFQehfWA=="
},
"regl-error2d": {
- "version": "2.0.7",
- "resolved": "https://registry.npmjs.org/regl-error2d/-/regl-error2d-2.0.7.tgz",
- "integrity": "sha512-YCXlu3BIDpR1hsU8HqMn+SiRldevdP2gIFNpaOdBSV2PEJsMmDHo532elzU2K3sB7heDqZzXuY66CfYRL89oDg==",
+ "version": "2.0.8",
+ "resolved": "https://registry.npmjs.org/regl-error2d/-/regl-error2d-2.0.8.tgz",
+ "integrity": "sha512-5nszdicXbimRUnYB42i+O7KPcla7PzI62nZLCP6qVRKlQCf3rSrWbikMNd1S84LE8+deWHWcb8rZ/v7rZ9qmmw==",
"requires": {
"array-bounds": "^1.0.1",
- "bubleify": "^1.0.0",
- "color-normalize": "^1.0.3",
- "flatten-vertex-data": "^1.0.0",
+ "bubleify": "^1.2.0",
+ "color-normalize": "^1.5.0",
+ "flatten-vertex-data": "^1.0.2",
"object-assign": "^4.1.1",
- "pick-by-alias": "^1.1.1",
- "to-float32": "^1.0.0",
- "update-diff": "^1.0.2"
+ "pick-by-alias": "^1.2.0",
+ "to-float32": "^1.0.1",
+ "update-diff": "^1.1.0"
}
},
"regl-line2d": {
- "version": "3.0.13",
- "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-3.0.13.tgz",
- "integrity": "sha512-bTsuvTw4No25kUKGiXwOm0sLJT9kZ7vAkZOZYyXLxKCMRYIz1TS0j7DfqtC5ammzni8AdSahuTT0x52RU4Izuw==",
+ "version": "3.0.14",
+ "resolved": "https://registry.npmjs.org/regl-line2d/-/regl-line2d-3.0.14.tgz",
+ "integrity": "sha512-F5Ru1Bugi6Xkk2JJ4EuzAybuL99CtnAr6VIrJVJdsaFzWmI9GfPFtwbNZROeOrXXX7yElyc0HQsQDJaNpSeWmg==",
"requires": {
- "array-bounds": "^1.0.0",
+ "array-bounds": "^1.0.1",
"array-normalize": "^1.1.3",
- "bubleify": "^1.0.0",
- "color-normalize": "^1.0.0",
- "earcut": "^2.1.1",
- "es6-weak-map": "^2.0.2",
- "flatten-vertex-data": "^1.0.0",
+ "bubleify": "^1.2.0",
+ "color-normalize": "^1.5.0",
+ "earcut": "^2.1.5",
+ "es6-weak-map": "^2.0.3",
+ "flatten-vertex-data": "^1.0.2",
"glslify": "^7.0.0",
"object-assign": "^4.1.1",
"parse-rect": "^1.2.0",
- "pick-by-alias": "^1.1.0",
- "to-float32": "^1.0.0"
+ "pick-by-alias": "^1.2.0",
+ "to-float32": "^1.0.1"
+ },
+ "dependencies": {
+ "earcut": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.1.5.tgz",
+ "integrity": "sha512-QFWC7ywTVLtvRAJTVp8ugsuuGQ5mVqNmJ1cRYeLrSHgP3nycr2RHTJob9OtM0v8ujuoKN0NY1a93J/omeTL1PA=="
+ },
+ "es6-weak-map": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+ "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+ "requires": {
+ "d": "1",
+ "es5-ext": "^0.10.46",
+ "es6-iterator": "^2.0.3",
+ "es6-symbol": "^3.1.1"
+ }
+ }
}
},
"regl-scatter2d": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.1.4.tgz",
- "integrity": "sha512-X3FNkh3lw4B3cGLpGZYhSXoeeNAYYeAZnjoP4R8+uCmCbBiwoXUiLQw73HxjsCs53l/upzrSLCwu13QZy/MHeQ==",
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/regl-scatter2d/-/regl-scatter2d-3.1.5.tgz",
+ "integrity": "sha512-VCmASgrNIQXzDxmTLpLA4MAlbi+kdjKcVR9XugmFCTnWY7zytIhuMyIoPxinpaejGXzsC0Lq5oKvOnWFMQFGng==",
"requires": {
"array-range": "^1.0.1",
"array-rearrange": "^2.2.2",
"clamp": "^1.0.1",
"color-id": "^1.1.0",
- "color-normalize": "^1.3.0",
- "color-rgba": "^2.1.0",
+ "color-normalize": "1.5.0",
+ "color-rgba": "^2.1.1",
"flatten-vertex-data": "^1.0.2",
"glslify": "^7.0.0",
"image-palette": "^2.1.0",
@@ -9317,20 +9357,44 @@
"object-assign": "^4.1.1",
"parse-rect": "^1.2.0",
"pick-by-alias": "^1.2.0",
- "point-cluster": "^3.1.4",
+ "point-cluster": "^3.1.5",
"to-float32": "^1.0.1",
"update-diff": "^1.1.0"
+ },
+ "dependencies": {
+ "binary-search-bounds": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.4.tgz",
+ "integrity": "sha512-2hg5kgdKql5ClF2ErBcSx0U5bnl5hgS4v7wMnLFodyR47yMtj2w+UAZB+0CiqyHct2q543i7Bi4/aMIegorCCg=="
+ },
+ "point-cluster": {
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/point-cluster/-/point-cluster-3.1.5.tgz",
+ "integrity": "sha512-KpVtB1mXDlo6yzv80MA6oUq+1519CMeeUd4PPluM4ZlAQgHi/qeBrLY2G53RLy41kas7XvKol0FM98MSrjNH7Q==",
+ "requires": {
+ "array-bounds": "^1.0.1",
+ "array-normalize": "^1.1.3",
+ "binary-search-bounds": "^2.0.4",
+ "bubleify": "^1.1.0",
+ "clamp": "^1.0.1",
+ "dtype": "^2.0.0",
+ "flatten-vertex-data": "^1.0.0",
+ "is-obj": "^1.0.1",
+ "math-log2": "^1.0.1",
+ "parse-rect": "^1.2.0"
+ }
+ }
}
},
"regl-splom": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.6.tgz",
- "integrity": "sha512-2FEoHUBSQSHELf2hfw5Rya2DMrq/9RWbjKMlkKeMIrKG0+OjPHgZyxuSh/w7N91WXTTAh6GUehf9RueHSyGeWg==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/regl-splom/-/regl-splom-1.0.7.tgz",
+ "integrity": "sha512-17ltp68/pCMFOU2gSIIFRTRMmsCRpDFzPUF9jkZhT8IDimI83jkU/2nP4vAHTIfd+HZ/Ip+eFrNx2aKV9FMDwQ==",
"requires": {
"array-bounds": "^1.0.1",
"array-range": "^1.0.1",
"bubleify": "^1.2.0",
- "color-alpha": "^1.0.3",
+ "color-alpha": "^1.0.4",
"defined": "^1.0.0",
"flatten-vertex-data": "^1.0.2",
"left-pad": "^1.3.0",
diff --git a/package.json b/package.json
index 3091fdb0db0..33ab59eabcf 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
"@plotly/d3-sankey": "0.7.2",
"alpha-shape": "^1.0.0",
"canvas-fit": "^1.5.0",
- "color-normalize": "^1.3.0",
+ "color-normalize": "^1.5.0",
"convex-hull": "^1.0.3",
"country-regex": "^1.1.0",
"d3": "^3.5.12",
@@ -86,7 +86,7 @@
"gl-spikes2d": "^1.0.2",
"gl-streamtube3d": "^1.2.1",
"gl-surface3d": "^1.4.6",
- "gl-text": "^1.1.6",
+ "gl-text": "^1.1.7",
"glslify": "^7.0.0",
"has-hover": "^1.0.1",
"has-passive-events": "^1.0.0",
@@ -101,10 +101,10 @@
"point-cluster": "^3.1.4",
"polybooljs": "^1.2.0",
"regl": "^1.3.11",
- "regl-error2d": "^2.0.7",
- "regl-line2d": "3.0.13",
- "regl-scatter2d": "^3.1.4",
- "regl-splom": "^1.0.6",
+ "regl-error2d": "^2.0.8",
+ "regl-line2d": "^3.0.14",
+ "regl-scatter2d": "^3.1.5",
+ "regl-splom": "^1.0.7",
"right-now": "^1.0.0",
"robust-orientation": "^1.1.3",
"sane-topojson": "^3.0.1",
diff --git a/test/image/baselines/gl2d_rgb_dont_accept_alpha_scattergl.png b/test/image/baselines/gl2d_rgb_dont_accept_alpha_scattergl.png
new file mode 100644
index 00000000000..5989eaa1915
Binary files /dev/null and b/test/image/baselines/gl2d_rgb_dont_accept_alpha_scattergl.png differ
diff --git a/test/image/baselines/gl3d_rgb_dont_accept_alpha_scatter3d.png b/test/image/baselines/gl3d_rgb_dont_accept_alpha_scatter3d.png
new file mode 100644
index 00000000000..21896f14a40
Binary files /dev/null and b/test/image/baselines/gl3d_rgb_dont_accept_alpha_scatter3d.png differ
diff --git a/test/image/mocks/gl2d_rgb_dont_accept_alpha_scattergl.json b/test/image/mocks/gl2d_rgb_dont_accept_alpha_scattergl.json
new file mode 100644
index 00000000000..4f6957d3675
--- /dev/null
+++ b/test/image/mocks/gl2d_rgb_dont_accept_alpha_scattergl.json
@@ -0,0 +1,128 @@
+{
+ "data": [
+ {
+ "name": "rgb(r,g,b,a)",
+ "type": "scattergl",
+ "x": [
+ 1,
+ 2,
+ 3,
+ 4
+ ],
+ "y": [
+ 1,
+ 1,
+ 1,
+ 1
+ ],
+ "mode": "marker+line",
+ "marker": {
+ "size": 20,
+ "color": [
+ "rgb(0, 0, 0, 0.5)",
+ "rgb(255, 0, 0, 0.5)",
+ "rgb(0, 255, 0, 0.5)",
+ "rgb(0, 0, 255, 0.5)"
+ ],
+ "line": {
+ "width": 10,
+ "color": [
+ "rgb(191, 191, 191, 0.5)",
+ "rgb(0, 255, 255, 0.5)",
+ "rgb(255, 0, 255, 0.5)",
+ "rgb(255, 255, 0, 0.5)"
+ ]
+ }
+ },
+ "line": {
+ "width": 20
+ }
+ },
+ {
+ "name": "rgb(r,g,b,a)+opacity",
+ "type": "scattergl",
+ "x": [
+ 1,
+ 2,
+ 3,
+ 4
+ ],
+ "y": [
+ 0.5,
+ 0.5,
+ 0.5,
+ 0.5
+ ],
+ "opacity": 0.5,
+ "mode": "marker+line",
+ "marker": {
+ "size": 20,
+ "color": [
+ "rgb(0, 0, 0, 0.5)",
+ "rgb(255, 0, 0, 0.5)",
+ "rgb(0, 255, 0, 0.5)",
+ "rgb(0, 0, 255, 0.5)"
+ ],
+ "line": {
+ "width": 10,
+ "color": [
+ "rgb(191, 191, 191, 0.5)",
+ "rgb(0, 255, 255, 0.5)",
+ "rgb(255, 0, 255, 0.5)",
+ "rgb(255, 255, 0, 0.5)"
+ ]
+ }
+ },
+ "line": {
+ "width": 20
+ }
+ },
+ {
+ "name": "rgba(r,g,b,a)",
+ "type": "scattergl",
+ "x": [
+ 1,
+ 2,
+ 3,
+ 4
+ ],
+ "y": [
+ 0,
+ 0,
+ 0,
+ 0
+ ],
+ "mode": "marker+line",
+ "marker": {
+ "size": 20,
+ "color": [
+ "rgba(0, 0, 0, 0.5)",
+ "rgba(255, 0, 0, 0.5)",
+ "rgba(0, 255, 0, 0.5)",
+ "rgba(0, 0, 255, 0.5)"
+ ],
+ "line": {
+ "width": 10,
+ "color": [
+ "rgba(191, 191, 191, 0.5)",
+ "rgba(0, 255, 255, 0.5)",
+ "rgba(255, 0, 255, 0.5)",
+ "rgba(255, 255, 0, 0.5)"
+ ]
+ }
+ },
+ "line": {
+ "width": 20
+ }
+ }
+ ],
+ "layout": {
+ "width": 600,
+ "height": 400,
+ "xaxis": { "nticks": 20 },
+ "yaxis": { "nticks": 20 },
+ "title": {
+ "text": "Should not display alpha
when having rgb not rgba"
+ }
+ }
+}
diff --git a/test/image/mocks/gl3d_mesh3d_enable-alpha-with-rgba-color.json b/test/image/mocks/gl3d_mesh3d_enable-alpha-with-rgba-color.json
index 0c95eb8726e..7ad7098bded 100644
--- a/test/image/mocks/gl3d_mesh3d_enable-alpha-with-rgba-color.json
+++ b/test/image/mocks/gl3d_mesh3d_enable-alpha-with-rgba-color.json
@@ -9,10 +9,10 @@
"j":[1, 2, 3, 2],
"k":[2, 3, 1, 3],
"vertexcolor": [
- "rgb(0, 0, 0, 1.0)",
- "rgb(255, 0, 0, 0.1)",
- "rgb(0, 255, 0, 0.1)",
- "rgb(0, 0, 255, 0.1)"
+ "rgba(0, 0, 0, 1.0)",
+ "rgba(255, 0, 0, 0.1)",
+ "rgba(0, 255, 0, 0.1)",
+ "rgba(0, 0, 255, 0.1)"
]
}
],
diff --git a/test/image/mocks/gl3d_rgb_dont_accept_alpha_scatter3d.json b/test/image/mocks/gl3d_rgb_dont_accept_alpha_scatter3d.json
new file mode 100644
index 00000000000..0469001755e
--- /dev/null
+++ b/test/image/mocks/gl3d_rgb_dont_accept_alpha_scatter3d.json
@@ -0,0 +1,114 @@
+{
+ "data": [
+ {
+ "type": "scatter3d",
+ "x": [
+ 15,
+ 25,
+ 35,
+ 15
+ ],
+ "y": [
+ 0,
+ 0,
+ 1,
+ 2
+ ],
+ "z": [
+ 0,
+ 2,
+ 0,
+ 1
+ ],
+ "marker": {
+ "size": 20,
+ "color": [
+ "rgb(0, 0, 0, 0.5)",
+ "rgb(255, 0, 0, 0.5)",
+ "rgb(0, 255, 0, 0.5)",
+ "rgb(0, 0, 255, 0.5)"
+ ],
+ "line": {
+ "width": 20,
+ "color": [
+ "rgb(191, 191, 191, 0.5)",
+ "rgb(0, 255, 255, 0.5)",
+ "rgb(255, 0, 255, 0.5)",
+ "rgb(255, 255, 0, 0.5)"
+ ]
+ }
+ },
+ "line": {
+ "width": 20,
+ "color": [
+ "rgb(0, 255, 255, 0.5)",
+ "rgb(255, 0, 255, 0.5)",
+ "rgb(255, 255, 0, 0.5)"
+ ]
+ }
+ },
+ {
+ "type": "scatter3d",
+ "x": [
+ -15,
+ -25,
+ -35,
+ -15
+ ],
+ "y": [
+ 0,
+ 0,
+ 1,
+ 2
+ ],
+ "z": [
+ 0,
+ 2,
+ 0,
+ 1
+ ],
+ "marker": {
+ "size": 20,
+ "color": [
+ "rgba(0, 0, 0, 0.5)",
+ "rgba(255, 0, 0, 0.5)",
+ "rgba(0, 255, 0, 0.5)",
+ "rgba(0, 0, 255, 0.5)"
+ ],
+ "line": {
+ "width": 20,
+ "color": [
+ "rgba(191, 191, 191, 0.5)",
+ "rgba(0, 255, 255, 0.5)",
+ "rgba(255, 0, 255, 0.5)",
+ "rgba(255, 255, 0, 0.5)"
+ ]
+ }
+ },
+ "line": {
+ "width": 20,
+ "color": [
+ "rgba(0, 255, 255, 0.5)",
+ "rgba(255, 0, 255, 0.5)",
+ "rgba(255, 255, 0, 0.5)"
+ ]
+ }
+ }
+ ],
+ "layout": {
+ "width": 400,
+ "height": 400,
+ "title": {
+ "text": "Should not display alpha
when having rgb not rgba"
+ },
+ "scene": {
+ "camera": {
+ "eye": {
+ "x": 0,
+ "y": 1,
+ "z": 2
+ }
+ }
+ }
+ }
+}
diff --git a/test/image/mocks/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.json b/test/image/mocks/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.json
index 530718305b4..76ecc0efcdb 100644
--- a/test/image/mocks/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.json
+++ b/test/image/mocks/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.json
@@ -7,16 +7,16 @@
"mode": "markers+lines",
"marker": {
"size": 50,
- "color": ["rgb(0, 255, 0, 1.0)", "rgb(255, 0, 0, 1.0)", "rgb(255, 0, 0, 0.2)", "rgb(255, 0, 0, 1.0)", "rgb(0, 0, 255, 1.0)"]
+ "color": ["rgba(0, 255, 0, 1.0)", "rgba(255, 0, 0, 1.0)", "rgba(255, 0, 0, 0.2)", "rgba(255, 0, 0, 1.0)", "rgba(0, 0, 255, 1.0)"]
},
"line": {
"width": 50,
- "color": ["rgb(0, 255, 0, 1.0)", "rgb(255, 0, 0, 1.0)", "rgb(255, 0, 0, 0.2)", "rgb(255, 0, 0, 1.0)", "rgb(0, 0, 255, 1.0)"]
+ "color": ["rgba(0, 255, 0, 1.0)", "rgba(255, 0, 0, 1.0)", "rgba(255, 0, 0, 0.2)", "rgba(255, 0, 0, 1.0)", "rgba(0, 0, 255, 1.0)"]
},
"error_z": {
"type": "sqrt",
"line": { "thickness": 10 },
- "color": "rgb(255, 127, 0, 0.75)"
+ "color": "rgba(255, 127, 0, 0.75)"
},
"error_x": {
"type": "sqrt"
diff --git a/test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json b/test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json
index 7b7b95779bb..63f204d9632 100644
--- a/test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json
+++ b/test/image/mocks/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.json
@@ -7,18 +7,18 @@
"mode": "markers+lines",
"marker": {
"size": 50,
- "color": ["rgb(0, 255, 0, 0.5)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(0, 0, 255, 1.0)"],
+ "color": ["rgba(0, 255, 0, 0.5)", "rgba(255, 0, 0, 0.0)", "rgba(255, 0, 0, 0.0)", "rgba(255, 0, 0, 0.0)", "rgba(0, 0, 255, 1.0)"],
"opacity": 0.999
},
"line": {
"width": 50,
- "color": ["rgb(0, 255, 0, 0.5)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(255, 0, 0, 0.0)", "rgb(0, 0, 255, 1.0)"],
+ "color": ["rgba(0, 255, 0, 0.5)", "rgba(255, 0, 0, 0.0)", "rgba(255, 0, 0, 0.0)", "rgba(255, 0, 0, 0.0)", "rgba(0, 0, 255, 1.0)"],
"opacity": 0.999
},
"error_z": {
"type": "sqrt",
"line": { "thickness": 10 },
- "color": "rgb(0, 255, 0, 0.0)",
+ "color": "rgba(0, 255, 0, 0.0)",
"opacity": 0.999
},
"error_x": {