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

timeline middle click moving and more glsl debugging info

Browse Source
This commit is contained in:
itsmattkc
2019-01-10 09:31:42 +11:00
parent 0318ad4965
commit 342e4c765a
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/effect.cpp
+19 -7
View File
@@ -793,16 +793,28 @@ void Effect::open() {
validate_meta_path();
bool glsl_compiled = true;
if (!vertPath.isEmpty()) {
if (!glslProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, meta->path + "/" + vertPath)) {
glsl_compiled = false;
}
if (glslProgram->addShaderFromSourceFile(QOpenGLShader::Vertex, meta->path + "/" + vertPath)) {
dout << "[INFO] Vertex shader added successfully";
} else {
glsl_compiled = false;
dout << "[WARNING] Vertex shader could not be added";
}
}
if (!fragPath.isEmpty()) {
if (!glslProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, meta->path + "/" + fragPath)) {
glsl_compiled = false;
}
if (glslProgram->addShaderFromSourceFile(QOpenGLShader::Fragment, meta->path + "/" + fragPath)) {
dout << "[INFO] Fragment shader added successfully";
} else {
glsl_compiled = false;
dout << "[WARNING] Fragment shader could not be added";
}
}
if (glsl_compiled) glslProgram->link();
if (glsl_compiled) {
if (glslProgram->link()) {
dout << "[INFO] Shader program linked successfully";
} else {
dout << "[WARNING] Shader program failed to link";
}
}
isOpen = true;
}
} else {
ui/timelinewidget.cpp
+5 -2
View File
@@ -554,7 +554,10 @@ bool isLiveEditing() {
void TimelineWidget::mousePressEvent(QMouseEvent *event) {
if (sequence != NULL) {
int tool = panel_timeline->tool;
if (event->button() == Qt::RightButton) {
if (event->button() == Qt::MiddleButton) {
tool = TIMELINE_TOOL_HAND;
panel_timeline->creating = false;
} else if (event->button() == Qt::RightButton) {
tool = TIMELINE_TOOL_MENU;
panel_timeline->creating = false;
}
@@ -1155,12 +1158,12 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
panel_timeline->rect_select_proc = false;
panel_timeline->transition_tool_init = false;
panel_timeline->transition_tool_proc = false;
panel_timeline->hand_moving = false;
pre_clips.clear();
post_clips.clear();
update_ui(true);
}
panel_timeline->hand_moving = false;
}
}