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

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

Browse Source
This commit is contained in:
itsmattkc
2019-01-09 12:41:53 +11:00
parent f439c5071b 59ae02d8dc
commit f7a420c042
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/effect.cpp
+17 -4
View File
@@ -820,9 +820,18 @@ void Effect::open() {
} else {
glslProgram = new QOpenGLShaderProgram();
validate_meta_path();
if (!vertPath.isEmpty()) glslProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, meta->path + "/" + vertPath);
if (!fragPath.isEmpty()) glslProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, meta->path + "/" + fragPath);
glslProgram->link();
bool glsl_compiled = true;
if (!vertPath.isEmpty()) {
if (!glslProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, meta->path + "/" + vertPath)) {
glsl_compiled = false;
}
}
if (!fragPath.isEmpty()) {
if (!glslProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, meta->path + "/" + fragPath)) {
glsl_compiled = false;
}
}
if (glsl_compiled) glslProgram->link();
isOpen = true;
}
} else {
@@ -846,12 +855,16 @@ void Effect::close() {
isOpen = false;
}
bool Effect::is_glsl_linked() {
return glslProgram != NULL && glslProgram->isLinked();
}
void Effect::startEffect() {
if (!isOpen) {
open();
dout << "[WARNING] Tried to start a closed effect - opening";
}
if (enable_shader) bound = glslProgram->bind();
if (enable_shader && glslProgram->isLinked()) bound = glslProgram->bind();
}
void Effect::endEffect() {