summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2014-09-23 16:01:52 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2014-09-23 16:01:52 +0200
commita97ab85b332211c143e5225f79d8abeb8bafd542 (patch)
tree6d13555c8d334aca74575f7cb42acad6e7f605c3
parented55551853448ef2e245c6b71f370dfe70b12094 (diff)
downloadrpgedit-a97ab85b332211c143e5225f79d8abeb8bafd542.tar
rpgedit-a97ab85b332211c143e5225f79d8abeb8bafd542.zip
32x32 tiles
-rw-r--r--resources/entity/square.pngbin179 -> 734 bytes
-rw-r--r--resources/tile/dirt.pngbin207 -> 1035 bytes
-rw-r--r--src/view/MapView.cpp2
-rw-r--r--src/view/MapView.hpp2
4 files changed, 2 insertions, 2 deletions
diff --git a/resources/entity/square.png b/resources/entity/square.png
index 97d7802..a386db7 100644
--- a/resources/entity/square.png
+++ b/resources/entity/square.png
Binary files differ
diff --git a/resources/tile/dirt.png b/resources/tile/dirt.png
index e6f8b84..5961666 100644
--- a/resources/tile/dirt.png
+++ b/resources/tile/dirt.png
Binary files 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<int, int> 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<std::string, SDL_Texture *> entityTextures;
int getTileSize() {
- return 16;
+ return 32;
}
public: