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

revised superimpose effect code

Browse Source
This commit is contained in:
itsmattkc
2018-11-20 09:37:08 +11:00
parent af24b28354
commit 8c9c394de3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/viewerwidget.cpp
+6 -6
View File
@@ -216,14 +216,14 @@ void ViewerWidget::drawTitleSafeArea() {
glEnd();
}
GLuint ViewerWidget::draw_clip(QOpenGLFramebufferObject* fbo, GLuint texture) {
GLuint ViewerWidget::draw_clip(QOpenGLFramebufferObject* fbo, GLuint texture, bool clear) {
glPushMatrix();
glLoadIdentity();
glOrtho(0, 1, 0, 1, -1, 1);
fbo->bind();
glClear(GL_COLOR_BUFFER_BIT);
if (clear) glClear(GL_COLOR_BUFFER_BIT);
glBindTexture(GL_TEXTURE_2D, texture);
glBegin(GL_QUADS);
@@ -254,13 +254,13 @@ void ViewerWidget::process_effect(Clip* c, Effect* e, double timecode, GLTexture
e->startEffect();
if (e->enable_shader) {
e->process_shader(timecode, coords);
composite_texture = draw_clip(c->fbo[fbo_switcher], composite_texture, true);
fbo_switcher = !fbo_switcher;
}
composite_texture = draw_clip(c->fbo[fbo_switcher], composite_texture);
if (e->enable_superimpose) {
GLuint superimpose_texture = e->process_superimpose(timecode);
if (superimpose_texture != 0) draw_clip(c->fbo[fbo_switcher], superimpose_texture);
if (superimpose_texture != 0) composite_texture = draw_clip(c->fbo[!fbo_switcher], superimpose_texture, false);
}
fbo_switcher = !fbo_switcher;
}
}
}
@@ -424,7 +424,7 @@ GLuint ViewerWidget::compose_sequence(QVector<Clip*>& nests, bool render_audio)
c->fbo[fbo_switcher]->release();
composite_texture = c->fbo[fbo_switcher]->texture();
} else {
composite_texture = draw_clip(c->fbo[fbo_switcher], textureID);
composite_texture = draw_clip(c->fbo[fbo_switcher], textureID, true);
}
fbo_switcher = !fbo_switcher;
ui/viewerwidget.h
+1 -1
View File
@@ -43,7 +43,7 @@ private:
bool dragging;
void seek_from_click(int x);
GLuint compose_sequence(QVector<Clip *> &nests, bool render_audio);
GLuint draw_clip(QOpenGLFramebufferObject *clip, GLuint texture);
GLuint draw_clip(QOpenGLFramebufferObject *clip, GLuint texture, bool clear);
void process_effect(Clip* c, Effect* e, double timecode, GLTextureCoords& coords, GLuint& composite_texture, bool& fbo_switcher);
private slots:
void retry();