From 11e77a9d65972c8e59aefd72419dfcf9036e9f6a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 23 Sep 2014 00:13:05 +0200 Subject: Allow player movement --- src/control/InputHandler.hpp | 73 ++++++++++++++++++++++++++++++++++++++++++++ src/control/MapContext.hpp | 23 ++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 src/control/InputHandler.hpp (limited to 'src/control') diff --git a/src/control/InputHandler.hpp b/src/control/InputHandler.hpp new file mode 100644 index 0000000..eba94d1 --- /dev/null +++ b/src/control/InputHandler.hpp @@ -0,0 +1,73 @@ +/* + 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 InputHandler { +private: + std::unordered_set pressedKeys; + std::unordered_set unhandledKeys; + +public: + void keyPressed(SDL_Scancode key) { + pressedKeys.insert(key); + unhandledKeys.insert(key); + } + + void keyReleased(SDL_Scancode key) { + pressedKeys.erase(key); + } + + void keyHandled(SDL_Scancode key) { + unhandledKeys.erase(key); + } + + void resetHandled() { + unhandledKeys.clear(); + } + + bool isKeyPressed(SDL_Scancode key) { + return pressedKeys.count(key); + } + + bool isKeyUnhandled(SDL_Scancode key) { + return unhandledKeys.count(key); + } +}; + +} + +} diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp index a98d818..4cbf38a 100644 --- a/src/control/MapContext.hpp +++ b/src/control/MapContext.hpp @@ -27,6 +27,7 @@ #pragma once #include "ImageLoader.hpp" +#include "InputHandler.hpp" #include "../model/Map.hpp" #include "../view/MapView.hpp" @@ -47,9 +48,31 @@ private: std::vector tiles; std::map entities; + uint64_t totalTicks = 0; + public: MapContext(ImageLoader *imageLoader0, const std::shared_ptr &map0); + void advance(InputHandler *inputHandler, uint32_t ticks) { + uint64_t totalTicksOld = totalTicks; + totalTicks += ticks; + + uint64_t advanced = totalTicks/100 - totalTicksOld/100; + + if (inputHandler->isKeyPressed(SDL_SCANCODE_UP)) { + map->getPlayerEntity().move(Model::NORTH, advanced); + } + else if (inputHandler->isKeyPressed(SDL_SCANCODE_RIGHT)) { + map->getPlayerEntity().move(Model::EAST, advanced); + } + else if (inputHandler->isKeyPressed(SDL_SCANCODE_DOWN)) { + map->getPlayerEntity().move(Model::SOUTH, advanced); + } + else if (inputHandler->isKeyPressed(SDL_SCANCODE_LEFT)) { + map->getPlayerEntity().move(Model::WEST, advanced); + } + } + std::shared_ptr initView(const std::shared_ptr &window) { return std::make_shared(window, map, tiles, entities); } -- cgit v1.2.3