Implement possible fix for #28

src/opengl/GLWin.hh

@@ -273,9 +273,9 @@ Shape* pick(int x, int y, Shape*); // click on (x,y), get Shape behind
                             void (GLWin::*callback)());
   uint32_t registerCallback(uint32_t input, const char name[], Security s,
                             std::function<void()> action);
-  template <typename T>
+  template <typename T, typename U>
   uint32_t registerCallback(uint32_t input, const char name[], Security s,
-                            void (T::*callback)(), T* ptr) {
+                            void (T::*callback)(), U* ptr) {
     auto cb_funcptr = std::bind(callback, ptr);
     return registerCallback(input, name, s, cb_funcptr);
   }

src/opengl/MapView2D.hh

@@ -10,7 +10,7 @@ class Style;
 class MapView2D : public Shape {
  private:
   const Style* style;
-  float centerX, centerY, scaleX, scaleY;
+  float centerX, centerY, shiftX, shiftY, scaleX, scaleY;
   glm::mat4 originalTransform;
   glm::mat4 transform;
   // pointer to map loader object has advantage of opaqueness in header file
@@ -22,6 +22,7 @@ class MapView2D : public Shape {
   void setProjection() {
     transform = glm::ortho(centerX - scaleX, centerX + scaleX, centerY - scaleY,
                            centerY + scaleY);
+    getWin()->setDirty();
   }
   void translate(float percentX, float percentY) {
     centerX += percentX * scaleX;
@@ -31,15 +32,15 @@ class MapView2D : public Shape {
   MapView2D(Canvas* parent, const Style* s, BlockMapLoader* bml = nullptr)
       : Shape(parent), style(s), bml(bml), transform(1.0f) {
     const BlockMapLoader::BoundRect& bounds = bml->getBlockMapHeader()->bounds;
-    float centerX = (bounds.xMin + bounds.xMax) * 0.5;
-    float centerY = (bounds.yMin + bounds.yMax) * 0.5;
+    centerX = (bounds.xMin + bounds.xMax) * 0.5;
+    centerY = (bounds.yMin + bounds.yMax) * 0.5;
 
     double ySize = parent->getHeight();
     double xSize = parent->getWidth();
-    double shiftX = -bounds.xMin * xSize / (bounds.xMax - bounds.xMin);
-    double shiftY = ySize + (bounds.yMin * ySize / (bounds.yMax - bounds.yMin));
-    double scaleX = xSize / (bounds.xMax - bounds.xMin);
-    double scaleY = -ySize / (bounds.yMax - bounds.yMin);
+    shiftX = -bounds.xMin * xSize / (bounds.xMax - bounds.xMin);
+    shiftY = ySize + (bounds.yMin * ySize / (bounds.yMax - bounds.yMin));
+    scaleX = xSize / (bounds.xMax - bounds.xMin);
+    scaleY = -ySize / (bounds.yMax - bounds.yMin);
 
     std::cout << "shift: " << shiftX << " " << shiftY << "\n";
     std::cout << "scale: " << scaleX << " " << scaleY << "\n";

src/opengl/Shape.cc

@@ -1,3 +1,5 @@
 #include "opengl/Shape.hh"
+#include "opengl/Canvas.hh"
 
 Shape::~Shape() {}
+GLWin* Shape::getWin() const { return parentCanvas->getWin(); }

src/opengl/Shape.hh

@@ -11,6 +11,7 @@ namespace std {
 
 class Inputs;
 class Canvas;
+class GLWin;
 class Shape {
  protected:
   uint32_t vao, vbo, sbo, lbo, pbo, cbo;
@@ -21,6 +22,13 @@ class Shape {
  public:
   Shape(Canvas* parent) : parentCanvas(parent) {}
   virtual ~Shape();
+
+  /**
+   * @brief Get a pointer to the GLWin object
+   * 
+   * @return GLWin* Window containing the Shape
+   */
+  GLWin* getWin() const;
 #if 0
   void setParentCanvas(Canvas *c) {
     parentCanvas = c;

test/SolarSystem.cc

@@ -139,6 +139,8 @@ class SolarSystem : public GLWin {
     bindEvent(Inputs::LARROW, &SolarSystem::panLeft, this);
     bindEvent(Inputs::UPARROW, &SolarSystem::panForward, this);
     bindEvent(Inputs::DOWNARROW, &SolarSystem::panBack, this);
+    bindEvent(Inputs::INSERT, &SolarSystem::speedTime, this);
+    bindEvent(Inputs::DEL, &SolarSystem::slowTime, this);
   }
   void update() {
     Canvas* c = currentTab()->getMainCanvas();