Make water renderer work with smaller textures at different sizes

Author: sharkwouter

assets/images/water.bmp

@@ -512,7 +512,7 @@ class Water : public GroundTile
 		chop=!chop;
 		if (chop) {
 			static_rotation++;
-			static_rotation%=BLOCK_SIZE;
+			static_rotation%=BLOCK_SIZE * 2;
 		}
 	}
 

include/Tile.h

@@ -4,17 +4,23 @@
 #if defined(NXDK)
     inline constexpr int WINDOW_WIDTH = 640;
     inline constexpr int WINDOW_HEIGHT = 480;
+    inline constexpr int BLOCK_SIZE = 40;
 #elif defined(__vita__)
     inline constexpr int WINDOW_WIDTH = 960;
     inline constexpr int WINDOW_HEIGHT = 544;
+    inline constexpr int BLOCK_SIZE = 40;
+#elif defined(__PSP__)
+    inline constexpr int WINDOW_WIDTH = 480;
+    inline constexpr int WINDOW_HEIGHT = 272;
+    inline constexpr int BLOCK_SIZE = 16;
 #else
-    inline constexpr int WINDOW_WIDTH = 640;
-    inline constexpr int WINDOW_HEIGHT = 480;
+    inline constexpr int WINDOW_WIDTH = 800;
+    inline constexpr int WINDOW_HEIGHT = 600;
+    inline constexpr int BLOCK_SIZE = 40;
 #endif
 
 inline constexpr int COLUMNS = 20;
 inline constexpr int ROWS = 15;
-inline constexpr int BLOCK_SIZE = 16;
 
 inline constexpr int BEAM_PERSISTANCE = 4;		//beam lasts for this many 0.025 second intervals
 

include/constants.h

@@ -26,32 +26,20 @@ void Draw::BlitSquare(SDL_Texture * texture, int x, int y, int dx, int dy) {
 }
 
 void Draw::BlitWater(SDL_Texture * texture, int rotation, int dx, int dy) {
-    SDL_Rect sr, dr;
+    // Slow down the water by half for small block sizes
+    if (BLOCK_SIZE < 20) {
+        rotation /= 2;
+    }
+    rotation = rotation % BLOCK_SIZE;
     dx *= BLOCK_SIZE;
     dy *= BLOCK_SIZE;
-    for (int i = 0; i < 4; i++){
-        switch (i)
-        {
-        case 0:
-            sr = {0,0,rotation, rotation};
-            dr = {dx, dy, rotation, rotation};
-            break;
-        case 1:
-            sr = {rotation, 0,BLOCK_SIZE-rotation, rotation};
-            dr = {dx+rotation, dy, BLOCK_SIZE-rotation, rotation};
-            break;
-        case 2:
-            sr = {0,rotation,rotation, BLOCK_SIZE-rotation};
-            dr = {dx, dy+rotation, rotation, BLOCK_SIZE-rotation};
-            break;
-        case 3:
-            sr = {rotation,rotation,BLOCK_SIZE-rotation, BLOCK_SIZE-rotation};
-            dr = {dx+rotation, dy+rotation, BLOCK_SIZE-rotation, BLOCK_SIZE-rotation};
-            break;
-        default:
-            break;
-        }
-        SDL_RenderCopy(renderer, texture, &sr, &dr);
+    SDL_Rect dr={dx + rotation, dy, BLOCK_SIZE - rotation, BLOCK_SIZE};
+    SDL_Rect sr={0, 0, BLOCK_SIZE - rotation, BLOCK_SIZE};
+    SDL_RenderCopy(renderer, texture, &sr, &dr);
+    if (rotation > 0) {
+        SDL_Rect dr2={dx, dy, rotation, BLOCK_SIZE};
+        SDL_Rect sr2={BLOCK_SIZE - rotation, 0, rotation, BLOCK_SIZE};
+        SDL_RenderCopy(renderer, texture, &sr2, &dr2);
     }
 }
 

src/Draw.cpp

@@ -8,6 +8,8 @@
 
 #include <SDL_ttf.h>
 
+#include "constants.h"
+
 Window::Window(const std::string &title, int width, int height) {
     #ifdef NXDK
         XVideoSetMode(width, height, 16, REFRESH_DEFAULT);
@@ -34,6 +36,8 @@ Window::Window(const std::string &title, int width, int height) {
         SDL_LogCritical(SDL_LOG_CATEGORY_RENDER, "Couldn't create renderer: %s", SDL_GetError());
         exit(4);
     }
+
+    SDL_RenderSetLogicalSize(renderer, COLUMNS * BLOCK_SIZE, ROWS * BLOCK_SIZE);
 }
 
 Window::~Window() {