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

ShaderBuilder / fix stretch operator GLSL expression

Browse Source
This commit is contained in:
Olivier Guyot
2019-10-22 22:13:08 +02:00
parent 485ade42b5
commit c659c05de8
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,7 +274,12 @@ export function parse(value, attributes, attributePrefix, variables, typeHint) {
case '*': return `(${p(v[1])} * ${p(v[2])})`;
case '+': return `(${p(v[1])} + ${p(v[2])})`;
case 'clamp': return `clamp(${p(v[1])}, ${p(v[2])}, ${p(v[3])})`;
case 'stretch': return `(clamp(${p(v[1])}, ${p(v[2])}, ${p(v[3])}) * ((${p(v[5])} - ${p(v[4])}) / (${p(v[3])} - ${p(v[2])})) + ${p(v[4])})`;
case 'stretch':
const low1 = p(v[2]);
const high1 = p(v[3]);
const low2 = p(v[4]);
const high2 = p(v[5]);
return `((clamp(${p(v[1])}, ${low1}, ${high1}) - ${low1}) * ((${high2} - ${low2}) / (${high1} - ${low1})) + ${low2})`;
// color operators
case 'interpolate':