From b3bcddf96b7fd6219506a8650a7f7b8192ec066b Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 13 Nov 2018 02:56:31 +1100 Subject: [PATCH] fixed broken includes --- dialogs/speeddialog.cpp | 2 +- effects/cornerpin.vert | 27 +++++++++++++++++---------- io/math.cpp | 4 +++- panels/effectcontrols.cpp | 3 +-- panels/project.cpp | 3 +-- panels/timeline.cpp | 2 +- playback/cacher.cpp | 2 +- playback/playback.cpp | 2 +- project/clip.cpp | 2 +- project/undo.cpp | 2 +- ui/keyframeview.cpp | 2 +- 11 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dialogs/speeddialog.cpp b/dialogs/speeddialog.cpp index c1f8b431e..8f85f4594 100644 --- a/dialogs/speeddialog.cpp +++ b/dialogs/speeddialog.cpp @@ -15,7 +15,7 @@ #include "panels/panels.h" #include "panels/timeline.h" #include "project/undo.h" -#include "effects/effect.h" +#include "project/effect.h" SpeedDialog::SpeedDialog(QWidget *parent) : QDialog(parent) { QVBoxLayout* main_layout = new QVBoxLayout(); diff --git a/effects/cornerpin.vert b/effects/cornerpin.vert index ed1ef5f5b..979a66625 100644 --- a/effects/cornerpin.vert +++ b/effects/cornerpin.vert @@ -31,11 +31,14 @@ void main() { float q; - switch (gl_VertexID) { - case 0: q = (d1+d3)/d3; break; - case 1: q = (d0+d2)/d2; break; - case 2: q = (d3+d1)/d1; break; - case 3: q = (d2+d0)/d0; break; + if (gl_VertexID == 0) { + q = (d1+d3)/d3; + } else if (gl_VertexID == 1) { + q = (d0+d2)/d2; + } else if (gl_VertexID == 2) { + q = (d3+d1)/d1; + } else { + q = (d2+d0)/d0; } gl_Position[0] *= q; @@ -45,11 +48,15 @@ void main() { vTexCoord = gl_MultiTexCoord0.xy; } else { vec2 pos; - switch (gl_VertexID) { - case 0: pos = p2; break; // top left - case 1: pos = p3; break; // top right - case 2: pos = p1; break; // bottom right - case 3: pos = p0; break; // bottom left + + if (gl_VertexID == 0) { // top left + pos = p2; + } else if (gl_VertexID == 1) { // top right + pos = p3; + } else if (gl_VertexID == 2) { // bottom right + pos = p1; + } else { // bottom left (3) + pos = p0; } q = pos - p0; diff --git a/io/math.cpp b/io/math.cpp index 714f6ad90..32a12db6e 100644 --- a/io/math.cpp +++ b/io/math.cpp @@ -1,7 +1,9 @@ #include "math.h" +#include + int lerp(int a, int b, double t) { - return ((1.0 - t) * a) + (t * b); + return qRound(((1.0 - t) * a) + (t * b)); } double double_lerp(double a, double b, double t) { diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp index 88de4d586..85beb4df5 100644 --- a/panels/effectcontrols.cpp +++ b/panels/effectcontrols.cpp @@ -7,9 +7,8 @@ #include #include "panels/panels.h" -#include "effects/effect.h" +#include "project/effect.h" #include "project/clip.h" -#include "effects/effect.h" #include "ui/collapsiblewidget.h" #include "project/sequence.h" #include "project/undo.h" diff --git a/panels/project.cpp b/panels/project.cpp index 959cfe522..0667d95cc 100644 --- a/panels/project.cpp +++ b/panels/project.cpp @@ -6,10 +6,9 @@ #include "panels/timeline.h" #include "panels/viewer.h" #include "playback/playback.h" -#include "effects/effect.h" +#include "project/effect.h" #include "panels/timeline.h" #include "project/sequence.h" -#include "effects/effect.h" #include "io/previewgenerator.h" #include "project/undo.h" #include "mainwindow.h" diff --git a/panels/timeline.cpp b/panels/timeline.cpp index addf6d94b..3ab8312e7 100644 --- a/panels/timeline.cpp +++ b/panels/timeline.cpp @@ -15,7 +15,7 @@ #include "ui_viewer.h" #include "project/undo.h" #include "io/config.h" -#include "effects/effect.h" +#include "project/effect.h" #include "debug.h" #include diff --git a/playback/cacher.cpp b/playback/cacher.cpp index ba6a66baf..2cab19c74 100644 --- a/playback/cacher.cpp +++ b/playback/cacher.cpp @@ -5,7 +5,7 @@ #include "io/media.h" #include "playback/audio.h" #include "playback/playback.h" -#include "effects/effect.h" +#include "project/effect.h" #include "panels/timeline.h" #include "panels/project.h" #include "playback/audio.h" diff --git a/playback/playback.cpp b/playback/playback.cpp index 8759a3a58..f6db4c200 100644 --- a/playback/playback.cpp +++ b/playback/playback.cpp @@ -8,7 +8,7 @@ #include "panels/panels.h" #include "panels/timeline.h" #include "panels/viewer.h" -#include "effects/effect.h" +#include "project/effect.h" #include "panels/effectcontrols.h" #include "debug.h" diff --git a/project/clip.cpp b/project/clip.cpp index 46d68d0c8..a0e4dda8f 100644 --- a/project/clip.cpp +++ b/project/clip.cpp @@ -1,6 +1,6 @@ #include "clip.h" -#include "effects/effect.h" +#include "project/effect.h" #include "io/media.h" #include "io/config.h" #include "playback/playback.h" diff --git a/project/undo.cpp b/project/undo.cpp index c05a77da7..4205e70bf 100644 --- a/project/undo.cpp +++ b/project/undo.cpp @@ -13,7 +13,7 @@ #include "panels/timeline.h" #include "playback/playback.h" #include "ui/sourcetable.h" -#include "effects/effect.h" +#include "project/effect.h" #include "io/media.h" #include "playback/cacher.h" #include "ui/labelslider.h" diff --git a/ui/keyframeview.cpp b/ui/keyframeview.cpp index 320dddc02..9af91835a 100644 --- a/ui/keyframeview.cpp +++ b/ui/keyframeview.cpp @@ -1,6 +1,6 @@ #include "keyframeview.h" -#include "effects/effect.h" +#include "project/effect.h" #include "ui/collapsiblewidget.h" #include "panels/panels.h" #include "panels/effectcontrols.h"