fixed broken includes

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();

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;

io/math.cpp

@@ -1,7 +1,9 @@
 #include "math.h"
 
+#include <QtMath>
+
 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) {

panels/effectcontrols.cpp

@@ -7,9 +7,8 @@
 #include <QScrollBar>
 
 #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"

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"

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 <QTime>

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"

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"
 

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"

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"

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"