From 17b5b0f2cf147e30286e32b8e9300f89b596026c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 18 Mar 2019 02:34:11 +1100 Subject: [PATCH] completed transition to gles 3.0 --- effects/effect.cpp | 20 +- effects/effectgizmo.h | 4 +- effects/internal/transformeffect.cpp | 32 +-- rendering/renderfunctions.cpp | 12 +- ui/viewerwidget.cpp | 307 ++++++++++++++++++--------- ui/viewerwidget.h | 1 + 6 files changed, 250 insertions(+), 126 deletions(-) diff --git a/effects/effect.cpp b/effects/effect.cpp index c0ef931e0..9d3552244 100644 --- a/effects/effect.cpp +++ b/effects/effect.cpp @@ -838,7 +838,7 @@ void Effect::process_shader(double timecode, GLTextureCoords&, int iteration) { { DoubleField* double_field = static_cast(field); shader_program_->setUniformValue(double_field->id().toUtf8().constData(), - GLfloat(double_field->GetDoubleAt(timecode))); + GLfloat(double_field->GetDoubleAt(timecode))); } break; case EffectField::EFFECT_FIELD_COLOR: @@ -988,12 +988,22 @@ void Effect::gizmo_world_to_screen(const QMatrix4x4& matrix, const QMatrix4x4& p EffectGizmo* g = gizmos.at(i); for (int j=0;jget_point_count();j++) { - QVector4D screen_pos = QVector4D(g->world_pos[j].x(), g->world_pos[j].y(), 0, 1.0) * (matrix * projection); - int adjusted_sx1 = qRound(((screen_pos.x()*0.5f)+0.5f)*parent_clip->sequence->width); - int adjusted_sy1 = qRound((1.0f-((screen_pos.y()*0.5f)+0.5f))*parent_clip->sequence->height); + QMatrix4x4 matrix2 = matrix; +// matrix2.flipCoordinates(); + + QMatrix4x4 projection2 = projection; + projection2.flipCoordinates(); + + QVector3D screen_pos = g->world_pos.at(j).project(matrix2, + projection2, + QRect(0, + 0, + parent_clip->sequence->width, + parent_clip->sequence->height)); + + g->screen_pos[j] = QPoint(screen_pos.x(), screen_pos.y()); - g->screen_pos[j] = QPoint(adjusted_sx1, adjusted_sy1); } } } diff --git a/effects/effectgizmo.h b/effects/effectgizmo.h index e39aa34a2..e32732e6c 100644 --- a/effects/effectgizmo.h +++ b/effects/effectgizmo.h @@ -27,8 +27,8 @@ enum GizmoType { GIZMO_TYPE_TARGET }; -#define GIZMO_DOT_SIZE 2.5 -#define GIZMO_TARGET_SIZE 5.0 +#define GIZMO_DOT_SIZE 2.5f +#define GIZMO_TARGET_SIZE 5.0f #include #include diff --git a/effects/internal/transformeffect.cpp b/effects/internal/transformeffect.cpp index a96df512a..8852240e3 100644 --- a/effects/internal/transformeffect.cpp +++ b/effects/internal/transformeffect.cpp @@ -218,28 +218,30 @@ void TransformEffect::process_coords(double timecode, GLTextureCoords& coords, i coords.opacity *= float(opacity->GetDoubleAt(timecode)*0.01); } +QVector3D LerpVector3D(const QVector3D& a, const QVector3D& b, float t) { + return QVector3D( + float_lerp(a.x(), b.x(), t), + float_lerp(a.y(), b.y(), t), + float_lerp(a.z(), b.z(), t) + ); +} + void TransformEffect::gizmo_draw(double, GLTextureCoords& coords) { top_left_gizmo->world_pos[0] = coords.vertex_top_left; top_right_gizmo->world_pos[0] = coords.vertex_top_right; bottom_right_gizmo->world_pos[0] = coords.vertex_bottom_right; bottom_left_gizmo->world_pos[0] = coords.vertex_bottom_left; - top_center_gizmo->world_pos[0] = QVector3D(lerp(coords.vertex_top_left.x(), coords.vertex_top_right.x(), 0.5), - lerp(coords.vertex_top_left.y(), coords.vertex_top_right.y(), 0.5), - 0.0f); - right_center_gizmo->world_pos[0] = QVector3D(lerp(coords.vertex_top_right.x(), coords.vertex_bottom_right.x(), 0.5), - lerp(coords.vertex_top_right.y(), coords.vertex_bottom_right.y(), 0.5), - 0.0f); - bottom_center_gizmo->world_pos[0] = QVector3D(lerp(coords.vertex_bottom_right.x(), coords.vertex_bottom_left.x(), 0.5), - lerp(coords.vertex_bottom_right.y(), coords.vertex_bottom_left.y(), 0.5), - 0.0f); - left_center_gizmo->world_pos[0] = QVector3D(lerp(coords.vertex_bottom_left.x(), coords.vertex_top_left.x(), 0.5), - lerp(coords.vertex_bottom_left.y(), coords.vertex_top_left.y(), 0.5), - 0.0f); + top_center_gizmo->world_pos[0] = LerpVector3D(coords.vertex_top_left, coords.vertex_top_right, 0.5); + right_center_gizmo->world_pos[0] = LerpVector3D(coords.vertex_top_right, coords.vertex_bottom_right, 0.5); + bottom_center_gizmo->world_pos[0] = LerpVector3D(coords.vertex_bottom_right, coords.vertex_bottom_left, 0.5); + left_center_gizmo->world_pos[0] = LerpVector3D(coords.vertex_bottom_left, coords.vertex_top_left, 0.5); - rotate_gizmo->world_pos[0] = QVector3D(lerp(top_center_gizmo->world_pos[0].x(), bottom_center_gizmo->world_pos[0].x(), -0.1), - lerp(top_center_gizmo->world_pos[0].y(), bottom_center_gizmo->world_pos[0].y(), -0.1), - 0.0f); + rotate_gizmo->world_pos[0] = QVector3D( + float_lerp(top_center_gizmo->world_pos[0].x(), bottom_center_gizmo->world_pos[0].x(), 0.5f), + float_lerp(top_center_gizmo->world_pos[0].y(), bottom_center_gizmo->world_pos[0].y(), -0.1f), + 0.0f + ); rect_gizmo->world_pos[0] = coords.vertex_top_left; rect_gizmo->world_pos[1] = coords.vertex_top_right; diff --git a/rendering/renderfunctions.cpp b/rendering/renderfunctions.cpp index 753e38528..7df931d05 100644 --- a/rendering/renderfunctions.cpp +++ b/rendering/renderfunctions.cpp @@ -131,6 +131,8 @@ QOpenGLShaderProgramPtr olive::rendering::GetPipeline(const QString& shader_code "\n" "uniform sampler2D texture;\n" "uniform float opacity;\n" + "uniform bool color_only;\n" + "uniform vec4 color_only_color;\n" "varying vec2 v_texcoord;\n" "\n"; @@ -143,8 +145,12 @@ QOpenGLShaderProgramPtr olive::rendering::GetPipeline(const QString& shader_code frag_shader.append("\n" "void main() {\n" - " vec4 color = texture2D(texture, v_texcoord)*opacity;\n" - " gl_FragColor = color;\n" + " if (color_only) {\n" + " gl_FragColor = color_only_color;" + " } else {\n" + " vec4 color = texture2D(texture, v_texcoord)*opacity;\n" + " gl_FragColor = color;\n" + " }\n" "}\n"); } else { @@ -583,7 +589,7 @@ GLuint compose_sequence(ComposeSequenceParams ¶ms) { params.gizmos->gizmo_draw(timecode, coords); // convert gizmo coords to screen coords - params.gizmos->gizmo_world_to_screen(coords.matrix, projection); + params.gizmos->gizmo_world_to_screen(projection, coords.matrix); } diff --git a/ui/viewerwidget.cpp b/ui/viewerwidget.cpp index 7c6bb8681..1da659e98 100644 --- a/ui/viewerwidget.cpp +++ b/ui/viewerwidget.cpp @@ -252,6 +252,22 @@ void ViewerWidget::seek_from_click(int x) { viewer->seek(getFrameFromScreenPoint(waveform_zoom, x+waveform_scroll)); } +QMatrix4x4 ViewerWidget::get_matrix() +{ + QMatrix4x4 matrix; + + double zoom_factor = container->zoom/(double(width())/double(viewer->seq->width)); + + if (zoom_factor > 1.0) { + double zoom_size = (zoom_factor*2.0) - 2.0; + + matrix.translate((-(x_scroll-0.5))*zoom_size, (y_scroll-0.5)*zoom_size); + matrix.scale(zoom_factor); + } + + return matrix; +} + void ViewerWidget::context_destroy() { makeCurrent(); @@ -409,140 +425,238 @@ void ViewerWidget::draw_waveform_func() { } void ViewerWidget::draw_title_safe_area() { - double halfWidth = 0.5; - double halfHeight = 0.5; - double viewportAr = (double) width() / (double) height(); - double halfAr = viewportAr*0.5; + QOpenGLFunctions* func = context()->functions(); + pipeline_->bind(); + + + float ar = float(width()) / float(height()); + + float horizontal_cross_size = 0.05f / ar; + + // Set matrix to 0.0 -> 1.0 on both axes + QMatrix4x4 matrix; + matrix.ortho(0.0f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f); + + // adjust the horizontal center cross by the aspect ratio to appear "square" if (olive::CurrentConfig.use_custom_title_safe_ratio && olive::CurrentConfig.custom_title_safe_ratio > 0) { - if (olive::CurrentConfig.custom_title_safe_ratio > viewportAr) { - halfHeight = (olive::CurrentConfig.custom_title_safe_ratio/viewportAr)*0.5; + if (ar > olive::CurrentConfig.custom_title_safe_ratio) { + matrix.translate(((ar - olive::CurrentConfig.custom_title_safe_ratio) / 2.0) / ar, 0.0f); + matrix.scale(olive::CurrentConfig.custom_title_safe_ratio / ar, 1.0f); } else { - halfWidth = (viewportAr/olive::CurrentConfig.custom_title_safe_ratio)*0.5; + matrix.translate(0.0f, (((olive::CurrentConfig.custom_title_safe_ratio - ar) / 2.0) / olive::CurrentConfig.custom_title_safe_ratio)); + matrix.scale(1.0f, ar / olive::CurrentConfig.custom_title_safe_ratio); } + + horizontal_cross_size *= ar/olive::CurrentConfig.custom_title_safe_ratio; } - glLoadIdentity(); - glOrtho(-halfWidth, halfWidth, halfHeight, -halfHeight, 0, 1); + float adjusted_cross_x1 = 0.5f - horizontal_cross_size; + float adjusted_cross_x2 = 0.5f + horizontal_cross_size; - glColor4f(0.66f, 0.66f, 0.66f, 1.0f); - glBegin(GL_LINES); + pipeline_->setUniformValue("mvp_matrix", matrix); + pipeline_->setUniformValue("color_only", true); + pipeline_->setUniformValue("color_only_color", QColor(192, 192, 192, 255)); - // action safe rectangle - glVertex2d(-0.45, -0.45); - glVertex2d(0.45, -0.45); - glVertex2d(0.45, -0.45); - glVertex2d(0.45, 0.45); - glVertex2d(0.45, 0.45); - glVertex2d(-0.45, 0.45); - glVertex2d(-0.45, 0.45); - glVertex2d(-0.45, -0.45); - // title safe rectangle - glVertex2d(-0.4, -0.4); - glVertex2d(0.4, -0.4); - glVertex2d(0.4, -0.4); - glVertex2d(0.4, 0.4); - glVertex2d(0.4, 0.4); - glVertex2d(-0.4, 0.4); - glVertex2d(-0.4, 0.4); - glVertex2d(-0.4, -0.4); - // horizontal centers - glVertex2d(-0.45, 0); - glVertex2d(-0.375, 0); - glVertex2d(0.45, 0); - glVertex2d(0.375, 0); + GLfloat vertices[] = { + // action safe lines + 0.05f, 0.05f, 0.0f, + 0.95f, 0.05f, 0.0f, - // vertical centers - glVertex2d(0, -0.45); - glVertex2d(0, -0.375); - glVertex2d(0, 0.45); - glVertex2d(0, 0.375); + 0.95f, 0.05f, 0.0f, + 0.95f, 0.95f, 0.0f, - glEnd(); + 0.95f, 0.95f, 0.0f, + 0.05f, 0.95f, 0.0f, - // center cross - glLoadIdentity(); - glOrtho(-halfAr, halfAr, 0.5, -0.5, -1, 1); + 0.05f, 0.95f, 0.0f, + 0.05f, 0.05f, 0.0f, - glBegin(GL_LINES); + // title safe lines + 0.1f, 0.1f, 0.0f, + 0.9f, 0.1f, 0.0f, - glVertex2d(-0.05, 0); - glVertex2d(0.05, 0); - glVertex2d(0, -0.05); - glVertex2d(0, 0.05); + 0.9f, 0.1f, 0.0f, + 0.9f, 0.9f, 0.0f, + + 0.9f, 0.9f, 0.0f, + 0.1f, 0.9f, 0.0f, + + 0.1f, 0.9f, 0.0f, + 0.1f, 0.1f, 0.0f, + + // side-center markers + 0.05f, 0.5f, 0.0f, + 0.125f, 0.5f, 0.0f, + + 0.95f, 0.5f, 0.0f, + 0.875f, 0.5f, 0.0f, + + 0.5f, 0.05f, 0.0f, + 0.5f, 0.125f, 0.0f, + + 0.5f, 0.95f, 0.0f, + 0.5f, 0.875f, 0.0f, + + // horizontal center cross marker + adjusted_cross_x1, 0.5f, 0.0f, + adjusted_cross_x2, 0.5f, 0.0f, + + // vertical center cross marker + 0.5f, 0.45f, 0.0f, + 0.5f, 0.55f, 0.0f + }; + + GLuint vertex_location = pipeline_->attributeLocation("a_position"); + func->glEnableVertexAttribArray(vertex_location); + func->glVertexAttribPointer(vertex_location, 3, GL_FLOAT, GL_FALSE, 0, vertices); + + func->glDrawArrays(GL_LINES, 0, 28); + + pipeline_->setUniformValue("color_only", false); + + pipeline_->release(); - glEnd(); } void ViewerWidget::draw_gizmos() { - float color[4]; - glGetFloatv(GL_CURRENT_COLOR, color); + QOpenGLFunctions* func = context()->functions(); - double dot_size = GIZMO_DOT_SIZE / double(width()) * viewer->seq->width; - double target_size = GIZMO_TARGET_SIZE / double(width()) * viewer->seq->width; + pipeline_->bind(); double zoom_factor = container->zoom/(double(width())/double(viewer->seq->width)); - glPushMatrix(); - glLoadIdentity(); + QMatrix4x4 matrix; + matrix.ortho(0, viewer->seq->width, 0, viewer->seq->height, -1, 1); + matrix.scale(zoom_factor, zoom_factor); + matrix.translate(-(viewer->seq->width-(width()/container->zoom))*x_scroll, + -((viewer->seq->height-(height()/container->zoom))*(1.0-y_scroll))); - glOrtho(0, viewer->seq->width, 0, viewer->seq->height, -1, 10); - glScaled(zoom_factor, zoom_factor, 0.0); - glTranslated(-(viewer->seq->width-(width()/container->zoom))*x_scroll, - -((viewer->seq->height-(height()/container->zoom))*(1.0-y_scroll)), - 0); + pipeline_->setUniformValue("mvp_matrix", matrix); + pipeline_->setUniformValue("color_only", true); + pipeline_->setUniformValue("color_only_color", QColor(255, 255, 255, 255)); + + float size_diff = float(viewer->seq->width) / float(width()); + float dot_size = GIZMO_DOT_SIZE * size_diff; + float target_size = GIZMO_TARGET_SIZE * size_diff; + + QVector vertices; - float gizmo_z = 0.0f; for (int j=0;jgizmo_count();j++) { + EffectGizmo* g = gizmos->gizmo(j); - glColor4d(g->color.redF(), g->color.greenF(), g->color.blueF(), 1.0); + switch (g->get_type()) { case GIZMO_TYPE_DOT: // draw dot - glBegin(GL_QUADS); - glVertex3f(g->screen_pos[0].x()-dot_size, g->screen_pos[0].y()-dot_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()+dot_size, g->screen_pos[0].y()-dot_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()+dot_size, g->screen_pos[0].y()+dot_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()-dot_size, g->screen_pos[0].y()+dot_size, gizmo_z); - glEnd(); + + vertices.append(g->screen_pos[0].x()-dot_size); + vertices.append(g->screen_pos[0].y()-dot_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()+dot_size); + vertices.append(g->screen_pos[0].y()-dot_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()+dot_size); + vertices.append(g->screen_pos[0].y()+dot_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()-dot_size); + vertices.append(g->screen_pos[0].y()+dot_size); + vertices.append(0.0f); + break; - case GIZMO_TYPE_POLY: // draw lines - glBegin(GL_LINES); + case GIZMO_TYPE_POLY: // draw lines for a polygon + for (int k=1;kget_point_count();k++) { - glVertex3f(g->screen_pos[k-1].x(), g->screen_pos[k-1].y(), gizmo_z); - glVertex3f(g->screen_pos[k].x(), g->screen_pos[k].y(), gizmo_z); + + vertices.append(g->screen_pos[k-1].x()); + vertices.append(g->screen_pos[k-1].y()); + vertices.append(0.0f); + + vertices.append(g->screen_pos[k].x()); + vertices.append(g->screen_pos[k].y()); + vertices.append(0.0f); + } - glVertex3f(g->screen_pos[g->get_point_count()-1].x(), g->screen_pos[g->get_point_count()-1].y(), gizmo_z); - glVertex3f(g->screen_pos[0].x(), g->screen_pos[0].y(), gizmo_z); - glEnd(); + + vertices.append(g->screen_pos[g->get_point_count()-1].x()); + vertices.append(g->screen_pos[g->get_point_count()-1].y()); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()); + vertices.append(g->screen_pos[0].y()); + vertices.append(0.0f); + break; case GIZMO_TYPE_TARGET: // draw target - glBegin(GL_LINES); - glVertex3f(g->screen_pos[0].x()-target_size, g->screen_pos[0].y()-target_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()+target_size, g->screen_pos[0].y()-target_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()+target_size, g->screen_pos[0].y()-target_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()+target_size, g->screen_pos[0].y()+target_size, gizmo_z); + vertices.append(g->screen_pos[0].x()-target_size); + vertices.append(g->screen_pos[0].y()-target_size); + vertices.append(0.0f); - glVertex3f(g->screen_pos[0].x()+target_size, g->screen_pos[0].y()+target_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()-target_size, g->screen_pos[0].y()+target_size, gizmo_z); + vertices.append(g->screen_pos[0].x()+target_size); + vertices.append(g->screen_pos[0].y()-target_size); + vertices.append(0.0f); - glVertex3f(g->screen_pos[0].x()-target_size, g->screen_pos[0].y()+target_size, gizmo_z); - glVertex3f(g->screen_pos[0].x()-target_size, g->screen_pos[0].y()-target_size, gizmo_z); + vertices.append(g->screen_pos[0].x()+target_size); + vertices.append(g->screen_pos[0].y()-target_size); + vertices.append(0.0f); - glVertex3f(g->screen_pos[0].x()-target_size, g->screen_pos[0].y(), gizmo_z); - glVertex3f(g->screen_pos[0].x()+target_size, g->screen_pos[0].y(), gizmo_z); + vertices.append(g->screen_pos[0].x()+target_size); + vertices.append(g->screen_pos[0].y()+target_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()+target_size); + vertices.append(g->screen_pos[0].y()+target_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()-target_size); + vertices.append(g->screen_pos[0].y()+target_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()-target_size); + vertices.append(g->screen_pos[0].y()+target_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()-target_size); + vertices.append(g->screen_pos[0].y()-target_size); + vertices.append(0.0f); + + + + vertices.append(g->screen_pos[0].x()-target_size); + vertices.append(g->screen_pos[0].y()); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()+target_size); + vertices.append(g->screen_pos[0].y()); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()); + vertices.append(g->screen_pos[0].y()-target_size); + vertices.append(0.0f); + + vertices.append(g->screen_pos[0].x()); + vertices.append(g->screen_pos[0].y()+target_size); + vertices.append(0.0f); - glVertex3f(g->screen_pos[0].x(), g->screen_pos[0].y()-target_size, gizmo_z); - glVertex3f(g->screen_pos[0].x(), g->screen_pos[0].y()+target_size, gizmo_z); - glEnd(); break; } } - glPopMatrix(); - glColor4f(color[0], color[1], color[2], color[3]); + GLuint vertex_location = pipeline_->attributeLocation("a_position"); + func->glEnableVertexAttribArray(vertex_location); + func->glVertexAttribPointer(vertex_location, 3, GL_FLOAT, GL_FALSE, 0, vertices.constData()); + + func->glDrawArrays(GL_LINES, 0, vertices.size() / 3); + + pipeline_->setUniformValue("color_only", false); + + pipeline_->release(); + } void ViewerWidget::paintGL() { @@ -567,20 +681,11 @@ void ViewerWidget::paintGL() { // draw texture from render thread - double zoom_factor = container->zoom/(double(width())/double(viewer->seq->width)); - double zoom_size = (zoom_factor*2.0) - 2.0; - - QMatrix4x4 matrix; - if (zoom_factor > 1.0) { - matrix.translate((-(x_scroll-0.5))*zoom_size, (y_scroll-0.5)*zoom_size); - matrix.scale(zoom_factor); - } - f->glViewport(0, 0, width(), height()); f->glBindTexture(GL_TEXTURE_2D, tex); - olive::rendering::Blit(pipeline_.get(), true, matrix); + olive::rendering::Blit(pipeline_.get(), true, get_matrix()); f->glBindTexture(GL_TEXTURE_2D, 0); diff --git a/ui/viewerwidget.h b/ui/viewerwidget.h index c9d46398b..2ae8460da 100644 --- a/ui/viewerwidget.h +++ b/ui/viewerwidget.h @@ -81,6 +81,7 @@ private: void move_gizmos(QMouseEvent *event, bool done); bool dragging; void seek_from_click(int x); + QMatrix4x4 get_matrix(); Effect* gizmos; int drag_start_x; int drag_start_y;