oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olive-editor/olive

Browse Source
This commit is contained in:
itsmattkc
2022-10-24 10:45:49 -07:00
parent 840fc0f212 f189df91e1
commit fa6a75cda1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/shaders/diptoblack.frag
+2 -2
View File
@@ -29,8 +29,8 @@ float TransformCurve(float linear) {
void main(void) { void main(void) {
if (out_block_in_enabled && in_block_in_enabled) { if (out_block_in_enabled && in_block_in_enabled) {
// mix(x, y , a): a(1-x) + b(x) // mix(x, y , a): a(1-x) + b(x)
vec4 out_block_col = ove_tprog_out==0.0? vec4(0.0) : mix(color_in, texture(out_block_in, ove_texcoord),TransformCurve(ove_tprog_out)); vec4 out_block_col = ove_tprog_out == 0.0 ? vec4(0.0) : mix(color_in, texture(out_block_in, ove_texcoord),TransformCurve(ove_tprog_out));
vec4 in_block_col = mix(color_in, texture(in_block_in, ove_texcoord), TransformCurve(ove_tprog_in)); vec4 in_block_col = ove_tprog_out != 0.0 ? vec4(0.0) : mix(color_in, texture(in_block_in, ove_texcoord), TransformCurve(ove_tprog_in));
frag_color = out_block_col + in_block_col; frag_color = out_block_col + in_block_col;
} else if (out_block_in_enabled) { } else if (out_block_in_enabled) {