1 files changed, 26 insertions, 15 deletions

@@ -288,22 +288,33 @@ void Renderer::render(
 
   SDL_SetRenderTarget(ren_.get(), nullptr);
 
-  if (!game.zooming)
+  SDL_Rect zoomRect;
+
+  std::tie(zoomRect.x, zoomRect.y, zoomRect.w, zoomRect.h) =
+    calculateZoomRect(game);
+
+  SDL_RenderCopy(ren_.get(), canvas.get(), &zoomRect, nullptr);
+  SDL_RenderPresent(ren_.get());
+}
+
+std::tuple<int, int, int, int> Renderer::calculateZoomRect(const Game& game)
+{
+  int x = game.map.getTrueX(game.curBoundX) * TILE_WIDTH;
+  int y = game.map.getTrueY(game.curBoundY) * TILE_HEIGHT;
+  int w = game.curZoom * TILE_WIDTH * ZOOM_X_FACTOR;
+  int h = game.curZoom * TILE_HEIGHT * ZOOM_Y_FACTOR;
+
+  if (game.zooming)
   {
-    SDL_RenderCopy(ren_.get(), canvas.get(), nullptr, nullptr);
-  } else {
-    // TODO: zooming back in to the player
-    SDL_Rect zoomRect {
-      ((game.maxZoom - game.curZoom) * TILE_WIDTH + game.zoomProgress)
-        * ZOOM_X_FACTOR / 2,
-      ((game.maxZoom - game.curZoom) * TILE_HEIGHT + game.zoomProgress)
-        * ZOOM_Y_FACTOR / 2,
-      (game.curZoom * TILE_WIDTH - game.zoomProgress) * ZOOM_X_FACTOR,
-      (game.curZoom * TILE_HEIGHT - game.zoomProgress) * ZOOM_Y_FACTOR
-    };
-
-    SDL_RenderCopy(ren_.get(), canvas.get(), &zoomRect, nullptr);
+    double interp =
+      static_cast<double>(game.zoomProgress) /
+        static_cast<double>(game.zoomLength);
+
+    x = (x - game.lastZoomLeft) * interp + game.lastZoomLeft;
+    y = (y - game.lastZoomTop) * interp + game.lastZoomTop;
+    w = (w - game.lastZoomWidth) * interp + game.lastZoomWidth;
+    h = (h - game.lastZoomHeight) * interp + game.lastZoomHeight;
   }
 
-  SDL_RenderPresent(ren_.get());
+  return {x, y, w, h};
 }