OpenToonz - An open-source full-featured 2D animation creation software
C
Add Shader Fx: HSL Blend GPU
justburner79884d0b3cd4
diff --git a/stuff/config/current.txt b/stuff/config/current.txtindex 3039acbbc..484d0acb1 100644--- a/stuff/config/current.txt+++ b/stuff/config/current.txt@@ -531,6 +531,12 @@<item>"SHADER_spinblurGPU.radius" "Safe Radius" </item><item>"SHADER_spinblurGPU.blur" "Blur" </item>+ <item>"SHADER_HSLBlendGPU" "GPU HSL Blend" </item>+ <item>"SHADER_HSLBlendGPU.bhue" "Hue" </item>+ <item>"SHADER_HSLBlendGPU.bsat" "Saturation" </item>+ <item>"SHADER_HSLBlendGPU.blum" "Luminosity" </item>+ <item>"SHADER_HSLBlendGPU.balpha" "Blend Alpha" </item>+<!---------------------------------------------------------------------------------------->diff --git a/stuff/library/shaders/HSLBlendGPU.xml b/stuff/library/shaders/HSLBlendGPU.xmlnew file mode 100644index 000000000..e8c2338a4--- /dev/null+++ b/stuff/library/shaders/HSLBlendGPU.xml@@ -0,0 +1,63 @@+<MainProgram>+ <Name>+ SHADER_HSLBlendGPU+ </Name>+ <ProgramFile>+ "programs/HSLBlendGPU.frag"+ </ProgramFile>+</MainProgram>++<InputPorts>+ <InputPort>+ "BlendSrc"+ </InputPort>+ <InputPort>+ "BaseSrc"+ </InputPort>++ <PortsProgram>+ <Name>+ SHADER_HSLBlendGPU_ports+ </Name>+ <ProgramFile>+ "programs/HSLBlendGPU_ports.vert"+ </ProgramFile>+ </PortsProgram>+</InputPorts>++<HandledWorldTransforms>+ isotropic+</HandledWorldTransforms>++<Parameters>+ <Parameter>+ bool bhue+ <Default>+ 1+ </Default>+ </Parameter>+ <Parameter>+ bool bsat+ <Default>+ 1+ </Default>+ </Parameter>+ <Parameter>+ bool blum+ <Default>+ 0+ </Default>+ </Parameter>+ <Parameter>+ float balpha+ <Concept>+ percent+ </Concept>+ <Default>+ 1.0+ </Default>+ <Range>+ 0 1+ </Range>+ </Parameter>+</Parameters>diff --git a/stuff/library/shaders/programs/HSLBlendGPU.frag b/stuff/library/shaders/programs/HSLBlendGPU.fragnew file mode 100644index 000000000..444f4c8c2--- /dev/null+++ b/stuff/library/shaders/programs/HSLBlendGPU.frag@@ -0,0 +1,120 @@+#ifdef GL_ES+precision mediump float;+#endif+++uniform mat3 worldToOutput;++uniform sampler2D inputImage[2];+uniform mat3 outputToInput[2];++uniform bool bhue;+uniform bool bsat;+uniform bool blum;+uniform float balpha;+++// Blending calculations from:+// https://www.khronos.org/registry/OpenGL/extensions/KHR/KHR_blend_equation_advanced.txt++float minv3(vec3 c)+{+ return min(min(c.r, c.g), c.b);+}++float maxv3(vec3 c)+{+ return max(max(c.r, c.g), c.b);+}++float lumv3(vec3 c)+{+ return dot(c, vec3(0.30, 0.59, 0.11));+}++float satv3(vec3 c)+{+ return maxv3(c) - minv3(c);+}++// If any color components are outside [0,1], adjust the color to get the components in range.+vec3 ClipColor(vec3 color)+{+ float lum = lumv3(color);+ float mincol = minv3(color);+ float maxcol = maxv3(color);+ if (mincol < 0.0) {+ color = lum + ((color-lum) * lum) / (lum-mincol);+ }+ if (maxcol > 1.0) {+ color = lum + ((color-lum) * (1.0 -lum)) / (maxcol-lum);+ }+ return color;+}++// Take the base RGB color <cbase> and override its luminosity+// with that of the RGB color <clum>.+vec3 SetLum(vec3 cbase, vec3 clum)+{+ float lbase = lumv3(cbase);+ float llum = lumv3(clum);+ float ldiff = llum - lbase;+ vec3 color = cbase + vec3(ldiff);+ return ClipColor(color);+}++// Take the base RGB color <cbase> and override its saturation with+// that of the RGB color <csat>. The override the luminosity of the+// result with that of the RGB color <clum>.+vec3 SetLumSat(vec3 cbase, vec3 csat, vec3 clum)+{+ float minbase = minv3(cbase);+ float sbase = satv3(cbase);+ float ssat = satv3(csat);+ vec3 color;+ if (sbase > 0.0) {+ // Equivalent (modulo rounding errors) to setting the+ // smallest (R,G,B) component to 0, the largest to <ssat>,+ // and interpolating the "middle" component based on its+ // original value relative to the smallest/largest.+ color = (cbase - minbase) * ssat / sbase;+ } else {+ color = vec3(0.0);+ }+ return SetLum(color, clum);+}+++void main( void )+{+ // Read sources+ vec2 s_texPos = (outputToInput[0] * vec3(gl_FragCoord.xy, 1.0)).xy;+ vec2 d_texPos = (outputToInput[1] * vec3(gl_FragCoord.xy, 1.0)).xy;+ vec4 s_frag = texture2D(inputImage[0], s_texPos);+ vec4 d_frag = texture2D(inputImage[1], d_texPos);++ // De-premultiplication+ vec3 s_pix = vec3(0.0);+ if (s_frag.a > 0.0) s_pix = s_frag.rgb / s_frag.a;+ vec3 d_pix = vec3(0.0);+ if (d_frag.a > 0.0) d_pix = d_frag.rgb / d_frag.a;++ // Figure out output alpha+ float s_alpha = s_frag.a * balpha;+ float d_alpha = d_frag.a;+ gl_FragColor.a = s_alpha + d_alpha * (1.0 - s_alpha);+ if (gl_FragColor.a <= 0.0) discard;++ // Perform blending+ if (s_alpha > 0.0 && d_alpha > 0.0) {+ vec3 o_pix = SetLumSat(bhue ? s_pix : d_pix, bsat ? s_pix : d_pix, blum ? s_pix : d_pix);+ gl_FragColor.rgb = mix(d_pix, o_pix, balpha);+ } else if (s_alpha > 0.0) {+ gl_FragColor.rgb = s_pix;+ } else {+ gl_FragColor.rgb = d_pix;+ }++ // Premultiplication+ gl_FragColor.rgb *= gl_FragColor.a;+}diff --git a/stuff/library/shaders/programs/HSLBlendGPU_ports.vert b/stuff/library/shaders/programs/HSLBlendGPU_ports.vertnew file mode 100644index 000000000..924d542c4--- /dev/null+++ b/stuff/library/shaders/programs/HSLBlendGPU_ports.vert@@ -0,0 +1,21 @@+#ifdef GL_ES+precision mediump float;+#endif++uniform mat3 worldToOutput;+uniform vec4 outputRect;++varying vec4 inputRect[2];+varying mat3 worldToInput[2];+++void main( void )+{+ // Let the input and output references be the same+ worldToInput[0] = worldToOutput;+ worldToInput[1] = worldToOutput;+ inputRect[0] = outputRect;+ inputRect[1] = outputRect;++ gl_Position = vec4(0.0); // Does not link without+}diff --git a/stuff/profiles/layouts/fxs/SHADER_HSLBlendGPU.xml b/stuff/profiles/layouts/fxs/SHADER_HSLBlendGPU.xmlnew file mode 100644index 000000000..d1c1645f1--- /dev/null+++ b/stuff/profiles/layouts/fxs/SHADER_HSLBlendGPU.xml@@ -0,0 +1,8 @@+<fxlayout>+ <page name="GPU HSL Blend">+ <control>bhue</control>+ <control>bsat</control>+ <control>blum</control>+ <control>balpha</control>+ </page>+</fxlayout>diff --git a/stuff/profiles/layouts/fxs/fxs.lst b/stuff/profiles/layouts/fxs/fxs.lstindex b3747195b..ff933173e 100644--- a/stuff/profiles/layouts/fxs/fxs.lst+++ b/stuff/profiles/layouts/fxs/fxs.lst@@ -184,6 +184,7 @@SHADER_wavySHADER_radialblurGPUSHADER_spinblurGPU+ SHADER_HSLBlendGPU</Shaders><Utility>STD_nothingFx