Merge branch 'q3k/fix-zoom' into 'master'

Fix Zooming

See merge request SymbioticEDA/nextpnr!8

1 files changed, 10 insertions, 5 deletions

diff --git a/gui/fpgaviewwidget.h b/gui/fpgaviewwidget.h
index 8114a686..526c6199 100644
--- a/gui/fpgaviewwidget.h
+++ b/gui/fpgaviewwidget.h
@@ -252,13 +252,18 @@ class FPGAViewWidget : public QOpenGLWidget, protected QOpenGLFunctions
 
   private:
     QPoint lastPos_;
-    float moveX_;
-    float moveY_;
-    float zoom_;
     LineShader lineShader_;
+    QMatrix4x4 viewMove_;
+    float zoom_;
+    QMatrix4x4 getProjection(void);
+    QVector4D mouseToWorldCoordinates(int x, int y);
+
+    const float zoomNear_ = 1.0f; // do not zoom closer than this
+    const float zoomFar_ = 10000.0f; // do not zoom further than this
+
+    const float zoomLvl1_ = 100.0f;
+    const float zoomLvl2_ = 50.0f;
 
-    float startDragX_;
-    float startDragY_;
     Context *ctx_;
     QColor backgroundColor;
     QColor gridColor;