Adding zoom and pan

[fstl] / src / canvas.h

diff --git a/src/canvas.h b/src/canvas.h
index 810c334d7cb6acf531805b8f15d5277083235f19..33313cfcbf894c47aae09119c20398442fbe5369 100644 (file)
--- a/src/canvas.h
+++ b/src/canvas.h
@@ -3,6 +3,7 @@
 
 #include <QWidget>
 #include <QtOpenGL/QGLWidget>
+#include <QtOpenGL/QGLFunctions>
 #include <QtOpenGL/QGLShaderProgram>
 #include <QMatrix4x4>
 
@@ -10,7 +11,7 @@ class GLMesh;
 class Mesh;
 class Backdrop;
 
-class Canvas : public QGLWidget
+class Canvas : public QGLWidget, protected QGLFunctions
 {
     Q_OBJECT
 
@@ -31,6 +32,7 @@ protected:
     void mousePressEvent(QMouseEvent* event);
     void mouseReleaseEvent(QMouseEvent* event);
     void mouseMoveEvent(QMouseEvent* event);
+    void wheelEvent(QWheelEvent* event);
 
 
 private:
@@ -47,6 +49,7 @@ private:
 
     QVector3D center;
     float scale;
+    float zoom;
     float tilt;
     float yaw;