summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/view/MapView.cpp148
-rw-r--r--src/view/MapView.hpp114
-rw-r--r--src/view/Window.hpp4
4 files changed, 157 insertions, 110 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8a2b8a..91e5b5f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,6 +6,7 @@ add_executable(rpgedit
control/ImageLoader.cpp
control/MapContext.cpp
model/Map.cpp
+ view/MapView.cpp
)
set_target_properties(rpgedit PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall ${SDL2_CFLAGS_OTHER}")
set_target_properties(rpgedit PROPERTIES LINK_FLAGS "${SDL2_LDFLAGS_OTHER}")
diff --git a/src/view/MapView.cpp b/src/view/MapView.cpp
new file mode 100644
index 0000000..788cee9
--- /dev/null
+++ b/src/view/MapView.cpp
@@ -0,0 +1,148 @@
+/*
+ Copyright (c) 2014, Matthias Schiffer <mschiffer@universe-factory.net>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#include "MapView.hpp"
+
+
+namespace RPGEdit {
+
+namespace View {
+
+MapView::MapView(const std::shared_ptr<Window> &window0,
+ const std::shared_ptr<const Model::Map> &map0,
+ const std::vector<SDL_Surface *> &tiles,
+ const std::map<std::string, SDL_Surface *> &entities)
+ : window(window0), map(map0) {
+ uint32_t rmask, gmask, bmask, amask;
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ rmask = 0xff000000;
+ gmask = 0x00ff0000;
+ bmask = 0x0000ff00;
+ amask = 0x000000ff;
+#else
+ rmask = 0x000000ff;
+ gmask = 0x0000ff00;
+ bmask = 0x00ff0000;
+ amask = 0xff000000;
+#endif
+
+ SDL_Surface *surface = SDL_CreateRGBSurface(0, 16*tiles.size(), 16, 32, rmask, gmask, bmask, amask);
+ SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);
+
+ for (size_t i = 0; i < tiles.size(); i++) {
+ SDL_Rect rect = {
+ .x = int(16*i),
+ .y = 0,
+ .w = 0,
+ .h = 0,
+ };
+
+ SDL_BlitSurface(tiles[i], nullptr, surface, &rect);
+ }
+
+ tileTexture = SDL_CreateTextureFromSurface(window->getRenderer(), surface);
+ SDL_FreeSurface(surface);
+
+ for (const std::pair<std::string, SDL_Surface *> &entity : entities) {
+ entityTextures[entity.first] = SDL_CreateTextureFromSurface(window->getRenderer(), entity.second);
+ }
+}
+
+MapView::~MapView() {
+ SDL_DestroyTexture(tileTexture);
+
+ for (const std::pair<std::string, SDL_Texture *> &entity : entityTextures)
+ SDL_DestroyTexture(entity.second);
+}
+
+void MapView::render(float centerX, float centerY) {
+ SDL_RenderClear(window->getRenderer());
+
+ std::pair<int, int> viewport = window->getViewport();
+
+ float pixels = std::max(viewport.first/16.0f, viewport.second/12.0f);
+ int tilePixels = 16 * std::ceil(pixels / 16);
+
+ float tilesW = viewport.first / tilePixels;
+ float tilesH = viewport.second / tilePixels;
+
+ int minX = std::floor(centerX - tilesW/2 - 0.5f), maxX = std::ceil(centerX + tilesW/2 + 0.5f);
+ int minY = std::floor(centerY - tilesH/2 - 0.5f), maxY = std::ceil(centerY + tilesH/2 + 0.5f);
+
+ int baseX = viewport.first/2 - (centerX + 0.5f)*tilePixels, baseY = viewport.second/2 - (centerY + 0.5f)*tilePixels;
+
+ for (int x = minX; x <= maxX; x++) {
+ for (int y = minY; y <= maxY; y++) {
+ uint32_t tile = map->getTileAt(x, y);
+ if (!tile)
+ continue;
+
+ SDL_Rect src = {
+ .x = int(16*(tile-1)),
+ .y = 0,
+ .w = 16,
+ .h = 16,
+ };
+
+ SDL_Rect dst = {
+ .x = baseX + x*tilePixels,
+ .y = baseY + y*tilePixels,
+ .w = tilePixels,
+ .h = tilePixels,
+ };
+
+ SDL_RenderCopy(window->getRenderer(), tileTexture, &src, &dst);
+ }
+ }
+
+ for (const std::shared_ptr<Model::Entity> &entity : map->getEntities()) {
+ std::pair<float, float> pos = entity->getPosition();
+ Direction dir = entity->getDirection();
+
+ SDL_Rect src = {
+ .x = 16*dir,
+ .y = 0,
+ .w = 16,
+ .h = 16,
+ };
+
+ SDL_Rect dst = {
+ .x = baseX + int(pos.first*tilePixels),
+ .y = baseY + int(pos.second*tilePixels),
+ .w = tilePixels,
+ .h = tilePixels,
+ };
+
+ SDL_RenderCopy(window->getRenderer(), entityTextures[entity->getName()], &src, &dst);
+ }
+
+ SDL_RenderPresent(window->getRenderer());
+}
+
+}
+
+}
diff --git a/src/view/MapView.hpp b/src/view/MapView.hpp
index e3fccc6..e5f0e50 100644
--- a/src/view/MapView.hpp
+++ b/src/view/MapView.hpp
@@ -46,116 +46,12 @@ private:
public:
MapView(const std::shared_ptr<Window> &window0,
- const std::shared_ptr<const Model::Map> &map0,
- const std::vector<SDL_Surface *> &tiles,
- const std::map<std::string, SDL_Surface *> &entities)
- : window(window0), map(map0) {
- uint32_t rmask, gmask, bmask, amask;
+ const std::shared_ptr<const Model::Map> &map0,
+ const std::vector<SDL_Surface *> &tiles,
+ const std::map<std::string, SDL_Surface *> &entities);
+ ~MapView();
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- rmask = 0xff000000;
- gmask = 0x00ff0000;
- bmask = 0x0000ff00;
- amask = 0x000000ff;
-#else
- rmask = 0x000000ff;
- gmask = 0x0000ff00;
- bmask = 0x00ff0000;
- amask = 0xff000000;
-#endif
-
- SDL_Surface *surface = SDL_CreateRGBSurface(0, 16*tiles.size(), 16, 32, rmask, gmask, bmask, amask);
- SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);
-
- for (size_t i = 0; i < tiles.size(); i++) {
- SDL_Rect rect = {
- .x = int(16*i),
- .y = 0,
- .w = 0,
- .h = 0,
- };
-
- SDL_BlitSurface(tiles[i], nullptr, surface, &rect);
- }
-
- tileTexture = SDL_CreateTextureFromSurface(window->getRenderer(), surface);
- SDL_FreeSurface(surface);
-
- for (const std::pair<std::string, SDL_Surface *> &entity : entities) {
- entityTextures[entity.first] = SDL_CreateTextureFromSurface(window->getRenderer(), entity.second);
- }
- }
-
- ~MapView() {
- SDL_DestroyTexture(tileTexture);
-
- for (const std::pair<std::string, SDL_Texture *> &entity : entityTextures)
- SDL_DestroyTexture(entity.second);
- }
-
- void render(float centerX, float centerY) {
- SDL_RenderClear(window->getRenderer());
-
- std::pair<int, int> viewport = window->getViewport();
-
- float pixels = std::max(viewport.first/16.0f, viewport.second/12.0f);
- int tilePixels = 16 * std::ceil(pixels / 16);
-
- float tilesW = viewport.first / tilePixels;
- float tilesH = viewport.second / tilePixels;
-
- int minX = std::floor(centerX - tilesW/2 - 0.5f), maxX = std::ceil(centerX + tilesW/2 + 0.5f);
- int minY = std::floor(centerY - tilesH/2 - 0.5f), maxY = std::ceil(centerY + tilesH/2 + 0.5f);
-
- int baseX = viewport.first/2 - (centerX + 0.5f)*tilePixels, baseY = viewport.second/2 - (centerY + 0.5f)*tilePixels;
-
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- uint32_t tile = map->getTileAt(x, y);
- if (!tile)
- continue;
-
- SDL_Rect src = {
- .x = int(16*(tile-1)),
- .y = 0,
- .w = 16,
- .h = 16,
- };
-
- SDL_Rect dst = {
- .x = baseX + x*tilePixels,
- .y = baseY + y*tilePixels,
- .w = tilePixels,
- .h = tilePixels,
- };
-
- SDL_RenderCopy(window->getRenderer(), tileTexture, &src, &dst);
- }
- }
-
- for (const std::shared_ptr<Model::Entity> &entity : map->getEntities()) {
- std::pair<float, float> pos = entity->getPosition();
- Direction dir = entity->getDirection();
-
- SDL_Rect src = {
- .x = 16*dir,
- .y = 0,
- .w = 16,
- .h = 16,
- };
-
- SDL_Rect dst = {
- .x = baseX + int(pos.first*tilePixels),
- .y = baseY + int(pos.second*tilePixels),
- .w = tilePixels,
- .h = tilePixels,
- };
-
- SDL_RenderCopy(window->getRenderer(), entityTextures[entity->getName()], &src, &dst);
- }
-
- SDL_RenderPresent(window->getRenderer());
- }
+ void render(float centerX, float centerY);
};
}
diff --git a/src/view/Window.hpp b/src/view/Window.hpp
index c586b57..f53a9a0 100644
--- a/src/view/Window.hpp
+++ b/src/view/Window.hpp
@@ -26,6 +26,8 @@
#pragma once
+#include <utility>
+
#include <SDL.h>
@@ -57,7 +59,7 @@ public:
int w, h;
SDL_GetWindowSize(window, &w, &h);
- return std::make_pair<>(w, h);
+ return std::pair<int, int>(w, h);
}
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 15:55:52 +0100