From fe0c3b733abf6eac5f4b5bc18f24f8a5cda1bfc4 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 22 Sep 2014 21:54:01 +0200 Subject: Render entities --- src/control/ImageLoader.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++ src/control/ImageLoader.hpp | 62 +++++++++++++++++++++++++++++++++++++++++++++ src/control/MapContext.cpp | 12 ++++++--- src/control/MapContext.hpp | 11 +++++--- src/control/TileLoader.cpp | 59 ------------------------------------------ src/control/TileLoader.hpp | 62 --------------------------------------------- 6 files changed, 136 insertions(+), 129 deletions(-) create mode 100644 src/control/ImageLoader.cpp create mode 100644 src/control/ImageLoader.hpp delete mode 100644 src/control/TileLoader.cpp delete mode 100644 src/control/TileLoader.hpp (limited to 'src/control') diff --git a/src/control/ImageLoader.cpp b/src/control/ImageLoader.cpp new file mode 100644 index 0000000..2e78087 --- /dev/null +++ b/src/control/ImageLoader.cpp @@ -0,0 +1,59 @@ +/* + Copyright (c) 2014, Matthias Schiffer + 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 "ImageLoader.hpp" + +#include + + +namespace RPGEdit { + +namespace Control { + +std::unique_ptr ImageLoader::load(const std::string &name) { + std::string filename = "../resources/" + name + ".png"; + + SDL_Surface *surface = IMG_Load(filename.c_str()); + + return std::unique_ptr(surface, SDL_Surface_deleter()); +} + +SDL_Surface * ImageLoader::get(const std::string &name) { + std::unique_ptr &surface = tiles[name]; + + if (!surface) + surface = load(name); + + if (!surface) + tiles.erase(tiles.find(name)); + + return surface.get(); +} + + +} + +} diff --git a/src/control/ImageLoader.hpp b/src/control/ImageLoader.hpp new file mode 100644 index 0000000..36ae7cd --- /dev/null +++ b/src/control/ImageLoader.hpp @@ -0,0 +1,62 @@ +/* + Copyright (c) 2014, Matthias Schiffer + 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. +*/ + + +#pragma once + +#include +#include + +#include + + +namespace RPGEdit { + +namespace Control { + +class ImageLoader { +private: + class SDL_Surface_deleter { + public: + void operator()(SDL_Surface *surface) { + SDL_FreeSurface(surface); + } + }; + + std::unordered_map> tiles; + + std::unique_ptr load(const std::string &name); + +public: + SDL_Surface * get(const std::string &name); + + void clear() { + tiles.clear(); + } +}; + +} + +} diff --git a/src/control/MapContext.cpp b/src/control/MapContext.cpp index 4d3a4d7..5fda337 100644 --- a/src/control/MapContext.cpp +++ b/src/control/MapContext.cpp @@ -31,14 +31,18 @@ namespace RPGEdit { namespace Control { -MapContext::MapContext(TileLoader *tileLoader0, const std::shared_ptr &map0) - : tileLoader(tileLoader0), map(map0) { +MapContext::MapContext(ImageLoader *imageLoader0, const std::shared_ptr &map0) + : imageLoader(imageLoader0), map(map0) { const std::vector &tileset = map->getTileset(); tiles.resize(tileset.size()); - for (size_t i = 0; i < tileset.size(); i++) - tiles[i] = tileLoader->get(tileset[i]); + tiles[i] = imageLoader->get("tile/" + tileset[i]); + + std::deque> &mapEntities = map->getEntities(); + + for (const std::shared_ptr &entity : mapEntities) + entities[entity->getName()] = imageLoader->get("entity/" + entity->getName()); } } diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp index 703a582..a98d818 100644 --- a/src/control/MapContext.hpp +++ b/src/control/MapContext.hpp @@ -26,10 +26,11 @@ #pragma once -#include "TileLoader.hpp" +#include "ImageLoader.hpp" #include "../model/Map.hpp" #include "../view/MapView.hpp" +#include #include @@ -39,16 +40,18 @@ namespace Control { class MapContext { private: - TileLoader *const tileLoader; + ImageLoader *const imageLoader; std::shared_ptr map; + std::vector tiles; + std::map entities; public: - MapContext(TileLoader *tileLoader0, const std::shared_ptr &map0); + MapContext(ImageLoader *imageLoader0, const std::shared_ptr &map0); std::shared_ptr initView(const std::shared_ptr &window) { - return std::make_shared(window, map, tiles); + return std::make_shared(window, map, tiles, entities); } }; diff --git a/src/control/TileLoader.cpp b/src/control/TileLoader.cpp deleted file mode 100644 index 476ffa4..0000000 --- a/src/control/TileLoader.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - Copyright (c) 2014, Matthias Schiffer - 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 "TileLoader.hpp" - -#include - - -namespace RPGEdit { - -namespace Control { - -std::unique_ptr TileLoader::loadTile(const std::string &name) { - std::string filename = "../resources/tile/" + name + ".png"; - - SDL_Surface *surface = IMG_Load(filename.c_str()); - - return std::unique_ptr(surface, SDL_Surface_deleter()); -} - -SDL_Surface * TileLoader::get(const std::string &name) { - std::unique_ptr &surface = tiles[name]; - - if (!surface) - surface = loadTile(name); - - if (!surface) - tiles.erase(tiles.find(name)); - - return surface.get(); -} - - -} - -} diff --git a/src/control/TileLoader.hpp b/src/control/TileLoader.hpp deleted file mode 100644 index 9fc9dfa..0000000 --- a/src/control/TileLoader.hpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (c) 2014, Matthias Schiffer - 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. -*/ - - -#pragma once - -#include -#include - -#include - - -namespace RPGEdit { - -namespace Control { - -class TileLoader { -private: - class SDL_Surface_deleter { - public: - void operator()(SDL_Surface *surface) { - SDL_FreeSurface(surface); - } - }; - - std::unordered_map> tiles; - - std::unique_ptr loadTile(const std::string &name); - -public: - SDL_Surface * get(const std::string &name); - - void clear() { - tiles.clear(); - } -}; - -} - -} -- cgit v1.2.3