From 6e67a0f13263b748718c692b4c6481a70b127fda Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 22 Sep 2014 20:35:45 +0200 Subject: Initial commit --- src/control/MapContext.cpp | 46 ++++++++++++++++++++++++++++++++++ src/control/MapContext.hpp | 57 ++++++++++++++++++++++++++++++++++++++++++ src/control/TileLoader.cpp | 59 +++++++++++++++++++++++++++++++++++++++++++ src/control/TileLoader.hpp | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 224 insertions(+) create mode 100644 src/control/MapContext.cpp create mode 100644 src/control/MapContext.hpp create mode 100644 src/control/TileLoader.cpp create mode 100644 src/control/TileLoader.hpp (limited to 'src/control') diff --git a/src/control/MapContext.cpp b/src/control/MapContext.cpp new file mode 100644 index 0000000..4d3a4d7 --- /dev/null +++ b/src/control/MapContext.cpp @@ -0,0 +1,46 @@ +/* + 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 "MapContext.hpp" + + +namespace RPGEdit { + +namespace Control { + +MapContext::MapContext(TileLoader *tileLoader0, const std::shared_ptr &map0) + : tileLoader(tileLoader0), 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]); +} + +} + +} diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp new file mode 100644 index 0000000..703a582 --- /dev/null +++ b/src/control/MapContext.hpp @@ -0,0 +1,57 @@ +/* + 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 "TileLoader.hpp" +#include "../model/Map.hpp" +#include "../view/MapView.hpp" + +#include + + +namespace RPGEdit { + +namespace Control { + +class MapContext { +private: + TileLoader *const tileLoader; + + std::shared_ptr map; + std::vector tiles; + +public: + MapContext(TileLoader *tileLoader0, const std::shared_ptr &map0); + + std::shared_ptr initView(const std::shared_ptr &window) { + return std::make_shared(window, map, tiles); + } +}; + +} + +} diff --git a/src/control/TileLoader.cpp b/src/control/TileLoader.cpp new file mode 100644 index 0000000..476ffa4 --- /dev/null +++ b/src/control/TileLoader.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 "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 new file mode 100644 index 0000000..9fc9dfa --- /dev/null +++ b/src/control/TileLoader.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 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