ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shader Builder / support strings in formatColor

Browse Source
This commit is contained in:
Olivier Guyot
2019-10-22 16:41:52 +02:00
parent 56faf4c3ad
commit f43637cc33
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/webgl/ShaderBuilder.js
View File

@@ -26,13 +26,13 @@ export function formatArray(array) {
/**
* Will normalize and converts to string a color array compatible with GLSL.
* @param {Array<number>} colorArray Color in [r, g, b, a] array form, with RGB components in the
* 0..255 range and the alpha component in the 0..1 range. Note that if the A component is
* @param {string|import("../color.js").Color} color Color either in string format or [r, g, b, a] array format,
* with RGB components in the 0..255 range and the alpha component in the 0..1 range. Note that if the A component is
* missing, only 3 values will be output.
* @returns {string} The color components concatenated in `1.0, 1.0, 1.0, 1.0` form.
*/
export function formatColor(colorArray) {
return colorArray.map(function(c, i) {
export function formatColor(color) {
return asArray(color).map(function(c, i) {
return i < 3 ? c / 255 : c;
}).map(formatNumber).join(', ');
}

5
test/spec/ol/webgl/shaderbuilder.test.js
View File

@@ -29,6 +29,11 @@ describe('ol.webgl.ShaderBuilder', function() {
it('normalizes color and outputs numbers with dot separators', function() {
expect(formatColor([100, 0, 255, 1])).to.eql('0.39215686274509803, 0.0, 1.0, 1.0');
});
it('handles colors in string format', function() {
expect(formatColor('red')).to.eql('1.0, 0.0, 0.0, 1.0');
expect(formatColor('rgb(100, 0, 255)')).to.eql('0.39215686274509803, 0.0, 1.0, 1.0');
expect(formatColor('rgba(100, 0, 255, 0.3)')).to.eql('0.39215686274509803, 0.0, 1.0, 0.3');
});
});
describe('getSymbolVertexShader', function() {