X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=25a8ad7b7a7b99483dd59e5799a17c7b80ea4102;hb=af1ca12b6b39b2ef4c97fba0ceed45311d593a1c;hp=65bf3a90e2611011ba4791fbe743d3facc58246c;hpb=bbf08db0aecea0a021b07def18bf41dee2724898;p=nageru

diff --git a/glwidget.h b/glwidget.h
index 65bf3a9..25a8ad7 100644
--- a/glwidget.h
+++ b/glwidget.h
@@ -1,13 +1,27 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
-#include <QOpenGLWidget>
-#include <QOpenGLFunctions>
-#include <QOpenGLVertexArrayObject>
-#include <QOpenGLBuffer>
-#include <QMatrix4x4>
+#include <epoxy/gl.h>
+#include <QGLWidget>
+#include <string>
+#include <vector>
 
-class GLWidget : public QOpenGLWidget
+#include "mixer.h"
+#include "qgl.h"
+#include "qobjectdefs.h"
+
+class QMouseEvent;
+class QWidget;
+
+namespace movit {
+class ResourcePool;
+}
+
+// Note: We use the older QGLWidget instead of QOpenGLWidget as it is
+// much faster (does not go through a separate offscreen rendering step).
+//
+// TODO: Consider if QOpenGLWindow could do what we want.
+class GLWidget : public QGLWidget
 {
 	Q_OBJECT
 
@@ -15,9 +29,26 @@ public:
 	GLWidget(QWidget *parent = 0);
 	~GLWidget();
 
+	void set_output(Mixer::Output output)
+	{
+		this->output = output;
+	}
+
 protected:
-	void initializeGL() Q_DECL_OVERRIDE;
-	void paintGL() Q_DECL_OVERRIDE;
+	void initializeGL() override;
+	void resizeGL(int width, int height) override;
+	void paintGL() override;
+	void mousePressEvent(QMouseEvent *event) override;
+
+signals:
+	void clicked();
+	void transition_names_updated(std::vector<std::string> transition_names);
+
+private:
+	Mixer::Output output;
+	movit::ResourcePool *resource_pool;
+	GLuint vao, program_num;
+	GLuint position_vbo, texcoord_vbo;
 };
 
 #endif