From a97ab85b332211c143e5225f79d8abeb8bafd542 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 23 Sep 2014 16:01:52 +0200 Subject: 32x32 tiles --- resources/entity/square.png | Bin 179 -> 734 bytes resources/tile/dirt.png | Bin 207 -> 1035 bytes src/view/MapView.cpp | 2 +- src/view/MapView.hpp | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/entity/square.png b/resources/entity/square.png index 97d7802..a386db7 100644 Binary files a/resources/entity/square.png and b/resources/entity/square.png differ diff --git a/resources/tile/dirt.png b/resources/tile/dirt.png index e6f8b84..5961666 100644 Binary files a/resources/tile/dirt.png and b/resources/tile/dirt.png differ diff --git a/src/view/MapView.cpp b/src/view/MapView.cpp index 3eb3248..580014e 100644 --- a/src/view/MapView.cpp +++ b/src/view/MapView.cpp @@ -84,7 +84,7 @@ void MapView::render(float centerX, float centerY) { std::pair viewport = window->getViewport(); - float pixels = std::max(viewport.first/16.0f, viewport.second/12.0f); + float pixels = std::max(viewport.first/20.0f, viewport.second/15.0f); int tilePixels = getTileSize() * std::ceil(pixels / getTileSize()); float tilesW = viewport.first / tilePixels; diff --git a/src/view/MapView.hpp b/src/view/MapView.hpp index 373c714..98dfe56 100644 --- a/src/view/MapView.hpp +++ b/src/view/MapView.hpp @@ -45,7 +45,7 @@ private: std::map entityTextures; int getTileSize() { - return 16; + return 32; } public: -- cgit v1.2.3