github/scratch-render
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move hue modulo into hsvToRgb

Browse Source 
this makes it safer to call hsvToRgb without worrying about h=1, which previously caused incorrect results
This commit is contained in:
Chris Willis-Ford
2020-08-17 12:06:46 -07:00
committed by GitHub
parent 7a6b3c55aa
commit 310f6b5d2d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/EffectTransform.js
View File

@@ -94,6 +94,8 @@ const hsvToRgb = ([h, s, v], dst) => {
return dst; return dst;
} }
// keep hue in [0,1) so the `switch(i)` below only needs 6 cases (0-5)
h %= 1;
const i = (h * 6) | 0; const i = (h * 6) | 0;
const f = (h * 6) - i; const f = (h * 6) - i;
const p = v * (1 - s); const p = v * (1 - s);
@@ -177,7 +179,7 @@ class EffectTransform {
// hsv.x = mod(hsv.x + u_color, 1.0); // hsv.x = mod(hsv.x + u_color, 1.0);
// if (hsv.x < 0.0) hsv.x += 1.0; // if (hsv.x < 0.0) hsv.x += 1.0;
hsv[0] = (uniforms.u_color + hsv[0] + 1) % 1; hsv[0] = (uniforms.u_color + hsv[0] + 1);
// gl_FragColor.rgb = convertHSV2RGB(hsl); // gl_FragColor.rgb = convertHSV2RGB(hsl);
hsvToRgb(hsv, inOutColor); hsvToRgb(hsv, inOutColor);