merge of long discussed new pipeline
This commit is contained in:
itsmattkc
+331
-173
@@ -1,20 +1,20 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2019 Olive Team
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2019 Olive Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
***/
|
||||
|
||||
@@ -27,8 +27,8 @@ extern "C" {
|
||||
#include <QPainter>
|
||||
#include <QAudioOutput>
|
||||
#include <QOpenGLShaderProgram>
|
||||
#include <QOpenGLExtraFunctions>
|
||||
#include <QtMath>
|
||||
#include <QOpenGLFramebufferObject>
|
||||
#include <QMouseEvent>
|
||||
#include <QMimeData>
|
||||
#include <QDrag>
|
||||
@@ -40,6 +40,7 @@ extern "C" {
|
||||
#include <QApplication>
|
||||
#include <QScreen>
|
||||
#include <QMessageBox>
|
||||
#include <QOpenGLBuffer>
|
||||
|
||||
#include "panels/panels.h"
|
||||
#include "project/projectelements.h"
|
||||
@@ -48,17 +49,23 @@ extern "C" {
|
||||
#include "global/config.h"
|
||||
#include "global/debug.h"
|
||||
#include "global/math.h"
|
||||
#include "global/timing.h"
|
||||
#include "ui/collapsiblewidget.h"
|
||||
#include "undo/undo.h"
|
||||
#include "project/media.h"
|
||||
#include "ui/viewercontainer.h"
|
||||
#include "rendering/cacher.h"
|
||||
#include "ui/timelinewidget.h"
|
||||
#include "ui/timelineview.h"
|
||||
#include "rendering/renderfunctions.h"
|
||||
#include "rendering/renderthread.h"
|
||||
#include "rendering/shadergenerators.h"
|
||||
#include "ui/viewerwindow.h"
|
||||
#include "ui/menu.h"
|
||||
#include "ui/waveform.h"
|
||||
#include "mainwindow.h"
|
||||
#include "effects/effectgizmo.h"
|
||||
|
||||
const int kTitleActionSafeVertexSize = 84;
|
||||
|
||||
ViewerWidget::ViewerWidget(QWidget *parent) :
|
||||
QOpenGLWidget(parent),
|
||||
@@ -77,17 +84,14 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
|
||||
setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(show_context_menu()));
|
||||
|
||||
renderer = new RenderThread();
|
||||
renderer->start(QThread::HighestPriority);
|
||||
connect(renderer, SIGNAL(ready()), this, SLOT(queue_repaint()));
|
||||
connect(renderer, SIGNAL(finished()), renderer, SLOT(deleteLater()));
|
||||
renderer.start(QThread::HighestPriority);
|
||||
connect(&renderer, SIGNAL(ready()), this, SLOT(queue_repaint()));
|
||||
|
||||
window = new ViewerWindow(this);
|
||||
}
|
||||
|
||||
ViewerWidget::~ViewerWidget() {
|
||||
renderer->cancel();
|
||||
delete renderer;
|
||||
renderer.cancel();
|
||||
}
|
||||
|
||||
void ViewerWidget::set_waveform_scroll(int s) {
|
||||
@@ -144,7 +148,7 @@ void ViewerWidget::show_context_menu() {
|
||||
connect(&zoom_menu, SIGNAL(triggered(QAction*)), this, SLOT(set_menu_zoom(QAction*)));
|
||||
menu.addMenu(&zoom_menu);
|
||||
|
||||
if (!viewer->is_main_sequence()) {
|
||||
if (viewer->mode() != Viewer::kTimelineMode) {
|
||||
menu.addAction(tr("Close Media"), viewer, SLOT(close_media()));
|
||||
}
|
||||
|
||||
@@ -165,7 +169,7 @@ void ViewerWidget::save_frame() {
|
||||
fn += selected_ext;
|
||||
}
|
||||
|
||||
renderer->start_render(context(), viewer->seq.get(), 1, fn);
|
||||
renderer.start_render(context(), viewer->seq.get(), 1, fn);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -213,9 +217,20 @@ void ViewerWidget::retry() {
|
||||
}
|
||||
|
||||
void ViewerWidget::initializeGL() {
|
||||
initializeOpenGLFunctions();
|
||||
context()->functions()->initializeOpenGLFunctions();
|
||||
|
||||
connect(context(), SIGNAL(aboutToBeDestroyed()), this, SLOT(context_destroy()), Qt::DirectConnection);
|
||||
|
||||
pipeline_ = olive::shader::GetPipeline();
|
||||
|
||||
vao_.create();
|
||||
|
||||
title_safe_area_buffer_.create();
|
||||
title_safe_area_buffer_.bind();
|
||||
title_safe_area_buffer_.allocate(nullptr, kTitleActionSafeVertexSize * sizeof(GLfloat));
|
||||
title_safe_area_buffer_.release();
|
||||
|
||||
gizmo_buffer_.create();
|
||||
}
|
||||
|
||||
void ViewerWidget::frame_update() {
|
||||
@@ -225,7 +240,7 @@ void ViewerWidget::frame_update() {
|
||||
update();
|
||||
} else {
|
||||
doneCurrent();
|
||||
renderer->start_render(context(), viewer->seq.get(), viewer->get_playback_speed());
|
||||
renderer.start_render(context(), viewer->seq.get(), viewer->get_playback_speed());
|
||||
}
|
||||
|
||||
// render the audio
|
||||
@@ -234,7 +249,7 @@ void ViewerWidget::frame_update() {
|
||||
}
|
||||
|
||||
RenderThread *ViewerWidget::get_renderer() {
|
||||
return renderer;
|
||||
return &renderer;
|
||||
}
|
||||
|
||||
void ViewerWidget::set_scroll(double x, double y) {
|
||||
@@ -247,12 +262,37 @@ 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();
|
||||
if (viewer->seq != nullptr) {
|
||||
close_active_clips(viewer->seq.get());
|
||||
|
||||
renderer.delete_ctx();
|
||||
|
||||
title_safe_area_buffer_.destroy();
|
||||
|
||||
if (gizmo_buffer_.isCreated()) {
|
||||
gizmo_buffer_.destroy();
|
||||
}
|
||||
renderer->delete_ctx();
|
||||
|
||||
vao_.destroy();
|
||||
|
||||
pipeline_ = nullptr;
|
||||
|
||||
doneCurrent();
|
||||
}
|
||||
|
||||
@@ -300,7 +340,12 @@ void ViewerWidget::move_gizmos(QMouseEvent *event, bool done) {
|
||||
int x_movement = qRound((event->pos().x() - drag_start_x)*multiplier);
|
||||
int y_movement = qRound((event->pos().y() - drag_start_y)*multiplier);
|
||||
|
||||
gizmos->gizmo_move(selected_gizmo, x_movement, y_movement, get_timecode(gizmos->parent_clip, gizmos->parent_clip->sequence->playhead), done);
|
||||
gizmos->gizmo_move(selected_gizmo,
|
||||
x_movement,
|
||||
y_movement,
|
||||
get_timecode(gizmos->parent_clip,
|
||||
gizmos->parent_clip->track()->sequence()->playhead),
|
||||
done);
|
||||
|
||||
gizmo_x_mvmt += x_movement;
|
||||
gizmo_y_mvmt += y_movement;
|
||||
@@ -313,7 +358,7 @@ void ViewerWidget::move_gizmos(QMouseEvent *event, bool done) {
|
||||
void ViewerWidget::mousePressEvent(QMouseEvent* event) {
|
||||
if (waveform) {
|
||||
seek_from_click(event->x());
|
||||
} else if (event->buttons() & Qt::MiddleButton || panel_timeline->tool == TIMELINE_TOOL_HAND) {
|
||||
} else if (event->buttons() & Qt::MiddleButton || olive::timeline::current_tool == olive::timeline::TIMELINE_TOOL_HAND) {
|
||||
container->dragScrollPress(event->pos()*container->zoom);
|
||||
} else if (event->buttons() & Qt::LeftButton) {
|
||||
drag_start_x = event->pos().x();
|
||||
@@ -329,13 +374,13 @@ void ViewerWidget::mousePressEvent(QMouseEvent* event) {
|
||||
|
||||
void ViewerWidget::mouseMoveEvent(QMouseEvent* event) {
|
||||
unsetCursor();
|
||||
if (panel_timeline->tool == TIMELINE_TOOL_HAND) {
|
||||
if (olive::timeline::current_tool == olive::timeline::TIMELINE_TOOL_HAND) {
|
||||
setCursor(Qt::OpenHandCursor);
|
||||
}
|
||||
if (dragging) {
|
||||
if (waveform) {
|
||||
seek_from_click(event->x());
|
||||
} else if (event->buttons() & Qt::MiddleButton || panel_timeline->tool == TIMELINE_TOOL_HAND) {
|
||||
} else if (event->buttons() & Qt::MiddleButton || olive::timeline::current_tool == olive::timeline::TIMELINE_TOOL_HAND) {
|
||||
container->dragScrollMove(event->pos()*container->zoom);
|
||||
} else if (event->buttons() & Qt::LeftButton) {
|
||||
if (gizmos == nullptr) {
|
||||
@@ -359,7 +404,7 @@ void ViewerWidget::mouseReleaseEvent(QMouseEvent *event) {
|
||||
if (dragging
|
||||
&& gizmos != nullptr
|
||||
&& event->button() == Qt::LeftButton
|
||||
&& panel_timeline->tool != TIMELINE_TOOL_HAND) {
|
||||
&& olive::timeline::current_tool != olive::timeline::TIMELINE_TOOL_HAND) {
|
||||
move_gizmos(event, true);
|
||||
}
|
||||
dragging = false;
|
||||
@@ -375,7 +420,7 @@ void ViewerWidget::close_window() {
|
||||
|
||||
void ViewerWidget::wait_until_render_is_paused()
|
||||
{
|
||||
renderer->wait_until_paused();
|
||||
renderer.wait_until_paused();
|
||||
}
|
||||
|
||||
void ViewerWidget::draw_waveform_func() {
|
||||
@@ -393,224 +438,337 @@ void ViewerWidget::draw_waveform_func() {
|
||||
wr.setX(wr.x() - waveform_scroll);
|
||||
|
||||
p.setPen(Qt::green);
|
||||
draw_waveform(waveform_clip, waveform_ms, waveform_clip->timeline_out(), &p, wr, waveform_scroll, width()+waveform_scroll, waveform_zoom);
|
||||
olive::ui::DrawWaveform(waveform_clip.get(), waveform_ms, waveform_clip->timeline_out(), &p, wr, waveform_scroll, width()+waveform_scroll, waveform_zoom);
|
||||
p.setPen(Qt::red);
|
||||
int playhead_x = getScreenPointFromFrame(waveform_zoom, viewer->seq->playhead) - waveform_scroll;
|
||||
p.drawLine(playhead_x, 0, playhead_x, height());
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
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;
|
||||
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::config.use_custom_title_safe_ratio && olive::config.custom_title_safe_ratio > 0) {
|
||||
if (ar > olive::config.custom_title_safe_ratio) {
|
||||
matrix.translate(((ar - olive::config.custom_title_safe_ratio) / 2.0) / ar, 0.0f);
|
||||
matrix.scale(olive::config.custom_title_safe_ratio / ar, 1.0f);
|
||||
} else {
|
||||
halfWidth = (viewportAr/olive::CurrentConfig.custom_title_safe_ratio)*0.5;
|
||||
matrix.translate(0.0f, (((olive::config.custom_title_safe_ratio - ar) / 2.0) / olive::config.custom_title_safe_ratio));
|
||||
matrix.scale(1.0f, ar / olive::config.custom_title_safe_ratio);
|
||||
}
|
||||
|
||||
horizontal_cross_size *= ar/olive::config.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
|
||||
};
|
||||
|
||||
vao_.bind();
|
||||
|
||||
title_safe_area_buffer_.bind();
|
||||
title_safe_area_buffer_.write(0, vertices, kTitleActionSafeVertexSize * sizeof(GLfloat));
|
||||
|
||||
GLuint vertex_location = pipeline_->attributeLocation("a_position");
|
||||
func->glEnableVertexAttribArray(vertex_location);
|
||||
func->glVertexAttribPointer(vertex_location, 3, GL_FLOAT, GL_FALSE, 0, 0);
|
||||
|
||||
func->glDrawArrays(GL_LINES, 0, 28);
|
||||
|
||||
pipeline_->setUniformValue("color_only", false);
|
||||
|
||||
title_safe_area_buffer_.release();
|
||||
|
||||
vao_.release();
|
||||
|
||||
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);
|
||||
// Set transformation matrix
|
||||
pipeline_->setUniformValue("mvp_matrix", matrix);
|
||||
|
||||
// Set pipeline shader to draw full white
|
||||
pipeline_->setUniformValue("color_only", true);
|
||||
pipeline_->setUniformValue("color_only_color", QColor(255, 255, 255, 255));
|
||||
|
||||
// Set up constants for gizmo sizes
|
||||
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<GLfloat> vertices;
|
||||
|
||||
float gizmo_z = 0.0f;
|
||||
for (int j=0;j<gizmos->gizmo_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();
|
||||
case GIZMO_TYPE_DOT:
|
||||
|
||||
// Draw standard square dot
|
||||
|
||||
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 an arbitrary polygon with lines
|
||||
|
||||
for (int k=1;k<g->get_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);
|
||||
case GIZMO_TYPE_TARGET:
|
||||
|
||||
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);
|
||||
// Draw "target" gizmo (square with two lines through the middle)
|
||||
|
||||
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()-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]);
|
||||
vao_.bind();
|
||||
|
||||
// The gizmo buffer may have been destroyed or not created yet, ensure it's created here
|
||||
if (!gizmo_buffer_.isCreated() && !gizmo_buffer_.create()) {
|
||||
return;
|
||||
}
|
||||
|
||||
gizmo_buffer_.bind();
|
||||
|
||||
// Get the total byte size of the vertex array
|
||||
int gizmo_buffer_desired_size = vertices.size() * sizeof(GLfloat);
|
||||
|
||||
// Determine if the gizmo count has changed, and if so reallocate the buffer
|
||||
if (gizmo_buffer_.size() != gizmo_buffer_desired_size) {
|
||||
gizmo_buffer_.allocate(vertices.constData(), gizmo_buffer_desired_size);
|
||||
} else {
|
||||
gizmo_buffer_.write(0, vertices.constData(), gizmo_buffer_desired_size);
|
||||
}
|
||||
|
||||
|
||||
GLuint vertex_location = pipeline_->attributeLocation("a_position");
|
||||
func->glEnableVertexAttribArray(vertex_location);
|
||||
func->glVertexAttribPointer(vertex_location, 3, GL_FLOAT, GL_FALSE, 0, 0);
|
||||
|
||||
gizmo_buffer_.release();
|
||||
|
||||
func->glDrawArrays(GL_LINES, 0, vertices.size() / 3);
|
||||
|
||||
pipeline_->setUniformValue("color_only", false);
|
||||
|
||||
vao_.release();
|
||||
|
||||
pipeline_->release();
|
||||
|
||||
}
|
||||
|
||||
void ViewerWidget::paintGL() {
|
||||
if (waveform) {
|
||||
draw_waveform_func();
|
||||
} else {
|
||||
const GLuint tex = renderer->get_texture();
|
||||
QMutex* tex_lock = renderer->get_texture_mutex();
|
||||
const GLuint tex = renderer.get_texture();
|
||||
QMutex* tex_lock = renderer.get_texture_mutex();
|
||||
|
||||
tex_lock->lock();
|
||||
|
||||
QOpenGLFunctions* f = context()->functions();
|
||||
|
||||
makeCurrent();
|
||||
|
||||
// clear to solid black
|
||||
glClearColor(0.0, 0.0, 0.0, 0.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
f->glClearColor(0.0, 0.0, 0.0, 0.0);
|
||||
f->glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
// set color multipler to straight white
|
||||
glColor4f(1.0, 1.0, 1.0, 1.0);
|
||||
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
|
||||
// set screen coords to widget size
|
||||
glLoadIdentity();
|
||||
glOrtho(-1, 1, -1, 1, -1, 1);
|
||||
|
||||
// draw texture from render thread
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
f->glViewport(0, 0, width(), height());
|
||||
|
||||
context()->functions()->glGenerateMipmap(GL_TEXTURE_2D);
|
||||
f->glBindTexture(GL_TEXTURE_2D, tex);
|
||||
|
||||
glBegin(GL_QUADS);
|
||||
olive::rendering::Blit(pipeline_.get(), true, get_matrix());
|
||||
|
||||
double zoom_factor = container->zoom/(double(width())/double(viewer->seq->width));
|
||||
double zoom_size = (zoom_factor*2.0) - 2.0;
|
||||
double zoom_left = -zoom_size*x_scroll - 1.0;
|
||||
double zoom_right = zoom_size*(1.0-x_scroll) + 1.0;
|
||||
double zoom_bottom = -zoom_size*(1.0-y_scroll) - 1.0;
|
||||
double zoom_top = zoom_size*(y_scroll) + 1.0;
|
||||
|
||||
//zoom_left *= ar_diff;
|
||||
//zoom_right *= ar_diff;
|
||||
|
||||
glVertex2d(zoom_left, zoom_bottom);
|
||||
glTexCoord2d(0, 0);
|
||||
glVertex2d(zoom_left, zoom_top);
|
||||
glTexCoord2d(1, 0);
|
||||
glVertex2d(zoom_right, zoom_top);
|
||||
glTexCoord2d(1, 1);
|
||||
glVertex2d(zoom_right, zoom_bottom);
|
||||
glTexCoord2d(0, 1);
|
||||
|
||||
glEnd();
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
f->glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
||||
// draw title/action safe area
|
||||
if (olive::CurrentConfig.show_title_safe_area) {
|
||||
if (olive::config.show_title_safe_area) {
|
||||
draw_title_safe_area();
|
||||
}
|
||||
|
||||
gizmos = renderer->gizmos;
|
||||
gizmos = renderer.gizmos;
|
||||
if (gizmos != nullptr) {
|
||||
draw_gizmos();
|
||||
}
|
||||
|
||||
glDisable(GL_TEXTURE_2D);
|
||||
glFinish();
|
||||
|
||||
if (window->isVisible()) {
|
||||
window->set_texture(tex, double(viewer->seq->width)/double(viewer->seq->height), tex_lock);
|
||||
}
|
||||
|
||||
tex_lock->unlock();
|
||||
|
||||
if (renderer->did_texture_fail() && !viewer->playing) {
|
||||
if (renderer.did_texture_fail() && !viewer->playing) {
|
||||
doneCurrent();
|
||||
renderer->start_render(context(), viewer->seq.get(), viewer->get_playback_speed());
|
||||
renderer.start_render(context(), viewer->seq.get(), viewer->get_playback_speed());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user