Miscellaneous code cleanup

1 files changed, 12 insertions, 94 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 4ac5167..7b22928 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,73 +1,9 @@
-#define SDL_MAIN_HANDLED
-#include <cmath>
-
 #include "bitmap.h"
 #include "level.h"
 #include "train.h"
+#include "util.h"
 #include "window.h"
 
-struct Point2D {
-	float x, y;
-};
-
-Point2D screenToTile(Point2D source)
-{
-	Point2D result;
-
-	constexpr int TILE_SIZE = 24;
-
-	float mx = source.x;
-	float my = source.y;
-	float xx = (mx / TILE_SIZE + my / (TILE_SIZE / 2.f));
-	float yy = (my / (TILE_SIZE / 2.f) - (mx / TILE_SIZE));
-
-	result.x = floor(xx - 1.5f); // Magic numbers
-	result.y = floor(yy - 0.5f);
-
-	return result;
-}
-
-void DrawLevel(Bitmap& bitmap, Bitmap& tiles, Level& level, int xo, int yo)
-{
-	bitmap.clear(0xff224466);
-
-	for (int y = 0; y < 32; ++y) {
-		for (int x = 0; x < 32; ++x) {
-			constexpr int TILE_SIZE = 24;
-
-			auto tile = level.get(x, y);
-
-			int xx = (x - y) * (TILE_SIZE / 2) - xo;
-			int yy = (x + y) * (TILE_SIZE / 4) - yo;
-
-			int tx = (x + y) % 2;
-			int ty = 0;
-
-			if (tile == NorthSouth) {
-				tx = 0;
-				ty = 2;
-			} else if (tile == EastWest) {
-				tx = 1;
-				ty = 2;
-			} else if (tile == SouthEast) {
-				tx = 0;
-				ty = 3;
-			} else if (tile == SouthWest) {
-				tx = 3;
-				ty = 3;
-			} else if (tile == NorthWest) {
-				tx = 1;
-				ty = 3;
-			} else if (tile == NorthEast) {
-				tx = 2;
-				ty = 3;
-			}
-
-			bitmap.blit(tiles, xx, yy, tx * 24, ty * 24, TILE_SIZE, TILE_SIZE);
-		}
-	}
-}
-
 int main(int argc, char** argv)
 {
 	constexpr int Height = 240;
@@ -76,9 +12,7 @@ int main(int argc, char** argv)
 
 	Window window("Nonortho", Width, Height, Scale);
 
-	Bitmap tiles("../res/tiles.png");
 	Level level(32, 32);
-
 	Bitmap bitmap(Width, Height);
 	Train car;
 
@@ -88,38 +22,19 @@ int main(int argc, char** argv)
 
 	window.onMouseDown([&](int button, int x, int y) {
 		if (button == 1) {
-			static const auto update_direction = [&](int xt, int yt) {
-				if (level.get(xt, yt) > 0)
-					level.set(xt, yt, ChooseDirection(level, xt, yt));
-			};
+			int mx = x / Scale + xOffs;
+			int my = y / Scale + yOffs;
 
-			float mx = x / Scale + xOffs;
-			float my = y / Scale + yOffs;
-			Point2D tilePos = screenToTile({ mx, my });
-
-			if (level.inBounds(tilePos.x, tilePos.y)) {
-				auto tile = level.get(tilePos.x, tilePos.y);
-
-				if (tile > 0)
-					tile = 0;
-				else
-					tile = ChooseDirection(level, tilePos.x, tilePos.y);
-
-				level.set(tilePos.x, tilePos.y, tile);
-
-				update_direction(tilePos.x - 1, tilePos.y);
-				update_direction(tilePos.x + 1, tilePos.y);
-				update_direction(tilePos.x, tilePos.y - 1);
-				update_direction(tilePos.x, tilePos.y + 1);
-			}
+			Point2D tilePos = ScreenToTile({ mx, my });
+			level.toggleTile(tilePos.x, tilePos.y);
 		} else if (button == 2 && !isDragging) {
 			xDrag = x;
 			yDrag = y;
 			isDragging = true;
 		} else {
-			float mx = x / Scale + xOffs;
-			float my = y / Scale + yOffs;
-			auto pos = screenToTile({ mx, my });
+			int mx = x / Scale + xOffs;
+			int my = y / Scale + yOffs;
+			auto pos = ScreenToTile({ mx, my });
 			car.setPosition(pos.x, pos.y);
 		}
 	});
@@ -140,9 +55,12 @@ int main(int argc, char** argv)
 
 	while (!window.shouldClose()) {
 		window.update();
-		DrawLevel(bitmap, tiles, level, xOffs, yOffs);
+		bitmap.clear(0xff224466);
+
+		level.draw(bitmap, xOffs, yOffs);
 		car.update(level);
 		car.draw(bitmap, xOffs, yOffs);
+
 		window.draw(bitmap);
 	}