diff --git a/effects/shaders/bulge.frag b/effects/shaders/bulge.frag
index 3569eaa4d..68b55b2ca 100644
--- a/effects/shaders/bulge.frag
+++ b/effects/shaders/bulge.frag
@@ -1,7 +1,3 @@
-#version 120
-
-uniform sampler2D tex0;
-varying vec2 vTexCoord;
const float PI = 3.1415926535;
uniform vec2 resolution;
@@ -18,15 +14,15 @@ vec2 distort(vec2 p, vec2 offset) {
return 0.5 * (p + 1.0);
}
-void main(void) {
+vec4 process(vec4 col) {
vec2 offset = vec2(xoff/resolution.x, yoff/resolution.y);
- vec2 xy = 2.0 * vTexCoord - 1.0 - offset;
+ vec2 xy = 2.0 * v_texcoord - 1.0 - offset;
vec2 uv;
float d = length(xy);
uv = distort(xy, offset);
if (uv.x >= 0.0 && uv.x <= 1.0 && uv.y >= 0.0 && uv.y <= 1.0) {
- gl_FragColor = texture2D(tex0, uv);
+ return texture2D(texture, uv);
} else {
- discard;
+ return vec4(0.0);
}
}
\ No newline at end of file
diff --git a/effects/shaders/dropshadow.xml.disabled b/effects/shaders/dropshadow.xml.disabled
deleted file mode 100644
index 9a5278d4d..000000000
--- a/effects/shaders/dropshadow.xml.disabled
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/effects/shaders/chromakey.frag b/effects/shaders/need checking/chromakey.frag
similarity index 89%
rename from effects/shaders/chromakey.frag
rename to effects/shaders/need checking/chromakey.frag
index 4f57d8b1e..4f8e5ea0e 100644
--- a/effects/shaders/chromakey.frag
+++ b/effects/shaders/need checking/chromakey.frag
@@ -4,9 +4,6 @@ feel free to use or modify at will*/
/*the follwing three functions convert RGB into YCbCr in the same manner as in JPEG images*/
-uniform sampler2D tex;
-varying vec2 vTexCoord;
-
uniform vec3 key_color;
uniform float tola;
uniform float tolb;
@@ -36,12 +33,10 @@ float colorclose(float Cb_p,float Cr_p,float Cb_key,float Cr_key,float tola,floa
return (1.0);
}
-void main(void) {
+vec4 process(vec4 texture_color) {
float cb_key = rgb2cb(key_color);
float cr_key = rgb2cr(key_color);
- vec4 texture_color = texture2D(tex, vTexCoord);
-
float cb = rgb2cb(texture_color.rgb);
float cr = rgb2cr(texture_color.rgb);
float mask = colorclose(cb, cr, cb_key, cr_key, (tola/100.0), (tolb/100.0));
@@ -61,5 +56,5 @@ void main(void) {
} else if (mode == 2) { // original
}
- gl_FragColor = texture_color;
+ return texture_color;
}
\ No newline at end of file
diff --git a/effects/shaders/chromakey.xml b/effects/shaders/need checking/chromakey.xml
similarity index 100%
rename from effects/shaders/chromakey.xml
rename to effects/shaders/need checking/chromakey.xml
diff --git a/effects/shaders/colorcorrection.frag b/effects/shaders/need checking/colorcorrection.frag
similarity index 100%
rename from effects/shaders/colorcorrection.frag
rename to effects/shaders/need checking/colorcorrection.frag
diff --git a/effects/shaders/colorcorrection.xml b/effects/shaders/need checking/colorcorrection.xml
similarity index 100%
rename from effects/shaders/colorcorrection.xml
rename to effects/shaders/need checking/colorcorrection.xml
diff --git a/effects/shaders/colorsel.frag b/effects/shaders/need checking/colorsel.frag
similarity index 89%
rename from effects/shaders/colorsel.frag
rename to effects/shaders/need checking/colorsel.frag
index 903e4a0f8..dc4b7f280 100644
--- a/effects/shaders/colorsel.frag
+++ b/effects/shaders/need checking/colorsel.frag
@@ -2,10 +2,6 @@
Based on Edward Cannon's Simple Chroma Key (adaptation by Olive Team)
RGB to HSV based on MattKC's toonify source code
Feel free to modify and use at will */
-#version 110
-
-uniform sampler2D tex;
-varying vec2 vTexCoord;
uniform float loc;
uniform float hic;
@@ -57,8 +53,7 @@ bool isNotIncreasingSequence(float a, float b, float c) {
return (c < b || a > b);
}
-void main(void) {
- vec4 texture_color = texture2D(tex,vTexCoord);
+vec4 process(vec4 texture_color) {
vec3 color = texture_color.rgb;
float toCheck = 0.0;
@@ -79,5 +74,5 @@ void main(void) {
}
texture_color.a = isNotIncreasingSequence(loc, toCheck, hic) ? (invert ? texture_color.a : 0.0) : (invert ? 0.0 : texture_color.a);
texture_color.rgb *= texture_color.a;
- gl_FragColor = texture_color;
+ return texture_color;
}
diff --git a/effects/shaders/colorsel.xml b/effects/shaders/need checking/colorsel.xml
similarity index 100%
rename from effects/shaders/colorsel.xml
rename to effects/shaders/need checking/colorsel.xml
diff --git a/effects/shaders/discard/common.frag b/effects/shaders/need checking/common.frag
similarity index 100%
rename from effects/shaders/discard/common.frag
rename to effects/shaders/need checking/common.frag
diff --git a/effects/shaders/discard/common.vert b/effects/shaders/need checking/common.vert
similarity index 100%
rename from effects/shaders/discard/common.vert
rename to effects/shaders/need checking/common.vert
diff --git a/effects/shaders/crossstitch.frag b/effects/shaders/need checking/crossstitch.frag
similarity index 100%
rename from effects/shaders/crossstitch.frag
rename to effects/shaders/need checking/crossstitch.frag
diff --git a/effects/shaders/crossstitch.xml b/effects/shaders/need checking/crossstitch.xml
similarity index 100%
rename from effects/shaders/crossstitch.xml
rename to effects/shaders/need checking/crossstitch.xml
diff --git a/effects/shaders/emboss.frag b/effects/shaders/need checking/emboss.frag
similarity index 100%
rename from effects/shaders/emboss.frag
rename to effects/shaders/need checking/emboss.frag
diff --git a/effects/shaders/emboss.xml b/effects/shaders/need checking/emboss.xml
similarity index 100%
rename from effects/shaders/emboss.xml
rename to effects/shaders/need checking/emboss.xml
diff --git a/effects/shaders/findedges.frag b/effects/shaders/need checking/findedges.frag
similarity index 100%
rename from effects/shaders/findedges.frag
rename to effects/shaders/need checking/findedges.frag
diff --git a/effects/shaders/findedges.xml.disabled b/effects/shaders/need checking/findedges.xml.disabled
similarity index 100%
rename from effects/shaders/findedges.xml.disabled
rename to effects/shaders/need checking/findedges.xml.disabled
diff --git a/effects/shaders/fisheye.frag b/effects/shaders/need checking/fisheye.frag
similarity index 67%
rename from effects/shaders/fisheye.frag
rename to effects/shaders/need checking/fisheye.frag
index 18689ccc8..a8b57b7a1 100644
--- a/effects/shaders/fisheye.frag
+++ b/effects/shaders/need checking/fisheye.frag
@@ -1,15 +1,12 @@
-#version 120
-uniform sampler2D tex0;
-varying vec2 vTexCoord;
#define M_PI 3.1415926535897932384626433832795
uniform float size;
-void main(void) {
+vec4 process(vec4 col) {
float maxFactor = 2.0 - (size * 0.01);
vec2 uv;
- vec2 xy = 2.0 * vTexCoord - 1.0;
+ vec2 xy = 2.0 * v_texcoord - 1.0;
float d = length(xy);
if (d < (2.0-maxFactor)) {
d = length(xy * maxFactor);
@@ -20,8 +17,7 @@ void main(void) {
uv.x = r * cos(phi) + 0.5;
uv.y = r * sin(phi) + 0.5;
} else {
- uv = vTexCoord;
+ uv = v_texcoord;
}
- vec4 c = texture2D(tex0, uv);
- gl_FragColor = c;
+ return texture2D(texture, uv);
}
\ No newline at end of file
diff --git a/effects/shaders/fisheye.xml b/effects/shaders/need checking/fisheye.xml
similarity index 100%
rename from effects/shaders/fisheye.xml
rename to effects/shaders/need checking/fisheye.xml
diff --git a/effects/shaders/huesatbri.frag b/effects/shaders/need checking/huesatbri.frag
similarity index 77%
rename from effects/shaders/huesatbri.frag
rename to effects/shaders/need checking/huesatbri.frag
index 21f0fcecb..0582fa501 100644
--- a/effects/shaders/huesatbri.frag
+++ b/effects/shaders/need checking/huesatbri.frag
@@ -1,12 +1,7 @@
-#version 110
-
uniform float hue;
uniform float saturation;
uniform float brightness;
-uniform sampler2D myTexture;
-varying vec2 vTexCoord;
-
vec3 rgb2hsv(vec3 c) {
vec4 K = vec4(0.0, -1.0 / 3.0, 2.0 / 3.0, -1.0);
vec4 p = mix(vec4(c.bg, K.wz), vec4(c.gb, K.xy), step(c.b, c.g));
@@ -23,9 +18,7 @@ vec3 hsv2rgb(vec3 c) {
return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
}
-void main(void) {
- vec4 tex_color = texture2D(myTexture, vTexCoord);
-
+vec4 process(vec4 tex_color) {
vec3 hsv = rgb2hsv(tex_color.rgb);
hsv.r += (hue/360.0);
hsv.g *= (saturation*0.01);
@@ -33,10 +26,8 @@ void main(void) {
vec3 rgb = hsv2rgb(hsv);
- gl_FragColor = vec4(
- rgb.r,
- rgb.g,
- rgb.b,
+ return vec4(
+ rgb.rgb,
tex_color.a
);
}
\ No newline at end of file
diff --git a/effects/shaders/huesatbri.xml b/effects/shaders/need checking/huesatbri.xml
similarity index 100%
rename from effects/shaders/huesatbri.xml
rename to effects/shaders/need checking/huesatbri.xml
diff --git a/effects/shaders/discard/invert.frag b/effects/shaders/need checking/invert.frag
similarity index 100%
rename from effects/shaders/discard/invert.frag
rename to effects/shaders/need checking/invert.frag
diff --git a/effects/shaders/discard/invert.xml b/effects/shaders/need checking/invert.xml
similarity index 100%
rename from effects/shaders/discard/invert.xml
rename to effects/shaders/need checking/invert.xml
diff --git a/effects/shaders/lumakey.frag b/effects/shaders/need checking/lumakey.frag
similarity index 100%
rename from effects/shaders/lumakey.frag
rename to effects/shaders/need checking/lumakey.frag
diff --git a/effects/shaders/lumakey.xml b/effects/shaders/need checking/lumakey.xml
similarity index 100%
rename from effects/shaders/lumakey.xml
rename to effects/shaders/need checking/lumakey.xml
diff --git a/effects/shaders/discard/posterize.frag b/effects/shaders/need checking/posterize.frag
similarity index 100%
rename from effects/shaders/discard/posterize.frag
rename to effects/shaders/need checking/posterize.frag
diff --git a/effects/shaders/discard/posterize.xml b/effects/shaders/need checking/posterize.xml
similarity index 100%
rename from effects/shaders/discard/posterize.xml
rename to effects/shaders/need checking/posterize.xml
diff --git a/effects/shaders/toonify.frag b/effects/shaders/need checking/toonify.frag
similarity index 100%
rename from effects/shaders/toonify.frag
rename to effects/shaders/need checking/toonify.frag
diff --git a/effects/shaders/toonify.xml b/effects/shaders/need checking/toonify.xml
similarity index 100%
rename from effects/shaders/toonify.xml
rename to effects/shaders/need checking/toonify.xml
diff --git a/effects/shaders/discard/volumetriclight.frag b/effects/shaders/need checking/volumetriclight.frag
similarity index 100%
rename from effects/shaders/discard/volumetriclight.frag
rename to effects/shaders/need checking/volumetriclight.frag
diff --git a/effects/shaders/discard/volumetriclight.xml b/effects/shaders/need checking/volumetriclight.xml
similarity index 100%
rename from effects/shaders/discard/volumetriclight.xml
rename to effects/shaders/need checking/volumetriclight.xml
diff --git a/effects/shaders/tile.frag b/effects/shaders/tile.frag
index 5c076b647..c7194a246 100644
--- a/effects/shaders/tile.frag
+++ b/effects/shaders/tile.frag
@@ -1,33 +1,14 @@
-#version 110
-
-varying vec2 vTexCoord;
-uniform sampler2D tex0; // scene buffer
-
uniform float scale;
uniform float centerx;
uniform float centery;
uniform bool mirrorx;
uniform bool mirrory;
-void main(void) {
- vec2 texCoord = vTexCoord;
-
- /*vec2 coord = vec2(
- mod(vTexCoord.x*tilecount, 1.0),
- mod(vTexCoord.y*tilecount, 1.0)
- );
-
- if (mirrorx && mod(vTexCoord.x*tilecount, 2.0) > 1.0) {
- coord.x = 1.0 - coord.x;
- }
-
- if (mirrory && mod(vTexCoord.y*tilecount, 2.0) > 1.0) {
- coord.y = 1.0 - coord.y;
- }*/
-
+vec4 process(vec4 col) {
+
float adj_scale = scale*0.01;
- vec2 scaled_coords = (vTexCoord/adj_scale);
+ vec2 scaled_coords = (v_texcoord/adj_scale);
vec2 coord = scaled_coords-vec2(0.5/adj_scale, 0.5/adj_scale)+vec2(0.5, 0.5)+vec2(-centerx*0.01, -centery*0.01);
vec2 modcoord = mod(coord, 1.0);
@@ -39,5 +20,6 @@ void main(void) {
modcoord.y = 1.0 - modcoord.y;
}
- gl_FragColor = vec4(texture2D(tex0, modcoord));
+ return vec4(texture2D(texture, modcoord));
+
}
\ No newline at end of file
diff --git a/effects/shaders/vignette.frag b/effects/shaders/vignette.frag
index df200f234..86d13b14b 100644
--- a/effects/shaders/vignette.frag
+++ b/effects/shaders/vignette.frag
@@ -1,20 +1,14 @@
-#version 110
-
-uniform sampler2D sceneTex; // 0
uniform float lensRadiusX;
uniform float lensRadiusY;
uniform bool circular;
uniform vec2 resolution;
// uniform vec2 lensRadius; // 0.45, 0.38
-varying vec2 vTexCoord;
-
-void main(void) {
+vec4 process(vec4 c) {
if (lensRadiusX == 0.0) {
- discard;
+ return vec4(0.0);
}
- vec4 c = texture2D(sceneTex, vTexCoord);
- vec2 vignetteCoord = vTexCoord;
+ vec2 vignetteCoord = v_texcoord;
if (circular) {
float ar = (resolution.x/resolution.y);
vignetteCoord.x *= ar;
@@ -22,6 +16,5 @@ void main(void) {
}
float dist = distance(vignetteCoord, vec2(0.5,0.5));
float size = (lensRadiusX*0.01);
- c *= smoothstep(size, size*0.99*(1.0-lensRadiusY*0.01), dist);
- gl_FragColor = c;
-}
\ No newline at end of file
+ return vec4(c.rgb * smoothstep(size, size*0.99*(1.0-lensRadiusY*0.01), dist), c.a);
+}
diff --git a/ui/collapsiblewidget.cpp b/ui/collapsiblewidget.cpp
index 078ef0ef5..4132078b4 100644
--- a/ui/collapsiblewidget.cpp
+++ b/ui/collapsiblewidget.cpp
@@ -108,7 +108,6 @@ void CollapsibleWidget::SetContents(QWidget* c) {
contents = c;
if (!existing) {
layout->addWidget(contents);
- connect(enabled_check, SIGNAL(toggled(bool)), contents, SLOT(setEnabled(bool)));
connect(collapse_button, SIGNAL(clicked()), this, SLOT(on_visible_change()));
}
}
diff --git a/ui/graphview.cpp b/ui/graphview.cpp
index 9f1ef26ef..8f77b43ba 100644
--- a/ui/graphview.cpp
+++ b/ui/graphview.cpp
@@ -347,7 +347,7 @@ void GraphView::paintEvent(QPaintEvent *) {
p.drawLine(playhead_x, 0, playhead_x, height());
if (rect_select) {
- draw_selection_rectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
+ olive::ui::DrawSelectionRectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
p.setBrush(Qt::NoBrush);
}
}
diff --git a/ui/keyframeview.cpp b/ui/keyframeview.cpp
index 201d9cfb8..409294548 100644
--- a/ui/keyframeview.cpp
+++ b/ui/keyframeview.cpp
@@ -182,7 +182,7 @@ void KeyframeView::paintEvent(QPaintEvent*) {
}
if (select_rect) {
- draw_selection_rectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
+ olive::ui::DrawSelectionRectangle(p, QRect(rect_select_x, rect_select_y, rect_select_w, rect_select_h));
}
/*if (mouseover && mouseover_row < rowY.size()) {
diff --git a/ui/rectangleselect.cpp b/ui/rectangleselect.cpp
index 8e13650a2..8c865ebf2 100644
--- a/ui/rectangleselect.cpp
+++ b/ui/rectangleselect.cpp
@@ -20,7 +20,7 @@
#include "rectangleselect.h"
-void draw_selection_rectangle(QPainter& painter, const QRect& rect) {
+void olive::ui::DrawSelectionRectangle(QPainter& painter, const QRect& rect) {
painter.setPen(QColor(204, 204, 204));
painter.setBrush(QColor(0, 0, 0, 32));
painter.drawRect(rect);
diff --git a/ui/rectangleselect.h b/ui/rectangleselect.h
index 45d0d4d5d..10764ffa9 100644
--- a/ui/rectangleselect.h
+++ b/ui/rectangleselect.h
@@ -23,6 +23,9 @@
#include
+namespace olive {
+namespace ui {
+
/**
* @brief Routine for drawing a drag selection rectangle for any given QPainter
*
@@ -34,6 +37,9 @@
*
* Rectangle to draw
*/
-void draw_selection_rectangle(QPainter& painter, const QRect& rect);
+void DrawSelectionRectangle(QPainter& painter, const QRect& rect);
+
+}
+}
#endif // RECTANGLESELECT_H
diff --git a/ui/resizablescrollbar.h b/ui/resizablescrollbar.h
index 1a861f7bf..571ada493 100644
--- a/ui/resizablescrollbar.h
+++ b/ui/resizablescrollbar.h
@@ -25,25 +25,25 @@
class ResizableScrollBar : public QScrollBar
{
- Q_OBJECT
+ Q_OBJECT
public:
- ResizableScrollBar(QWidget * parent = 0);
- bool is_resizing();
+ ResizableScrollBar(QWidget * parent = nullptr);
+ bool is_resizing();
signals:
- void resize_move(double i);
+ void resize_move(double i);
protected:
- void resizeEvent(QResizeEvent *event) override;
- void mousePressEvent(QMouseEvent *) override;
- void mouseMoveEvent(QMouseEvent *) override;
- void mouseReleaseEvent(QMouseEvent *) override;
+ void resizeEvent(QResizeEvent *event) override;
+ void mousePressEvent(QMouseEvent *) override;
+ void mouseMoveEvent(QMouseEvent *) override;
+ void mouseReleaseEvent(QMouseEvent *) override;
private:
- bool resize_init;
- bool resize_proc;
- int resize_start;
- bool resize_top;
+ bool resize_init;
+ bool resize_proc;
+ int resize_start;
+ bool resize_top;
- int resize_start_max;
- int resize_start_width;
+ int resize_start_max;
+ int resize_start_width;
};
#endif // RESIZABLESCROLLBAR_H
diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp
index 00ce56aca..8922f3450 100644
--- a/ui/timelinewidget.cpp
+++ b/ui/timelinewidget.cpp
@@ -3269,7 +3269,7 @@ void TimelineWidget::paintEvent(QPaintEvent*) {
rect_select.translate(0, height());
}
- draw_selection_rectangle(p, rect_select);
+ olive::ui::DrawSelectionRectangle(p, rect_select);
}
// Draw ghosts