From 3da69c8a1b46246ce343561ff982dc25c01134ab Mon Sep 17 00:00:00 2001 From: stiffly Date: Fri, 11 Dec 2015 15:29:57 +0100 Subject: [PATCH] Fixed indentation --- include/Engine/Core/EventBroker.h | 134 +++++++++++++++--------------- include/Engine/Core/System.h | 4 +- include/Game/PlayerSystem.h | 36 ++++---- src/Game/Game.cpp | 80 +++++++++--------- src/Game/PlayerSystem.cpp | 92 ++++++++++---------- 5 files changed, 171 insertions(+), 175 deletions(-) diff --git a/include/Engine/Core/EventBroker.h b/include/Engine/Core/EventBroker.h index 29d82c17..f04c7715 100644 --- a/include/Engine/Core/EventBroker.h +++ b/include/Engine/Core/EventBroker.h @@ -17,119 +17,119 @@ class EventBroker; class BaseEventRelay { -friend class EventBroker; + friend class EventBroker; protected: - BaseEventRelay(std::string contextTypeName, std::string eventTypeName) - : m_ContextTypeName(contextTypeName) - , m_EventTypeName(eventTypeName) - , m_Broker(nullptr) - { } - ~BaseEventRelay(); + BaseEventRelay(std::string contextTypeName, std::string eventTypeName) + : m_ContextTypeName(contextTypeName) + , m_EventTypeName(eventTypeName) + , m_Broker(nullptr) + { } + ~BaseEventRelay(); public: - virtual bool Receive(const std::shared_ptr event) = 0; + virtual bool Receive(const std::shared_ptr event) = 0; protected: - std::string m_ContextTypeName; - std::string m_EventTypeName; - EventBroker* m_Broker; + std::string m_ContextTypeName; + std::string m_EventTypeName; + EventBroker* m_Broker; }; template class EventRelay : public BaseEventRelay { public: - typedef std::function CallbackType; + typedef std::function CallbackType; - EventRelay() - : m_Callback(nullptr) - , BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name()) - { } - EventRelay(CallbackType callback) - : m_Callback(callback) - , BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name()) - { } + EventRelay() + : m_Callback(nullptr) + , BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name()) + { } + EventRelay(CallbackType callback) + : m_Callback(callback) + , BaseEventRelay(typeid(ContextType).name(), typeid(EventType).name()) + { } protected: - bool Receive(const std::shared_ptr event) override; + bool Receive(const std::shared_ptr event) override; private: - CallbackType m_Callback; + CallbackType m_Callback; }; template bool EventRelay::Receive(const std::shared_ptr event) { - if (m_Callback != nullptr) { - return m_Callback(*static_cast(event.get())); - } else { - return false; - } + if (m_Callback != nullptr) { + return m_Callback(*static_cast(event.get())); + } else { + return false; + } } class EventBroker { -template friend class EventRelay; + template friend class EventRelay; public: - EventBroker() - { - m_EventQueueRead = std::make_shared(); - m_EventQueueWrite = std::make_shared(); - } + EventBroker() + { + m_EventQueueRead = std::make_shared(); + m_EventQueueWrite = std::make_shared(); + } - void Subscribe(BaseEventRelay &relay); - template - void Publish(const EventType &event); - /* - Process all events in a given context. - Returns: Number of events processed - */ - template - int Process(); - int Process(std::string contextTypeName); - void Swap(); - void Clear(); - void Unsubscribe(BaseEventRelay &relay); + void Subscribe(BaseEventRelay &relay); + template + void Publish(const EventType &event); + /* + Process all events in a given context. + Returns: Number of events processed + */ + template + int Process(); + int Process(std::string contextTypeName); + void Swap(); + void Clear(); + void Unsubscribe(BaseEventRelay &relay); private: - bool m_IsProcessing = false; + bool m_IsProcessing = false; - typedef std::string ContextTypeName_t; // typeid(ContextType).name() - typedef std::string EventTypeName_t; // typeid(EventType).name() + typedef std::string ContextTypeName_t; // typeid(ContextType).name() + typedef std::string EventTypeName_t; // typeid(EventType).name() - typedef std::unordered_multimap EventRelays_t; - typedef std::unordered_map ContextRelays_t; - ContextRelays_t m_ContextRelays; - std::vector m_RelaysToSubscribe; - std::vector m_RelaysToUnsubscribe; + typedef std::unordered_multimap EventRelays_t; + typedef std::unordered_map ContextRelays_t; + ContextRelays_t m_ContextRelays; + std::vector m_RelaysToSubscribe; + std::vector m_RelaysToUnsubscribe; - typedef std::list>> EventQueue_t; - std::shared_ptr m_EventQueueRead; - std::shared_ptr m_EventQueueWrite; + typedef std::list>> EventQueue_t; + std::shared_ptr m_EventQueueRead; + std::shared_ptr m_EventQueueWrite; - void subscribeImmediate(BaseEventRelay& relay); - void unsubscribeImmediate(BaseEventRelay& relay); + void subscribeImmediate(BaseEventRelay& relay); + void unsubscribeImmediate(BaseEventRelay& relay); }; template void EventBroker::Publish(const EventType &event) { - /*auto itpair = m_Subscribers.equal_range(typeid(EventType).name()); - for (auto it = itpair.first; it != itpair.second; ++it) - { - it->second->Receive(event); - }*/ + /*auto itpair = m_Subscribers.equal_range(typeid(EventType).name()); + for (auto it = itpair.first; it != itpair.second; ++it) + { + it->second->Receive(event); + }*/ - m_EventQueueWrite->push_back(std::make_pair(typeid(EventType).name(), std::shared_ptr(new EventType(event)))); + m_EventQueueWrite->push_back(std::make_pair(typeid(EventType).name(), std::shared_ptr(new EventType(event)))); } template int EventBroker::Process() { - const std::string contextTypeName = typeid(ContextType).name(); - return Process(contextTypeName); + const std::string contextTypeName = typeid(ContextType).name(); + return Process(contextTypeName); } #endif diff --git a/include/Engine/Core/System.h b/include/Engine/Core/System.h index cb4ccc26..37719c51 100644 --- a/include/Engine/Core/System.h +++ b/include/Engine/Core/System.h @@ -14,12 +14,12 @@ public: : m_EventBroker(eventBroker) , m_ComponentType(componentType) { } - + virtual void Update(World* world, ComponentWrapper& component, double dt) = 0; protected: std::string m_ComponentType; - EventBroker* m_EventBroker; + EventBroker* m_EventBroker; }; #endif \ No newline at end of file diff --git a/include/Game/PlayerSystem.h b/include/Game/PlayerSystem.h index 789b7549..18752ac6 100644 --- a/include/Game/PlayerSystem.h +++ b/include/Game/PlayerSystem.h @@ -12,33 +12,33 @@ struct KeyInput { - bool Forward = false; - bool Left = false; - bool Back = false; - bool Right = false; + bool Forward = false; + bool Left = false; + bool Back = false; + bool Right = false; }; class PlayerSystem : public System { public: - PlayerSystem(EventBroker* eventBroker) - : System(eventBroker, "Player") - { - EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &PlayerSystem::OnKeyDown); - EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &PlayerSystem::OnKeyUp); - } + PlayerSystem(EventBroker* eventBroker) + : System(eventBroker, "Player") + { + EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &PlayerSystem::OnKeyDown); + EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &PlayerSystem::OnKeyUp); + } - virtual void Update(World* world, ComponentWrapper& player, double dt) override; + virtual void Update(World* world, ComponentWrapper& player, double dt) override; private: - float m_Speed = 5; - glm::vec3 m_Direction; - KeyInput input; + float m_Speed = 5; + glm::vec3 m_Direction; + KeyInput input; - EventRelay m_EKeyDown; - bool OnKeyDown(const Events::KeyDown &event); - EventRelay m_EKeyUp; - bool OnKeyUp(const Events::KeyUp &event); + EventRelay m_EKeyDown; + bool OnKeyDown(const Events::KeyDown &event); + EventRelay m_EKeyUp; + bool OnKeyUp(const Events::KeyUp &event); }; #endif \ No newline at end of file diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index 9eafd887..fa12bbc6 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -2,38 +2,38 @@ Game::Game(int argc, char* argv[]) { - ResourceManager::RegisterType("ConfigFile"); - ResourceManager::RegisterType("Model"); - ResourceManager::RegisterType("Texture"); + ResourceManager::RegisterType("ConfigFile"); + ResourceManager::RegisterType("Model"); + ResourceManager::RegisterType("Texture"); ResourceManager::RegisterType("EntityXMLFile"); - m_Config = ResourceManager::Load("Config.ini"); - LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get("Debug.LogLevel", 1)); + m_Config = ResourceManager::Load("Config.ini"); + LOG_LEVEL = static_cast<_LOG_LEVEL>(m_Config->Get("Debug.LogLevel", 1)); - // Create the core event broker - m_EventBroker = new EventBroker(); + // Create the core event broker + m_EventBroker = new EventBroker(); m_RenderQueueFactory = new RenderQueueFactory(); - // Create the renderer - m_Renderer = new Renderer(m_EventBroker); - m_Renderer->SetFullscreen(m_Config->Get("Video.Fullscreen", false)); - m_Renderer->SetVSYNC(m_Config->Get("Video.VSYNC", false)); - m_Renderer->SetResolution(Rectangle( - 0, - 0, - m_Config->Get("Video.Width", 1280), - m_Config->Get("Video.Height", 720) - )); - m_Renderer->Initialize(); + // Create the renderer + m_Renderer = new Renderer(m_EventBroker); + m_Renderer->SetFullscreen(m_Config->Get("Video.Fullscreen", false)); + m_Renderer->SetVSYNC(m_Config->Get("Video.VSYNC", false)); + m_Renderer->SetResolution(Rectangle( + 0, + 0, + m_Config->Get("Video.Width", 1280), + m_Config->Get("Video.Height", 720) + )); + m_Renderer->Initialize(); - // Create input manager - m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker); + // Create input manager + m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker); - // Create the root level GUI frame - m_FrameStack = new GUI::Frame(m_EventBroker); - m_FrameStack->Width = m_Renderer->Resolution().Width; - m_FrameStack->Height = m_Renderer->Resolution().Height; + // Create the root level GUI frame + m_FrameStack = new GUI::Frame(m_EventBroker); + m_FrameStack->Width = m_Renderer->Resolution().Width; + m_FrameStack->Height = m_Renderer->Resolution().Height; // Create a world m_World = new World(); @@ -41,34 +41,34 @@ Game::Game(int argc, char* argv[]) if (!mapToLoad.empty()) { ResourceManager::Load(mapToLoad)->PopulateWorld(m_World); } - + // Create system pipeline m_SystemPipeline = new SystemPipeline(m_EventBroker); - m_SystemPipeline->AddSystem(); - m_SystemPipeline->AddSystem(); + m_SystemPipeline->AddSystem(); + m_SystemPipeline->AddSystem(); - m_LastTime = glfwGetTime(); + m_LastTime = glfwGetTime(); testIntialize(); } Game::~Game() { - delete m_FrameStack; - delete m_EventBroker; + delete m_FrameStack; + delete m_EventBroker; } void Game::Tick() { - double currentTime = glfwGetTime(); - double dt = currentTime - m_LastTime; - m_LastTime = currentTime; + double currentTime = glfwGetTime(); + double dt = currentTime - m_LastTime; + m_LastTime = currentTime; - m_EventBroker->Swap(); - m_InputManager->Update(dt); - m_EventBroker->Swap(); + m_EventBroker->Swap(); + m_InputManager->Update(dt); + m_EventBroker->Swap(); // Iterate through systems and update world! m_SystemPipeline->Update(m_World, dt); @@ -76,12 +76,12 @@ void Game::Tick() m_Renderer->Update(dt); m_RenderQueueFactory->Update(m_World); - m_Renderer->Draw(m_RenderQueueFactory->RenderQueues()); + m_Renderer->Draw(m_RenderQueueFactory->RenderQueues()); - m_EventBroker->Swap(); - m_EventBroker->Clear(); + m_EventBroker->Swap(); + m_EventBroker->Clear(); - glfwPollEvents(); + glfwPollEvents(); } diff --git a/src/Game/PlayerSystem.cpp b/src/Game/PlayerSystem.cpp index a7b60011..736ea105 100644 --- a/src/Game/PlayerSystem.cpp +++ b/src/Game/PlayerSystem.cpp @@ -3,60 +3,56 @@ void PlayerSystem::Update(World * world, ComponentWrapper & player, double dt) { - if (input.Forward) { - m_Direction.z = -1; - } - else if (input.Back) { - m_Direction.z = 1; - } - else { - m_Direction.z = 0; - } - if (input.Left) { - m_Direction.x = -1; - } - else if (input.Right) { - m_Direction.x = 1; - } - else { - m_Direction.x = 0; - } - m_EventBroker->Process(); - ComponentWrapper& transform = world->GetComponent(player.EntityID, "Transform"); - (glm::vec3&)player["Velocity"] = m_Speed * float(dt) * m_Direction; - (glm::vec3&)transform["Position"] += (glm::vec3)player["Velocity"]; + if (input.Forward) { + m_Direction.z = -1; + } else if (input.Back) { + m_Direction.z = 1; + } else { + m_Direction.z = 0; + } + if (input.Left) { + m_Direction.x = -1; + } else if (input.Right) { + m_Direction.x = 1; + } else { + m_Direction.x = 0; + } + m_EventBroker->Process(); + ComponentWrapper& transform = world->GetComponent(player.EntityID, "Transform"); + (glm::vec3&)player["Velocity"] = m_Speed * float(dt) * m_Direction; + (glm::vec3&)transform["Position"] += (glm::vec3)player["Velocity"]; } bool PlayerSystem::OnKeyDown(const Events::KeyDown & event) { - if (event.KeyCode == GLFW_KEY_W) { - input.Forward = true; - } - if (event.KeyCode == GLFW_KEY_A) { - input.Left = true; - } - if (event.KeyCode == GLFW_KEY_S) { - input.Back = true; - } - if (event.KeyCode == GLFW_KEY_D) { - input.Right = true; - } - return true; + if (event.KeyCode == GLFW_KEY_W) { + input.Forward = true; + } + if (event.KeyCode == GLFW_KEY_A) { + input.Left = true; + } + if (event.KeyCode == GLFW_KEY_S) { + input.Back = true; + } + if (event.KeyCode == GLFW_KEY_D) { + input.Right = true; + } + return true; } bool PlayerSystem::OnKeyUp(const Events::KeyUp & event) { - if (event.KeyCode == GLFW_KEY_W) { - input.Forward = false; - } - if (event.KeyCode == GLFW_KEY_A) { - input.Left = false; - } - if (event.KeyCode == GLFW_KEY_S) { - input.Back = false; - } - if (event.KeyCode == GLFW_KEY_D) { - input.Right = false; - } - return false; + if (event.KeyCode == GLFW_KEY_W) { + input.Forward = false; + } + if (event.KeyCode == GLFW_KEY_A) { + input.Left = false; + } + if (event.KeyCode == GLFW_KEY_S) { + input.Back = false; + } + if (event.KeyCode == GLFW_KEY_D) { + input.Right = false; + } + return false; }