From 502f12e1898107de5b3676f23bab6424a041f7cf Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 23 Sep 2014 20:14:19 +0200 Subject: Add (currently unused) event bus --- src/control/Event.hpp | 43 +++++++++++++++++++++++++++ src/control/EventBus.hpp | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ src/rpgedit.cpp | 3 ++ 3 files changed, 123 insertions(+) create mode 100644 src/control/Event.hpp create mode 100644 src/control/EventBus.hpp diff --git a/src/control/Event.hpp b/src/control/Event.hpp new file mode 100644 index 0000000..1b2d30a --- /dev/null +++ b/src/control/Event.hpp @@ -0,0 +1,43 @@ +/* + 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 + + +namespace RPGEdit { + +namespace Control { + +class Event { +public: + virtual void handle() = 0; + + virtual ~Event() {} +}; + +} + +} diff --git a/src/control/EventBus.hpp b/src/control/EventBus.hpp new file mode 100644 index 0000000..ae4603f --- /dev/null +++ b/src/control/EventBus.hpp @@ -0,0 +1,77 @@ +/* + 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 "Event.hpp" + +#include +#include +#include +#include + + +namespace RPGEdit { + +namespace Control { + +class EventBus { +private: + typedef std::pair> event_entry; + + static bool compare_events(const event_entry &e1, const event_entry &e2) { + return e1.first > e2.first; + } + + std::priority_queue, bool (*)(const event_entry &, const event_entry &)> events; + +public: + EventBus() : events(compare_events) { + } + + void enqueue(const std::shared_ptr &event, uint64_t time) { + events.push(std::pair>(time, event)); + } + + std::pair> get(uint64_t time) { + if (events.empty()) + return std::make_pair>(std::numeric_limits::max(), nullptr); + + std::pair> top = events.top(); + + if (top.first <= time) { + events.pop(); + return top; + } + else + return std::pair>(top.first, std::shared_ptr()); + } +}; + +} + +} diff --git a/src/rpgedit.cpp b/src/rpgedit.cpp index b4fc89e..4efaf10 100644 --- a/src/rpgedit.cpp +++ b/src/rpgedit.cpp @@ -24,6 +24,7 @@ */ +#include "control/EventBus.hpp" #include "control/InputHandler.hpp" #include "control/MapContext.hpp" #include "view/MapView.hpp" @@ -44,6 +45,8 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char *argv[]) SDL_Init(SDL_INIT_VIDEO); { + Control::EventBus eventBus; + Control::InputHandler inputHandler; Control::ImageLoader tileLoader; -- cgit v1.2.3