refactoring work to improve issues with new rendering pipeline

This commit is contained in:
itsmattkc
2019-11-04 11:34:43 +11:00
parent 663ae56ac4
commit 97a4294bb3
15 changed files with 408 additions and 253 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ QString OpacityNode::Code(NodeOutput *output)
"uniform float opacity_in;\n"
"\n"
"void main(void) {\n"
" gl_FragColor = tex_in * (opacity_in * 0.01);\n"
" gl_FragColor = texture2D(tex_in, olive_tex_coord) * (opacity_in * 0.01);\n"
"}\n";
}
+1 -1
View File
@@ -64,7 +64,7 @@ QString VideoInput::Code(NodeOutput *output)
"uniform mat4 matrix_in;\n"
"\n"
"void main(void) {\n"
" gl_FragColor = texture2D(olive_tex, vec2(vec4(olive_tex_coord, 0.0, 1.0) * matrix_in));\n"
" gl_FragColor = texture2D(footage_in, vec2(vec4(olive_tex_coord, 0.0, 1.0) * matrix_in));\n"
"}\n";
}
-4
View File
@@ -34,12 +34,8 @@ NodeParam::Type NodeOutput::type()
QVariant NodeOutput::get_realtime_value()
{
parent()->LockProcessing();
QVariant v = parent()->Value(this);
parent()->UnlockProcessing();
return v;
}