From bffc97f31029b501fd49a7189228a7526d56bf9a Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 00:37:48 +0100 Subject: [PATCH 01/56] Groundwork for input command proxy --- include/Engine/Input/EBindOrigin.h | 22 ++ include/Engine/Input/EInputCommand.h | 2 +- include/Engine/Input/InputProxy.h | 146 +++++++++++++ include/Engine/Input/InputSystem.h | 78 ------- include/Engine/Input/KeyboardInputHandler.h | 67 ++++++ include/Game/Game.h | 3 + src/Engine/CMakeLists.txt | 2 +- src/Engine/Input/InputProxy.cpp | 221 ++++++++++++++++++++ src/Engine/Input/InputSystem.cpp | 221 -------------------- src/Game/Game.cpp | 8 + 10 files changed, 469 insertions(+), 301 deletions(-) create mode 100644 include/Engine/Input/EBindOrigin.h create mode 100644 include/Engine/Input/InputProxy.h delete mode 100644 include/Engine/Input/InputSystem.h create mode 100644 include/Engine/Input/KeyboardInputHandler.h create mode 100644 src/Engine/Input/InputProxy.cpp delete mode 100644 src/Engine/Input/InputSystem.cpp diff --git a/include/Engine/Input/EBindOrigin.h b/include/Engine/Input/EBindOrigin.h new file mode 100644 index 00000000..e39a6023 --- /dev/null +++ b/include/Engine/Input/EBindOrigin.h @@ -0,0 +1,22 @@ +#ifndef Events_BindOrigin_h__ +#define Events_BindOrigin_h__ + +#include "Core/EventBroker.h" + +namespace Events +{ + +/** Called to bind an input origin to an input command. */ +struct BindOrigin : Event +{ + /** The input origin to bind. */ + std::string Origin; + /** The command to send. */ + std::string Command; + /** The value to send for positive stimulation. */ + float Value = 1.f; +}; + +} + +#endif diff --git a/include/Engine/Input/EInputCommand.h b/include/Engine/Input/EInputCommand.h index 9c190a1e..9ec897d3 100644 --- a/include/Engine/Input/EInputCommand.h +++ b/include/Engine/Input/EInputCommand.h @@ -13,7 +13,7 @@ struct InputCommand : Event /** The command that was sent. */ std::string Command; /** The value of the command. */ - float Value; + float Value = 0; }; } diff --git a/include/Engine/Input/InputProxy.h b/include/Engine/Input/InputProxy.h new file mode 100644 index 00000000..1b0e213e --- /dev/null +++ b/include/Engine/Input/InputProxy.h @@ -0,0 +1,146 @@ +#ifndef InputSystem_h__ +#define InputSystem_h__ + +#include +#include + +#include + +#include "Core/EKeyUp.h" +#include "Core/EKeyDown.h" +#include "Core/EMousePress.h" +#include "Core/EMouseRelease.h" +#include "Core/EGamepadAxis.h" +#include "Core/EGamepadButton.h" +#include "Core/Util/EnumClassHash.h" +#include "EBindKey.h" +#include "EBindMouseButton.h" +#include "EBindGamepadAxis.h" +#include "EBindGamepadButton.h" +#include "EInputCommand.h" +#include "EBindOrigin.h" + +class InputProxy; + +class InputHandler +{ +public: + InputHandler(EventBroker* eventBroker, InputProxy* inputProxy) + : m_EventBroker(eventBroker) + , m_InputProxy(inputProxy) + { } + + virtual void Update(double dt) { } + virtual bool BindOrigin(std::string origin, std::string command, float value) = 0; + +protected: + EventBroker* m_EventBroker; + InputProxy* m_InputProxy; +}; + +class InputProxy +{ +public: + InputProxy(EventBroker* eventBroker) + : m_EventBroker(eventBroker) + { + EVENT_SUBSCRIBE_MEMBER(m_EBindOrigin, &InputProxy::OnBindOrigin); + } + + void Update(double dt) + { + m_EventBroker->Process(); + m_EventBroker->Process(); + for (auto& handler : m_Handlers) { + handler->Update(dt); + } + } + + void Process() + { + // Accumulate the input values of all unique commands published by input handlers + for (auto& pair : m_CommandQueue) { + Events::InputCommand e; + e.PlayerID = pair.first.first; + e.Command = pair.first.second; + e.Value = 0; + for (auto& value : pair.second) { + e.Value += value; + } + e.Value = std::max(-1.f, std::min(e.Value, 1.f)); + m_EventBroker->Publish(e); + LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID); + } + m_CommandQueue.clear(); + } + + template + void AddHandler() + { + m_Handlers.push_back(new T(m_EventBroker, this)); + } + + void Publish(const Events::InputCommand& e) + { + auto key = std::make_pair(e.PlayerID, e.Command); + m_CommandQueue[key].push_back(e.Value); + } + +protected: + EventBroker* m_EventBroker; + std::vector m_Handlers; + // Represents every unique command (has of PlayerID & Command) and all values reported for that command + std::map, std::vector> m_CommandQueue; + + EventRelay m_EBindOrigin; + bool OnBindOrigin(const Events::BindOrigin& e) + { + bool originBound = false; + for (auto& handler : m_Handlers) { + bool result = handler->BindOrigin(e.Origin, e.Command, e.Value); + if (result) { + if (originBound) { + LOG_WARNING("Multiple handlers responded to binding input origin \"%s\"!", e.Origin.c_str()); + } + originBound = true; + } + } + + if (!originBound) { + LOG_ERROR("No input handler responded to binding input origin \"%s\"!", e.Origin.c_str()); + } + + return originBound; + } + //std::unordered_map> m_CommandMouseButtonValues; // command string -> mouse button value for command + //std::unordered_map> m_CommandGamepadAxisValues; // command string -> gamepad axis value for command + //std::unordered_map> m_CommandGamepadButtonValues; // command string -> gamepad button value for command + //// Input binding tables + //std::unordered_multimap> m_MouseButtonBindings; // GLFW_MOUSE_BUTTON... -> command string + //std::unordered_multimap, EnumClassHash> m_GamepadAxisBindings; // Gamepad::Axis -> command string & value + //std::unordered_multimap, EnumClassHash> m_GamepadButtonBindings; // Gamepad::Button -> command string + + //// Input events + //EventRelay m_EMousePress; + //bool OnMousePress(const Events::MousePress &event); + //EventRelay m_EMouseRelease; + //bool OnMouseRelease(const Events::MouseRelease &event); + //EventRelay m_EGamepadAxis; + //bool OnGamepadAxis(const Events::GamepadAxis &event); + //EventRelay m_EGamepadButtonDown; + //bool OnGamepadButtonDown(const Events::GamepadButtonDown &event); + //EventRelay m_EGamepadButtonUp; + //bool OnGamepadButtonUp(const Events::GamepadButtonUp &event); + //// Input binding events + //EventRelay m_EBindMouseButton; + //bool OnBindMouseButton(const Events::BindMouseButton &event); + //EventRelay m_EBindGamepadAxis; + //bool OnBindGamepadAxis(const Events::BindGamepadAxis &event); + //EventRelay m_EBindGamepadButton; + //bool OnBindGamepadButton(const Events::BindGamepadButton &event); + + //float GetCommandTotalValue(std::string command); + //void PublishCommand(int playerID, std::string command, float value); +}; + +#endif diff --git a/include/Engine/Input/InputSystem.h b/include/Engine/Input/InputSystem.h deleted file mode 100644 index 2023880b..00000000 --- a/include/Engine/Input/InputSystem.h +++ /dev/null @@ -1,78 +0,0 @@ -#ifndef InputSystem_h__ -#define InputSystem_h__ - -#include -#include - -#include "Core/System.h" -#include "Core/EKeyUp.h" -#include "Core/EKeyDown.h" -#include "Core/EMousePress.h" -#include "Core/EMouseRelease.h" -#include "Core/EGamepadAxis.h" -#include "Core/EGamepadButton.h" -#include "Core/Util/EnumClassHash.h" -#include "EBindKey.h" -#include "EBindMouseButton.h" -#include "EBindGamepadAxis.h" -#include "EBindGamepadButton.h" -#include "EInputCommand.h" - -namespace Systems -{ - -class InputSystem : public System -{ -public: - InputSystem(World* world, std::shared_ptr eventBroker) - : System(world, eventBroker) - { } - - void RegisterComponents(ComponentFactory* cf) override; - void Initialize() override; - - void Update(double dt) override; - -private: - std::unordered_map> m_CommandKeyboardValues; // command string -> keyboard key value for command - std::unordered_map> m_CommandMouseButtonValues; // command string -> mouse button value for command - std::unordered_map> m_CommandGamepadAxisValues; // command string -> gamepad axis value for command - std::unordered_map> m_CommandGamepadButtonValues; // command string -> gamepad button value for command - // Input binding tables - std::unordered_multimap> m_KeyBindings; // GLFW_KEY... -> command string & value - std::unordered_multimap> m_MouseButtonBindings; // GLFW_MOUSE_BUTTON... -> command string - std::unordered_multimap, EnumClassHash> m_GamepadAxisBindings; // Gamepad::Axis -> command string & value - std::unordered_multimap, EnumClassHash> m_GamepadButtonBindings; // Gamepad::Button -> command string - - // Input events - EventRelay m_EKeyDown; - bool OnKeyDown(const Events::KeyDown &event); - EventRelay m_EKeyUp; - bool OnKeyUp(const Events::KeyUp &event); - EventRelay m_EMousePress; - bool OnMousePress(const Events::MousePress &event); - EventRelay m_EMouseRelease; - bool OnMouseRelease(const Events::MouseRelease &event); - EventRelay m_EGamepadAxis; - bool OnGamepadAxis(const Events::GamepadAxis &event); - EventRelay m_EGamepadButtonDown; - bool OnGamepadButtonDown(const Events::GamepadButtonDown &event); - EventRelay m_EGamepadButtonUp; - bool OnGamepadButtonUp(const Events::GamepadButtonUp &event); - // Input binding events - EventRelay m_EBindKey; - bool OnBindKey(const Events::BindKey &event); - EventRelay m_EBindMouseButton; - bool OnBindMouseButton(const Events::BindMouseButton &event); - EventRelay m_EBindGamepadAxis; - bool OnBindGamepadAxis(const Events::BindGamepadAxis &event); - EventRelay m_EBindGamepadButton; - bool OnBindGamepadButton(const Events::BindGamepadButton &event); - - float GetCommandTotalValue(std::string command); - void PublishCommand(int playerID, std::string command, float value); -}; - -} - -#endif diff --git a/include/Engine/Input/KeyboardInputHandler.h b/include/Engine/Input/KeyboardInputHandler.h new file mode 100644 index 00000000..1ffaa067 --- /dev/null +++ b/include/Engine/Input/KeyboardInputHandler.h @@ -0,0 +1,67 @@ +#include +#include "InputProxy.h" +#include "Core/EKeyDown.h" +#include "Core/EKeyUp.h" + +class KeyboardInputHandler : public InputHandler +{ +public: + KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy) + : InputHandler(eventBroker, inputProxy) + { + EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &KeyboardInputHandler::OnKeyDown); + EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &KeyboardInputHandler::OnKeyUp); + + m_OriginKeyCodes["R"] = GLFW_KEY_R; + } + + bool BindOrigin(std::string origin, std::string command, float value) override + { + auto originIt = m_OriginKeyCodes.find(origin); + if (originIt == m_OriginKeyCodes.end()) { + return false; + } + + int keyCode = originIt->second; + m_KeyBindings[keyCode] = std::make_tuple(command, value); + return true; + } + +private: + std::unordered_map m_OriginKeyCodes; + std::unordered_map> m_KeyBindings; // GLFW_KEY... -> command string & value + + EventRelay m_EKeyDown; + bool OnKeyDown(const Events::KeyDown& e) + { + auto it = m_KeyBindings.find(e.KeyCode); + if (it == m_KeyBindings.end()) { + return false; + } + + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, ic.Value) = it->second; + m_InputProxy->Publish(ic); + + return true; + } + + EventRelay m_EKeyUp; + bool OnKeyUp(const Events::KeyUp& e) + { + auto it = m_KeyBindings.find(e.KeyCode); + if (it == m_KeyBindings.end()) { + return false; + } + + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, std::ignore) = it->second; + ic.Value = 0; + m_InputProxy->Publish(ic); + + return true; + } + +}; \ No newline at end of file diff --git a/include/Game/Game.h b/include/Game/Game.h index bc66d62f..04d14be0 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -9,6 +9,8 @@ #include "GUI/Frame.h" #include "Core/World.h" #include "Rendering/RenderQueueFactory.h" +#include "Input/InputProxy.h" +#include "Input/KeyboardInputHandler.h" #include "Core/EKeyDown.h" #include "Core/EntityXMLFile.h" #include "Core/SystemPipeline.h" @@ -30,6 +32,7 @@ private: EventBroker* m_EventBroker; IRenderer* m_Renderer; InputManager* m_InputManager; + InputProxy* m_InputProxy; GUI::Frame* m_FrameStack; World* m_World; SystemPipeline* m_SystemPipeline; diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt index de24b9cf..97ed3e68 100644 --- a/src/Engine/CMakeLists.txt +++ b/src/Engine/CMakeLists.txt @@ -73,7 +73,7 @@ source_group(GUI FILES ${SOURCE_FILES_GUI}) set(SOURCE_FILES ${SOURCE_FILES_Core} ${SOURCE_FILES_Core_Util} - #${SOURCE_FILES_Input} + ${SOURCE_FILES_Input} ${SOURCE_FILES_Network} ${SOURCE_FILES_GUI} ${SOURCE_FILES_Rendering} diff --git a/src/Engine/Input/InputProxy.cpp b/src/Engine/Input/InputProxy.cpp new file mode 100644 index 00000000..3a6626df --- /dev/null +++ b/src/Engine/Input/InputProxy.cpp @@ -0,0 +1,221 @@ +#include "Input/InputProxy.h" +#include "Core/World.h" + +//InputProxy::InputProxy(EventBroker* eventBroker) +// : m_EventBroker(eventBroker) +//{ +// // Subscribe to events +// EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &InputProxy::OnMousePress); +// EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &InputProxy::OnMouseRelease); +// EVENT_SUBSCRIBE_MEMBER(m_EGamepadAxis, &InputProxy::OnGamepadAxis); +// EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonDown, &InputProxy::OnGamepadButtonDown); +// EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonUp, &InputProxy::OnGamepadButtonUp); +// EVENT_SUBSCRIBE_MEMBER(m_EBindKey, &InputProxy::OnBindKey); +// EVENT_SUBSCRIBE_MEMBER(m_EBindMouseButton, &InputProxy::OnBindMouseButton); +// EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadAxis, &InputProxy::OnBindGamepadAxis); +// EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadButton, &InputProxy::OnBindGamepadButton); +// +// SteamController()->Init(); +// +//} +// +//void InputProxy::Update(double dt) +//{ +// std::array controllers; +// int numControllers = SteamController()->GetConnectedControllers(controllers.data()); +// +// ControllerDigitalActionHandle_t debug_reload_handle = SteamController()->GetDigitalActionHandle("debug_reload"); +// SteamController()-> +//} +// +//bool InputProxy::OnKeyDown(const Events::KeyDown &event) +//{ +// auto range = m_KeyBindings.equal_range(event.KeyCode); +// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { +// std::string command; +// float value; +// std::tie(command, value) = bindingIt->second; +// m_CommandKeyboardValues[command][event.KeyCode] = value; +// PublishCommand(1, command, GetCommandTotalValue(command)); +// } +// +// return true; +//} +// +//bool InputProxy::OnKeyUp(const Events::KeyUp &event) +//{ +// auto range = m_KeyBindings.equal_range(event.KeyCode); +// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { +// std::string command; +// float value; +// std::tie(command, value) = bindingIt->second; +// m_CommandKeyboardValues[command][event.KeyCode] = 0; +// PublishCommand(1, command, GetCommandTotalValue(command));; +// } +// +// return true; +//} +// +//bool InputProxy::OnMousePress(const Events::MousePress &event) +//{ +// auto range = m_MouseButtonBindings.equal_range(event.Button); +// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { +// std::string command; +// float value; +// std::tie(command, value) = bindingIt->second; +// m_CommandMouseButtonValues[command][event.Button] = value; +// PublishCommand(1, command, GetCommandTotalValue(command)); +// } +// +// return true; +//} +// +//bool InputProxy::OnMouseRelease(const Events::MouseRelease &event) +//{ +// auto range = m_MouseButtonBindings.equal_range(event.Button); +// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { +// std::string command; +// float value; +// std::tie(command, value) = bindingIt->second; +// m_CommandMouseButtonValues[command][event.Button] = 0; +// PublishCommand(1, command, GetCommandTotalValue(command)); +// } +// +// return true; +//} +// +//bool InputProxy::OnGamepadAxis(const Events::GamepadAxis &event) +//{ +// auto range = m_GamepadAxisBindings.equal_range(event.Axis); +// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { +// std::string command; +// float value; +// std::tie(command, value) = bindingIt->second; +// m_CommandGamepadAxisValues[command][event.Axis] = event.Value * value; +// PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); +// } +// +// return true; +//} +// +//bool InputProxy::OnGamepadButtonDown(const Events::GamepadButtonDown &event) +//{ +// auto range = m_GamepadButtonBindings.equal_range(event.Button); +// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { +// std::string command; +// float value; +// std::tie(command, value) = bindingIt->second; +// m_CommandGamepadButtonValues[command][event.Button] = value; +// PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); +// } +// +// return true; +//} +// +//bool InputProxy::OnGamepadButtonUp(const Events::GamepadButtonUp &event) +//{ +// auto range = m_GamepadButtonBindings.equal_range(event.Button); +// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { +// std::string command; +// float value; +// std::tie(command, value) = bindingIt->second; +// m_CommandGamepadButtonValues[command][event.Button] = 0; +// PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); +// } +// +// return true; +//} +// +//bool InputProxy::OnBindKey(const Events::BindKey &event) +//{ +// if (event.Command.empty()) { +// return false; +// } +// +// m_KeyBindings.insert(std::make_pair(event.KeyCode, std::make_tuple(event.Command, event.Value))); +// LOG_DEBUG("Input: Bound key %i to %s", event.KeyCode, event.Command.c_str()); +// +// return true; +//} +// +//bool InputProxy::OnBindMouseButton(const Events::BindMouseButton &event) +//{ +// if (event.Command.empty()) { +// return false; +// } +// +// m_MouseButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value))); +// LOG_DEBUG("Input: Bound mouse button %i to %s", event.Button, event.Command.c_str()); +// +// return true; +//} +// +//bool InputProxy::OnBindGamepadAxis(const Events::BindGamepadAxis &event) +//{ +// if (event.Command.empty()) { +// return false; +// } +// +// m_GamepadAxisBindings.insert(std::make_pair(event.Axis, std::make_tuple(event.Command, event.Value))); +// LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Axis, event.Command.c_str()); +// +// return true; +//} +// +//bool InputProxy::OnBindGamepadButton(const Events::BindGamepadButton &event) +//{ +// if (event.Command.empty()) { +// return false; +// } +// +// m_GamepadButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value))); +// LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Button, event.Command.c_str()); +// +// return true; +//} +// +//float InputProxy::GetCommandTotalValue(std::string command) +//{ +// float value = 0.f; +// +// auto keyboardIt = m_CommandKeyboardValues.find(command); +// if (keyboardIt != m_CommandKeyboardValues.end()) { +// for (auto &key : keyboardIt->second) { +// value += key.second; +// } +// } +// +// auto mouseButtonIt = m_CommandMouseButtonValues.find(command); +// if (mouseButtonIt != m_CommandMouseButtonValues.end()) { +// for (auto &button : mouseButtonIt->second) { +// value += button.second; +// } +// } +// +// auto gamepadAxisIt = m_CommandGamepadAxisValues.find(command); +// if (gamepadAxisIt != m_CommandGamepadAxisValues.end()) { +// for (auto &axis : gamepadAxisIt->second) { +// value += axis.second; +// } +// } +// +// auto gamepadButtonIt = m_CommandGamepadButtonValues.find(command); +// if (gamepadButtonIt != m_CommandGamepadButtonValues.end()) { +// for (auto &button : gamepadButtonIt->second) { +// value += button.second; +// } +// } +// +// return std::max(-1.f, std::min(value, 1.f)); +//} +// +//void InputProxy::PublishCommand(int playerID, std::string command, float value) +//{ +// Events::InputCommand e; +// e.PlayerID = playerID; +// e.Command = command; +// e.Value = value; +// m_EventBroker->Publish(e); +// +// LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, playerID); +//} diff --git a/src/Engine/Input/InputSystem.cpp b/src/Engine/Input/InputSystem.cpp deleted file mode 100644 index d11cd73d..00000000 --- a/src/Engine/Input/InputSystem.cpp +++ /dev/null @@ -1,221 +0,0 @@ -#include "PrecompiledHeader.h" -#include "Input/InputSystem.h" -#include "Core/World.h" - -void Systems::InputSystem::RegisterComponents(ComponentFactory* cf) -{ - -} - -void Systems::InputSystem::Initialize() -{ - // Subscribe to events - EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &Systems::InputSystem::OnKeyDown); - EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &Systems::InputSystem::OnKeyUp); - EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &Systems::InputSystem::OnMousePress); - EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &Systems::InputSystem::OnMouseRelease); - EVENT_SUBSCRIBE_MEMBER(m_EGamepadAxis, &Systems::InputSystem::OnGamepadAxis); - EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonDown, &Systems::InputSystem::OnGamepadButtonDown); - EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonUp, &Systems::InputSystem::OnGamepadButtonUp); - EVENT_SUBSCRIBE_MEMBER(m_EBindKey, &Systems::InputSystem::OnBindKey); - EVENT_SUBSCRIBE_MEMBER(m_EBindMouseButton, &Systems::InputSystem::OnBindMouseButton); - EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadAxis, &Systems::InputSystem::OnBindGamepadAxis); - EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadButton, &Systems::InputSystem::OnBindGamepadButton); -} - -void Systems::InputSystem::Update(double dt) -{ - -} - -bool Systems::InputSystem::OnKeyDown(const Events::KeyDown &event) -{ - auto range = m_KeyBindings.equal_range(event.KeyCode); - for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { - std::string command; - float value; - std::tie(command, value) = bindingIt->second; - m_CommandKeyboardValues[command][event.KeyCode] = value; - PublishCommand(1, command, GetCommandTotalValue(command)); - } - - return true; -} - -bool Systems::InputSystem::OnKeyUp(const Events::KeyUp &event) -{ - auto range = m_KeyBindings.equal_range(event.KeyCode); - for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { - std::string command; - float value; - std::tie(command, value) = bindingIt->second; - m_CommandKeyboardValues[command][event.KeyCode] = 0; - PublishCommand(1, command, GetCommandTotalValue(command));; - } - - return true; -} - -bool Systems::InputSystem::OnMousePress(const Events::MousePress &event) -{ - auto range = m_MouseButtonBindings.equal_range(event.Button); - for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { - std::string command; - float value; - std::tie(command, value) = bindingIt->second; - m_CommandMouseButtonValues[command][event.Button] = value; - PublishCommand(1, command, GetCommandTotalValue(command)); - } - - return true; -} - -bool Systems::InputSystem::OnMouseRelease(const Events::MouseRelease &event) -{ - auto range = m_MouseButtonBindings.equal_range(event.Button); - for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { - std::string command; - float value; - std::tie(command, value) = bindingIt->second; - m_CommandMouseButtonValues[command][event.Button] = 0; - PublishCommand(1, command, GetCommandTotalValue(command)); - } - - return true; -} - -bool Systems::InputSystem::OnGamepadAxis(const Events::GamepadAxis &event) -{ - auto range = m_GamepadAxisBindings.equal_range(event.Axis); - for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { - std::string command; - float value; - std::tie(command, value) = bindingIt->second; - m_CommandGamepadAxisValues[command][event.Axis] = event.Value * value; - PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); - } - - return true; -} - -bool Systems::InputSystem::OnGamepadButtonDown(const Events::GamepadButtonDown &event) -{ - auto range = m_GamepadButtonBindings.equal_range(event.Button); - for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { - std::string command; - float value; - std::tie(command, value) = bindingIt->second; - m_CommandGamepadButtonValues[command][event.Button] = value; - PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); - } - - return true; -} - -bool Systems::InputSystem::OnGamepadButtonUp(const Events::GamepadButtonUp &event) -{ - auto range = m_GamepadButtonBindings.equal_range(event.Button); - for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { - std::string command; - float value; - std::tie(command, value) = bindingIt->second; - m_CommandGamepadButtonValues[command][event.Button] = 0; - PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); - } - - return true; -} - -bool Systems::InputSystem::OnBindKey(const Events::BindKey &event) -{ - if (event.Command.empty()) { - return false; - } - - m_KeyBindings.insert(std::make_pair(event.KeyCode, std::make_tuple(event.Command, event.Value))); - LOG_DEBUG("Input: Bound key %i to %s", event.KeyCode, event.Command.c_str()); - - return true; -} - -bool Systems::InputSystem::OnBindMouseButton(const Events::BindMouseButton &event) -{ - if (event.Command.empty()) { - return false; - } - - m_MouseButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value))); - LOG_DEBUG("Input: Bound mouse button %i to %s", event.Button, event.Command.c_str()); - - return true; -} - -bool Systems::InputSystem::OnBindGamepadAxis(const Events::BindGamepadAxis &event) -{ - if (event.Command.empty()) { - return false; - } - - m_GamepadAxisBindings.insert(std::make_pair(event.Axis, std::make_tuple(event.Command, event.Value))); - LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Axis, event.Command.c_str()); - - return true; -} - -bool Systems::InputSystem::OnBindGamepadButton(const Events::BindGamepadButton &event) -{ - if (event.Command.empty()) { - return false; - } - - m_GamepadButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value))); - LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Button, event.Command.c_str()); - - return true; -} - -float Systems::InputSystem::GetCommandTotalValue(std::string command) -{ - float value = 0.f; - - auto keyboardIt = m_CommandKeyboardValues.find(command); - if (keyboardIt != m_CommandKeyboardValues.end()) { - for (auto &key : keyboardIt->second) { - value += key.second; - } - } - - auto mouseButtonIt = m_CommandMouseButtonValues.find(command); - if (mouseButtonIt != m_CommandMouseButtonValues.end()) { - for (auto &button : mouseButtonIt->second) { - value += button.second; - } - } - - auto gamepadAxisIt = m_CommandGamepadAxisValues.find(command); - if (gamepadAxisIt != m_CommandGamepadAxisValues.end()) { - for (auto &axis : gamepadAxisIt->second) { - value += axis.second; - } - } - - auto gamepadButtonIt = m_CommandGamepadButtonValues.find(command); - if (gamepadButtonIt != m_CommandGamepadButtonValues.end()) { - for (auto &button : gamepadButtonIt->second) { - value += button.second; - } - } - - return std::max(-1.f, std::min(value, 1.f)); -} - -void Systems::InputSystem::PublishCommand(int playerID, std::string command, float value) -{ - Events::InputCommand e; - e.PlayerID = playerID; - e.Command = command; - e.Value = value; - EventBroker->Publish(e); - - LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, playerID); -} diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index fa12bbc6..5451289e 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -29,6 +29,9 @@ Game::Game(int argc, char* argv[]) // Create input manager m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker); + m_InputProxy = new InputProxy(m_EventBroker); + m_InputProxy->AddHandler(); + m_InputProxy->AddHandler(); // Create the root level GUI frame m_FrameStack = new GUI::Frame(m_EventBroker); @@ -66,9 +69,14 @@ void Game::Tick() double dt = currentTime - m_LastTime; m_LastTime = currentTime; + // Handle input in a weird looking but responsive way m_EventBroker->Swap(); m_InputManager->Update(dt); m_EventBroker->Swap(); + m_InputProxy->Update(dt); + m_EventBroker->Swap(); + m_InputProxy->Process(); + m_EventBroker->Swap(); // Iterate through systems and update world! m_SystemPipeline->Update(m_World, dt); From 784a04b8ada504e080c5ec1b2b2caaa5d589a3a8 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 10:58:32 +0100 Subject: [PATCH 02/56] Fixed bug in config file overriding. Previously it was silently overwriting the whole default config and relied on hardcoded values for defaults. --- src/Engine/Core/ConfigFile.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Engine/Core/ConfigFile.cpp b/src/Engine/Core/ConfigFile.cpp index 004ebc43..00ab4993 100644 --- a/src/Engine/Core/ConfigFile.cpp +++ b/src/Engine/Core/ConfigFile.cpp @@ -24,8 +24,11 @@ ConfigFile::ConfigFile(std::string path) if (boost::filesystem::exists(m_Path)) { try { boost::property_tree::ini_parser::read_ini(m_Path.string(), m_PTreeOverrides); - for (auto& node : m_PTreeOverrides) { - m_PTreeMerged.put_child(node.first, node.second); + for (auto& topLevelNode : m_PTreeOverrides) { + auto& mergedTopLevelNode = m_PTreeMerged.find(topLevelNode.first); + for (auto& childOverrideNode : topLevelNode.second) { + mergedTopLevelNode->second.put_child(childOverrideNode.first, childOverrideNode.second); + } } } catch (boost::property_tree::ptree_error& e) { LOG_ERROR("Failed to parse \"%s\":\n%s", m_Path.filename().string().c_str(), e.what()); From 5d46a10a4e35b3d9f273336f3a9d2bf336796ddd Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 10:58:59 +0100 Subject: [PATCH 03/56] Added GetAll function to config file that returns a list of all top level keys in a config file --- include/Engine/Core/ConfigFile.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/include/Engine/Core/ConfigFile.h b/include/Engine/Core/ConfigFile.h index 28c34bd3..54bbbad4 100644 --- a/include/Engine/Core/ConfigFile.h +++ b/include/Engine/Core/ConfigFile.h @@ -5,6 +5,7 @@ #include #include #include +#include #include "../Common.h" #include "ResourceManager.h" @@ -19,12 +20,14 @@ private: public: template T Get(std::string key, T defaultValue); + template + std::vector> GetAll(std::string key); template void Set(std::string key, T value); void SaveToDisk(); - private: +private: boost::filesystem::path m_Path; boost::property_tree::ptree m_PTreeDefaults; boost::property_tree::ptree m_PTreeOverrides; @@ -37,6 +40,21 @@ T ConfigFile::Get(std::string key, T defaultValue) return m_PTreeMerged.get(key, defaultValue); } +template +std::vector> ConfigFile::GetAll(std::string key) +{ + std::vector> out; + auto parent = m_PTreeMerged.find(key); + if (parent == m_PTreeMerged.not_found()) { + return out; + } + for (auto& child : parent->second) { + T value = boost::lexical_cast(child.second.data()); + out.push_back(std::make_pair(child.first, value)); + } + return out; +} + template void ConfigFile::Set(std::string key, T value) { From 35624008e74159d1ec3bd4cf5fc5d3bbf6af2a33 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 11:39:20 +0100 Subject: [PATCH 04/56] InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file. --- include/Engine/Input/EBindGamepadAxis.h | 24 -- include/Engine/Input/EBindGamepadButton.h | 26 -- include/Engine/Input/EBindKey.h | 25 -- include/Engine/Input/EBindMouseButton.h | 25 -- include/Engine/Input/InputHandler.h | 24 ++ include/Engine/Input/InputProxy.h | 149 ++-------- include/Engine/Input/KeyboardInputHandler.h | 61 +--- include/Game/Game.h | 8 +- resources/DefaultInput.ini | 9 + src/Engine/Input/InputProxy.cpp | 297 +++++--------------- src/Engine/Input/KeyboardInputHandler.cpp | 172 ++++++++++++ src/Game/Game.cpp | 16 +- tools/deploy.bat | 1 + 13 files changed, 328 insertions(+), 509 deletions(-) delete mode 100644 include/Engine/Input/EBindGamepadAxis.h delete mode 100644 include/Engine/Input/EBindGamepadButton.h delete mode 100644 include/Engine/Input/EBindKey.h delete mode 100644 include/Engine/Input/EBindMouseButton.h create mode 100644 include/Engine/Input/InputHandler.h create mode 100644 resources/DefaultInput.ini create mode 100644 src/Engine/Input/KeyboardInputHandler.cpp diff --git a/include/Engine/Input/EBindGamepadAxis.h b/include/Engine/Input/EBindGamepadAxis.h deleted file mode 100644 index 1f2665ad..00000000 --- a/include/Engine/Input/EBindGamepadAxis.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef Events_BindGamepadAxis_h__ -#define Events_BindGamepadAxis_h__ - -#include "Core/EventBroker.h" -#include "Core/EGamepadAxis.h" - -namespace Events -{ - -/** Called to bind a gamepad axis to an input command. */ -struct BindGamepadAxis : Event -{ - /** The axis to bind. */ - Gamepad::Axis Axis; - /** The command to send. */ - std::string Command; - /** The value to send for positive stimulation. - - Multiplied by the 0-1 clamped value of the axis. - */ - float Value; -}; - -} diff --git a/include/Engine/Input/EBindGamepadButton.h b/include/Engine/Input/EBindGamepadButton.h deleted file mode 100644 index 47dddf31..00000000 --- a/include/Engine/Input/EBindGamepadButton.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef Events_BindGamepadButton_h__ -#define Events_BindGamepadButton_h__ - -#include "Core/EventBroker.h" -#include "Core/EGamepadButton.h" - -namespace Events -{ - -/** Called to bind a gamepad button to an input command. */ -struct BindGamepadButton : Event -{ - /** The gamepad button to bind. */ - Gamepad::Button Button; - /** The command to send. */ - std::string Command; - /** The value to send for positive stimulation. - - Multiplied by the 0-1 clamped value of the button. - */ - float Value; -}; - -} - -#endif diff --git a/include/Engine/Input/EBindKey.h b/include/Engine/Input/EBindKey.h deleted file mode 100644 index fb1c199a..00000000 --- a/include/Engine/Input/EBindKey.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef Events_BindKey_h__ -#define Events_BindKey_h__ - -#include "Core/EventBroker.h" - -namespace Events -{ - -/** Called to bind a keyboard key to an input command. */ -struct BindKey : Event -{ - /** The GLFW key code to bind. */ - int KeyCode; - /** The command to send. */ - std::string Command; - /** The value to send for positive stimulation. - - Multiplied by the 0-1 clamped value of the key. - */ - float Value; -}; - -} - -#endif diff --git a/include/Engine/Input/EBindMouseButton.h b/include/Engine/Input/EBindMouseButton.h deleted file mode 100644 index 78b5dfa3..00000000 --- a/include/Engine/Input/EBindMouseButton.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef Events_BindMouseButton_h__ -#define Events_BindMouseButton_h__ - -#include "Core/EventBroker.h" - -namespace Events -{ - -/** Called to bind a mouse button to an input command. */ -struct BindMouseButton : Event -{ - /** The GLFW mouse button code to bind. */ - int Button; - /** The command to send. */ - std::string Command; - /** The value to send for positive stimulation. - - Multiplied by the 0-1 clamped value of the button. - */ - float Value; -}; - -} - -#endif diff --git a/include/Engine/Input/InputHandler.h b/include/Engine/Input/InputHandler.h new file mode 100644 index 00000000..c8ecb3af --- /dev/null +++ b/include/Engine/Input/InputHandler.h @@ -0,0 +1,24 @@ +#ifndef InputHandler_h__ +#define InputHandler_h__ + +#include "../Common.h" +#include "../Core/EventBroker.h" +#include "InputProxy.h" + +class InputHandler +{ +public: + InputHandler(EventBroker* eventBroker, InputProxy* inputProxy) + : m_EventBroker(eventBroker) + , m_InputProxy(inputProxy) + { } + + virtual void Update(double dt) { } + virtual bool BindOrigin(std::string origin, std::string command, float value) = 0; + +protected: + EventBroker* m_EventBroker; + InputProxy* m_InputProxy; +}; + +#endif \ No newline at end of file diff --git a/include/Engine/Input/InputProxy.h b/include/Engine/Input/InputProxy.h index 1b0e213e..d3ee57d9 100644 --- a/include/Engine/Input/InputProxy.h +++ b/include/Engine/Input/InputProxy.h @@ -1,146 +1,41 @@ -#ifndef InputSystem_h__ -#define InputSystem_h__ +#ifndef InputProxy_h__ +#define InputProxy_h__ -#include -#include - -#include - -#include "Core/EKeyUp.h" -#include "Core/EKeyDown.h" -#include "Core/EMousePress.h" -#include "Core/EMouseRelease.h" -#include "Core/EGamepadAxis.h" -#include "Core/EGamepadButton.h" -#include "Core/Util/EnumClassHash.h" -#include "EBindKey.h" -#include "EBindMouseButton.h" -#include "EBindGamepadAxis.h" -#include "EBindGamepadButton.h" +#include "../Common.h" +#include "../Core/ResourceManager.h" +#include "../Core/ConfigFile.h" #include "EInputCommand.h" #include "EBindOrigin.h" -class InputProxy; - -class InputHandler -{ -public: - InputHandler(EventBroker* eventBroker, InputProxy* inputProxy) - : m_EventBroker(eventBroker) - , m_InputProxy(inputProxy) - { } - - virtual void Update(double dt) { } - virtual bool BindOrigin(std::string origin, std::string command, float value) = 0; - -protected: - EventBroker* m_EventBroker; - InputProxy* m_InputProxy; -}; +class InputHandler; class InputProxy { public: - InputProxy(EventBroker* eventBroker) - : m_EventBroker(eventBroker) - { - EVENT_SUBSCRIBE_MEMBER(m_EBindOrigin, &InputProxy::OnBindOrigin); - } - - void Update(double dt) - { - m_EventBroker->Process(); - m_EventBroker->Process(); - for (auto& handler : m_Handlers) { - handler->Update(dt); - } - } - - void Process() - { - // Accumulate the input values of all unique commands published by input handlers - for (auto& pair : m_CommandQueue) { - Events::InputCommand e; - e.PlayerID = pair.first.first; - e.Command = pair.first.second; - e.Value = 0; - for (auto& value : pair.second) { - e.Value += value; - } - e.Value = std::max(-1.f, std::min(e.Value, 1.f)); - m_EventBroker->Publish(e); - LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID); - } - m_CommandQueue.clear(); - } - + InputProxy(EventBroker* eventBroker); + ~InputProxy(); + + void LoadBindings(std::string file); + void Update(double dt); + void Process(); template - void AddHandler() - { - m_Handlers.push_back(new T(m_EventBroker, this)); - } - - void Publish(const Events::InputCommand& e) - { - auto key = std::make_pair(e.PlayerID, e.Command); - m_CommandQueue[key].push_back(e.Value); - } + void AddHandler(); + void Publish(const Events::InputCommand& e); protected: EventBroker* m_EventBroker; std::vector m_Handlers; - // Represents every unique command (has of PlayerID & Command) and all values reported for that command + // Represents every unique command (has of PlayerID & Command) and all values reported for that command this frame std::map, std::vector> m_CommandQueue; EventRelay m_EBindOrigin; - bool OnBindOrigin(const Events::BindOrigin& e) - { - bool originBound = false; - for (auto& handler : m_Handlers) { - bool result = handler->BindOrigin(e.Origin, e.Command, e.Value); - if (result) { - if (originBound) { - LOG_WARNING("Multiple handlers responded to binding input origin \"%s\"!", e.Origin.c_str()); - } - originBound = true; - } - } - - if (!originBound) { - LOG_ERROR("No input handler responded to binding input origin \"%s\"!", e.Origin.c_str()); - } - - return originBound; - } - //std::unordered_map> m_CommandMouseButtonValues; // command string -> mouse button value for command - //std::unordered_map> m_CommandGamepadAxisValues; // command string -> gamepad axis value for command - //std::unordered_map> m_CommandGamepadButtonValues; // command string -> gamepad button value for command - //// Input binding tables - //std::unordered_multimap> m_MouseButtonBindings; // GLFW_MOUSE_BUTTON... -> command string - //std::unordered_multimap, EnumClassHash> m_GamepadAxisBindings; // Gamepad::Axis -> command string & value - //std::unordered_multimap, EnumClassHash> m_GamepadButtonBindings; // Gamepad::Button -> command string - - //// Input events - //EventRelay m_EMousePress; - //bool OnMousePress(const Events::MousePress &event); - //EventRelay m_EMouseRelease; - //bool OnMouseRelease(const Events::MouseRelease &event); - //EventRelay m_EGamepadAxis; - //bool OnGamepadAxis(const Events::GamepadAxis &event); - //EventRelay m_EGamepadButtonDown; - //bool OnGamepadButtonDown(const Events::GamepadButtonDown &event); - //EventRelay m_EGamepadButtonUp; - //bool OnGamepadButtonUp(const Events::GamepadButtonUp &event); - //// Input binding events - //EventRelay m_EBindMouseButton; - //bool OnBindMouseButton(const Events::BindMouseButton &event); - //EventRelay m_EBindGamepadAxis; - //bool OnBindGamepadAxis(const Events::BindGamepadAxis &event); - //EventRelay m_EBindGamepadButton; - //bool OnBindGamepadButton(const Events::BindGamepadButton &event); - - //float GetCommandTotalValue(std::string command); - //void PublishCommand(int playerID, std::string command, float value); + bool OnBindOrigin(const Events::BindOrigin& e); }; +template +void InputProxy::AddHandler() +{ + m_Handlers.push_back(new T(m_EventBroker, this)); +} + #endif diff --git a/include/Engine/Input/KeyboardInputHandler.h b/include/Engine/Input/KeyboardInputHandler.h index 1ffaa067..53b08f7a 100644 --- a/include/Engine/Input/KeyboardInputHandler.h +++ b/include/Engine/Input/KeyboardInputHandler.h @@ -1,67 +1,26 @@ +#ifndef KeyboardInputHandler_h__ +#define KeyboardInputHandler_h__ + #include -#include "InputProxy.h" +#include "InputHandler.h" #include "Core/EKeyDown.h" #include "Core/EKeyUp.h" class KeyboardInputHandler : public InputHandler { public: - KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy) - : InputHandler(eventBroker, inputProxy) - { - EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &KeyboardInputHandler::OnKeyDown); - EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &KeyboardInputHandler::OnKeyUp); + KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy); - m_OriginKeyCodes["R"] = GLFW_KEY_R; - } - - bool BindOrigin(std::string origin, std::string command, float value) override - { - auto originIt = m_OriginKeyCodes.find(origin); - if (originIt == m_OriginKeyCodes.end()) { - return false; - } - - int keyCode = originIt->second; - m_KeyBindings[keyCode] = std::make_tuple(command, value); - return true; - } + bool BindOrigin(std::string origin, std::string command, float value) override; private: std::unordered_map m_OriginKeyCodes; std::unordered_map> m_KeyBindings; // GLFW_KEY... -> command string & value EventRelay m_EKeyDown; - bool OnKeyDown(const Events::KeyDown& e) - { - auto it = m_KeyBindings.find(e.KeyCode); - if (it == m_KeyBindings.end()) { - return false; - } - - Events::InputCommand ic; - ic.PlayerID = 0; - std::tie(ic.Command, ic.Value) = it->second; - m_InputProxy->Publish(ic); - - return true; - } - + bool OnKeyDown(const Events::KeyDown& e); EventRelay m_EKeyUp; - bool OnKeyUp(const Events::KeyUp& e) - { - auto it = m_KeyBindings.find(e.KeyCode); - if (it == m_KeyBindings.end()) { - return false; - } + bool OnKeyUp(const Events::KeyUp& e); +}; - Events::InputCommand ic; - ic.PlayerID = 0; - std::tie(ic.Command, std::ignore) = it->second; - ic.Value = 0; - m_InputProxy->Publish(ic); - - return true; - } - -}; \ No newline at end of file +#endif \ No newline at end of file diff --git a/include/Game/Game.h b/include/Game/Game.h index 04d14be0..fbd4b017 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -38,11 +38,11 @@ private: SystemPipeline* m_SystemPipeline; RenderQueueFactory* m_RenderQueueFactory; - EventRelay m_EKeyUp; - bool testOnKeyUp(const Events::KeyUp& e); + EventRelay m_EInputCommand; + bool debugOnInputCommand(const Events::InputCommand& e); - void testIntialize(); - void testTick(double dt); + void debugInitialize(); + void debugTick(double dt); }; #endif diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini new file mode 100644 index 00000000..bc012c52 --- /dev/null +++ b/resources/DefaultInput.ini @@ -0,0 +1,9 @@ +[Bindings] +W=Forward +A=Left +S=Back +D=Right +R=Reload +Space=Jump +LeftControl=Crouch +LeftShift=Sprint diff --git a/src/Engine/Input/InputProxy.cpp b/src/Engine/Input/InputProxy.cpp index 3a6626df..65f3f7b4 100644 --- a/src/Engine/Input/InputProxy.cpp +++ b/src/Engine/Input/InputProxy.cpp @@ -1,221 +1,80 @@ #include "Input/InputProxy.h" -#include "Core/World.h" +#include "Input/InputHandler.h" -//InputProxy::InputProxy(EventBroker* eventBroker) -// : m_EventBroker(eventBroker) -//{ -// // Subscribe to events -// EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &InputProxy::OnMousePress); -// EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &InputProxy::OnMouseRelease); -// EVENT_SUBSCRIBE_MEMBER(m_EGamepadAxis, &InputProxy::OnGamepadAxis); -// EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonDown, &InputProxy::OnGamepadButtonDown); -// EVENT_SUBSCRIBE_MEMBER(m_EGamepadButtonUp, &InputProxy::OnGamepadButtonUp); -// EVENT_SUBSCRIBE_MEMBER(m_EBindKey, &InputProxy::OnBindKey); -// EVENT_SUBSCRIBE_MEMBER(m_EBindMouseButton, &InputProxy::OnBindMouseButton); -// EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadAxis, &InputProxy::OnBindGamepadAxis); -// EVENT_SUBSCRIBE_MEMBER(m_EBindGamepadButton, &InputProxy::OnBindGamepadButton); -// -// SteamController()->Init(); -// -//} -// -//void InputProxy::Update(double dt) -//{ -// std::array controllers; -// int numControllers = SteamController()->GetConnectedControllers(controllers.data()); -// -// ControllerDigitalActionHandle_t debug_reload_handle = SteamController()->GetDigitalActionHandle("debug_reload"); -// SteamController()-> -//} -// -//bool InputProxy::OnKeyDown(const Events::KeyDown &event) -//{ -// auto range = m_KeyBindings.equal_range(event.KeyCode); -// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { -// std::string command; -// float value; -// std::tie(command, value) = bindingIt->second; -// m_CommandKeyboardValues[command][event.KeyCode] = value; -// PublishCommand(1, command, GetCommandTotalValue(command)); -// } -// -// return true; -//} -// -//bool InputProxy::OnKeyUp(const Events::KeyUp &event) -//{ -// auto range = m_KeyBindings.equal_range(event.KeyCode); -// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { -// std::string command; -// float value; -// std::tie(command, value) = bindingIt->second; -// m_CommandKeyboardValues[command][event.KeyCode] = 0; -// PublishCommand(1, command, GetCommandTotalValue(command));; -// } -// -// return true; -//} -// -//bool InputProxy::OnMousePress(const Events::MousePress &event) -//{ -// auto range = m_MouseButtonBindings.equal_range(event.Button); -// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { -// std::string command; -// float value; -// std::tie(command, value) = bindingIt->second; -// m_CommandMouseButtonValues[command][event.Button] = value; -// PublishCommand(1, command, GetCommandTotalValue(command)); -// } -// -// return true; -//} -// -//bool InputProxy::OnMouseRelease(const Events::MouseRelease &event) -//{ -// auto range = m_MouseButtonBindings.equal_range(event.Button); -// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { -// std::string command; -// float value; -// std::tie(command, value) = bindingIt->second; -// m_CommandMouseButtonValues[command][event.Button] = 0; -// PublishCommand(1, command, GetCommandTotalValue(command)); -// } -// -// return true; -//} -// -//bool InputProxy::OnGamepadAxis(const Events::GamepadAxis &event) -//{ -// auto range = m_GamepadAxisBindings.equal_range(event.Axis); -// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { -// std::string command; -// float value; -// std::tie(command, value) = bindingIt->second; -// m_CommandGamepadAxisValues[command][event.Axis] = event.Value * value; -// PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); -// } -// -// return true; -//} -// -//bool InputProxy::OnGamepadButtonDown(const Events::GamepadButtonDown &event) -//{ -// auto range = m_GamepadButtonBindings.equal_range(event.Button); -// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { -// std::string command; -// float value; -// std::tie(command, value) = bindingIt->second; -// m_CommandGamepadButtonValues[command][event.Button] = value; -// PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); -// } -// -// return true; -//} -// -//bool InputProxy::OnGamepadButtonUp(const Events::GamepadButtonUp &event) -//{ -// auto range = m_GamepadButtonBindings.equal_range(event.Button); -// for (auto bindingIt = range.first; bindingIt != range.second; bindingIt++) { -// std::string command; -// float value; -// std::tie(command, value) = bindingIt->second; -// m_CommandGamepadButtonValues[command][event.Button] = 0; -// PublishCommand(event.GamepadID + 1, command, GetCommandTotalValue(command)); -// } -// -// return true; -//} -// -//bool InputProxy::OnBindKey(const Events::BindKey &event) -//{ -// if (event.Command.empty()) { -// return false; -// } -// -// m_KeyBindings.insert(std::make_pair(event.KeyCode, std::make_tuple(event.Command, event.Value))); -// LOG_DEBUG("Input: Bound key %i to %s", event.KeyCode, event.Command.c_str()); -// -// return true; -//} -// -//bool InputProxy::OnBindMouseButton(const Events::BindMouseButton &event) -//{ -// if (event.Command.empty()) { -// return false; -// } -// -// m_MouseButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value))); -// LOG_DEBUG("Input: Bound mouse button %i to %s", event.Button, event.Command.c_str()); -// -// return true; -//} -// -//bool InputProxy::OnBindGamepadAxis(const Events::BindGamepadAxis &event) -//{ -// if (event.Command.empty()) { -// return false; -// } -// -// m_GamepadAxisBindings.insert(std::make_pair(event.Axis, std::make_tuple(event.Command, event.Value))); -// LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Axis, event.Command.c_str()); -// -// return true; -//} -// -//bool InputProxy::OnBindGamepadButton(const Events::BindGamepadButton &event) -//{ -// if (event.Command.empty()) { -// return false; -// } -// -// m_GamepadButtonBindings.insert(std::make_pair(event.Button, std::make_tuple(event.Command, event.Value))); -// LOG_DEBUG("Input: Bound gamepad axis %i to %s", event.Button, event.Command.c_str()); -// -// return true; -//} -// -//float InputProxy::GetCommandTotalValue(std::string command) -//{ -// float value = 0.f; -// -// auto keyboardIt = m_CommandKeyboardValues.find(command); -// if (keyboardIt != m_CommandKeyboardValues.end()) { -// for (auto &key : keyboardIt->second) { -// value += key.second; -// } -// } -// -// auto mouseButtonIt = m_CommandMouseButtonValues.find(command); -// if (mouseButtonIt != m_CommandMouseButtonValues.end()) { -// for (auto &button : mouseButtonIt->second) { -// value += button.second; -// } -// } -// -// auto gamepadAxisIt = m_CommandGamepadAxisValues.find(command); -// if (gamepadAxisIt != m_CommandGamepadAxisValues.end()) { -// for (auto &axis : gamepadAxisIt->second) { -// value += axis.second; -// } -// } -// -// auto gamepadButtonIt = m_CommandGamepadButtonValues.find(command); -// if (gamepadButtonIt != m_CommandGamepadButtonValues.end()) { -// for (auto &button : gamepadButtonIt->second) { -// value += button.second; -// } -// } -// -// return std::max(-1.f, std::min(value, 1.f)); -//} -// -//void InputProxy::PublishCommand(int playerID, std::string command, float value) -//{ -// Events::InputCommand e; -// e.PlayerID = playerID; -// e.Command = command; -// e.Value = value; -// m_EventBroker->Publish(e); -// -// LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, playerID); -//} +InputProxy::InputProxy(EventBroker* eventBroker) + : m_EventBroker(eventBroker) +{ + EVENT_SUBSCRIBE_MEMBER(m_EBindOrigin, &InputProxy::OnBindOrigin); +} + +InputProxy::~InputProxy() +{ + for (auto& handler : m_Handlers) { + delete handler; + } +} + +void InputProxy::LoadBindings(std::string file) +{ + auto config = ResourceManager::Load(file); + for (auto& origin : config->GetAll("Bindings")) { + Events::BindOrigin e; + e.Origin = origin.first; + e.Command = origin.second; + e.Value = 1.f; + OnBindOrigin(e); + } +} + +void InputProxy::Update(double dt) +{ + m_EventBroker->Process(); + m_EventBroker->Process(); + for (auto& handler : m_Handlers) { + handler->Update(dt); + } +} + +void InputProxy::Process() +{ + // Accumulate the input values of all unique commands published by input handlers + for (auto& pair : m_CommandQueue) { + Events::InputCommand e; + e.PlayerID = pair.first.first; + e.Command = pair.first.second; + e.Value = 0; + for (auto& value : pair.second) { + e.Value += value; + } + e.Value = std::max(-1.f, std::min(e.Value, 1.f)); + m_EventBroker->Publish(e); + LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID); + } + m_CommandQueue.clear(); +} + +void InputProxy::Publish(const Events::InputCommand& e) +{ + auto key = std::make_pair(e.PlayerID, e.Command); + m_CommandQueue[key].push_back(e.Value); +} + +bool InputProxy::OnBindOrigin(const Events::BindOrigin& e) +{ + bool originBound = false; + for (auto& handler : m_Handlers) { + bool result = handler->BindOrigin(e.Origin, e.Command, e.Value); + if (result) { + if (originBound) { + LOG_WARNING("Multiple handlers responded to binding input origin \"%s\"!", e.Origin.c_str()); + } + originBound = true; + } + } + + if (!originBound) { + LOG_ERROR("No input handler responded to binding input origin \"%s\"!", e.Origin.c_str()); + } + + return originBound; +} diff --git a/src/Engine/Input/KeyboardInputHandler.cpp b/src/Engine/Input/KeyboardInputHandler.cpp new file mode 100644 index 00000000..1686d8cd --- /dev/null +++ b/src/Engine/Input/KeyboardInputHandler.cpp @@ -0,0 +1,172 @@ +#include "Input/KeyboardInputHandler.h" + +KeyboardInputHandler::KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy) : InputHandler(eventBroker, inputProxy) +{ + EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &KeyboardInputHandler::OnKeyDown); + EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &KeyboardInputHandler::OnKeyUp); + + m_OriginKeyCodes["Space"] = GLFW_KEY_SPACE; + m_OriginKeyCodes["Apostrophe"] = GLFW_KEY_APOSTROPHE; + m_OriginKeyCodes["Comma"] = GLFW_KEY_COMMA; + m_OriginKeyCodes["Minus"] = GLFW_KEY_MINUS; + m_OriginKeyCodes["Period"] = GLFW_KEY_PERIOD; + m_OriginKeyCodes["Slash"] = GLFW_KEY_SLASH; + m_OriginKeyCodes["0"] = GLFW_KEY_0; + m_OriginKeyCodes["1"] = GLFW_KEY_1; + m_OriginKeyCodes["2"] = GLFW_KEY_2; + m_OriginKeyCodes["3"] = GLFW_KEY_3; + m_OriginKeyCodes["4"] = GLFW_KEY_4; + m_OriginKeyCodes["5"] = GLFW_KEY_5; + m_OriginKeyCodes["6"] = GLFW_KEY_6; + m_OriginKeyCodes["7"] = GLFW_KEY_7; + m_OriginKeyCodes["8"] = GLFW_KEY_8; + m_OriginKeyCodes["9"] = GLFW_KEY_9; + m_OriginKeyCodes["Semicolon"] = GLFW_KEY_SEMICOLON; + m_OriginKeyCodes["Equal"] = GLFW_KEY_EQUAL; + m_OriginKeyCodes["A"] = GLFW_KEY_A; + m_OriginKeyCodes["B"] = GLFW_KEY_B; + m_OriginKeyCodes["C"] = GLFW_KEY_C; + m_OriginKeyCodes["D"] = GLFW_KEY_D; + m_OriginKeyCodes["E"] = GLFW_KEY_E; + m_OriginKeyCodes["F"] = GLFW_KEY_F; + m_OriginKeyCodes["G"] = GLFW_KEY_G; + m_OriginKeyCodes["H"] = GLFW_KEY_H; + m_OriginKeyCodes["I"] = GLFW_KEY_I; + m_OriginKeyCodes["J"] = GLFW_KEY_J; + m_OriginKeyCodes["K"] = GLFW_KEY_K; + m_OriginKeyCodes["L"] = GLFW_KEY_L; + m_OriginKeyCodes["M"] = GLFW_KEY_M; + m_OriginKeyCodes["N"] = GLFW_KEY_N; + m_OriginKeyCodes["O"] = GLFW_KEY_O; + m_OriginKeyCodes["P"] = GLFW_KEY_P; + m_OriginKeyCodes["Q"] = GLFW_KEY_Q; + m_OriginKeyCodes["R"] = GLFW_KEY_R; + m_OriginKeyCodes["S"] = GLFW_KEY_S; + m_OriginKeyCodes["T"] = GLFW_KEY_T; + m_OriginKeyCodes["U"] = GLFW_KEY_U; + m_OriginKeyCodes["V"] = GLFW_KEY_V; + m_OriginKeyCodes["W"] = GLFW_KEY_W; + m_OriginKeyCodes["X"] = GLFW_KEY_X; + m_OriginKeyCodes["Y"] = GLFW_KEY_Y; + m_OriginKeyCodes["Z"] = GLFW_KEY_Z; + m_OriginKeyCodes["LeftBracket"] = GLFW_KEY_LEFT_BRACKET; + m_OriginKeyCodes["Backslash"] = GLFW_KEY_BACKSLASH; + m_OriginKeyCodes["RightBracket"] = GLFW_KEY_RIGHT_BRACKET; + m_OriginKeyCodes["Accent"] = GLFW_KEY_GRAVE_ACCENT; + m_OriginKeyCodes["W1"] = GLFW_KEY_WORLD_1; + m_OriginKeyCodes["W2"] = GLFW_KEY_WORLD_2; + m_OriginKeyCodes["Escape"] = GLFW_KEY_ESCAPE; + m_OriginKeyCodes["Enter"] = GLFW_KEY_ENTER; + m_OriginKeyCodes["Tab"] = GLFW_KEY_TAB; + m_OriginKeyCodes["Backspace"] = GLFW_KEY_BACKSPACE; + m_OriginKeyCodes["Insert"] = GLFW_KEY_INSERT; + m_OriginKeyCodes["Delete"] = GLFW_KEY_DELETE; + m_OriginKeyCodes["Right"] = GLFW_KEY_RIGHT; + m_OriginKeyCodes["Left"] = GLFW_KEY_LEFT; + m_OriginKeyCodes["Down"] = GLFW_KEY_DOWN; + m_OriginKeyCodes["Up"] = GLFW_KEY_UP; + m_OriginKeyCodes["PgUp"] = GLFW_KEY_PAGE_UP; + m_OriginKeyCodes["PgDn"] = GLFW_KEY_PAGE_DOWN; + m_OriginKeyCodes["Home"] = GLFW_KEY_HOME; + m_OriginKeyCodes["End"] = GLFW_KEY_END; + m_OriginKeyCodes["CapsLock"] = GLFW_KEY_CAPS_LOCK; + m_OriginKeyCodes["ScrollLock"] = GLFW_KEY_SCROLL_LOCK; + m_OriginKeyCodes["NumLock"] = GLFW_KEY_NUM_LOCK; + m_OriginKeyCodes["PrintScreen"] = GLFW_KEY_PRINT_SCREEN; + m_OriginKeyCodes["Pause"] = GLFW_KEY_PAUSE; + m_OriginKeyCodes["F1"] = GLFW_KEY_F1; + m_OriginKeyCodes["F2"] = GLFW_KEY_F2; + m_OriginKeyCodes["F3"] = GLFW_KEY_F3; + m_OriginKeyCodes["F4"] = GLFW_KEY_F4; + m_OriginKeyCodes["F5"] = GLFW_KEY_F5; + m_OriginKeyCodes["F6"] = GLFW_KEY_F6; + m_OriginKeyCodes["F7"] = GLFW_KEY_F7; + m_OriginKeyCodes["F8"] = GLFW_KEY_F8; + m_OriginKeyCodes["F9"] = GLFW_KEY_F9; + m_OriginKeyCodes["F10"] = GLFW_KEY_F10; + m_OriginKeyCodes["F11"] = GLFW_KEY_F11; + m_OriginKeyCodes["F12"] = GLFW_KEY_F12; + m_OriginKeyCodes["F13"] = GLFW_KEY_F13; + m_OriginKeyCodes["F14"] = GLFW_KEY_F14; + m_OriginKeyCodes["F15"] = GLFW_KEY_F15; + m_OriginKeyCodes["F16"] = GLFW_KEY_F16; + m_OriginKeyCodes["F17"] = GLFW_KEY_F17; + m_OriginKeyCodes["F18"] = GLFW_KEY_F18; + m_OriginKeyCodes["F19"] = GLFW_KEY_F19; + m_OriginKeyCodes["F20"] = GLFW_KEY_F20; + m_OriginKeyCodes["F21"] = GLFW_KEY_F21; + m_OriginKeyCodes["F22"] = GLFW_KEY_F22; + m_OriginKeyCodes["F23"] = GLFW_KEY_F23; + m_OriginKeyCodes["F24"] = GLFW_KEY_F24; + m_OriginKeyCodes["F25"] = GLFW_KEY_F25; + m_OriginKeyCodes["KP0"] = GLFW_KEY_KP_0; + m_OriginKeyCodes["KP1"] = GLFW_KEY_KP_1; + m_OriginKeyCodes["KP2"] = GLFW_KEY_KP_2; + m_OriginKeyCodes["KP3"] = GLFW_KEY_KP_3; + m_OriginKeyCodes["KP4"] = GLFW_KEY_KP_4; + m_OriginKeyCodes["KP5"] = GLFW_KEY_KP_5; + m_OriginKeyCodes["KP6"] = GLFW_KEY_KP_6; + m_OriginKeyCodes["KP7"] = GLFW_KEY_KP_7; + m_OriginKeyCodes["KP8"] = GLFW_KEY_KP_8; + m_OriginKeyCodes["KP9"] = GLFW_KEY_KP_9; + m_OriginKeyCodes["KPDecimal"] = GLFW_KEY_KP_DECIMAL; + m_OriginKeyCodes["KPDivide"] = GLFW_KEY_KP_DIVIDE; + m_OriginKeyCodes["KPMultiply"] = GLFW_KEY_KP_MULTIPLY; + m_OriginKeyCodes["KPSubtract"] = GLFW_KEY_KP_SUBTRACT; + m_OriginKeyCodes["KPAdd"] = GLFW_KEY_KP_ADD; + m_OriginKeyCodes["KPEnter"] = GLFW_KEY_KP_ENTER; + m_OriginKeyCodes["KPEqual"] = GLFW_KEY_KP_EQUAL; + m_OriginKeyCodes["LeftShift"] = GLFW_KEY_LEFT_SHIFT; + m_OriginKeyCodes["LeftControl"] = GLFW_KEY_LEFT_CONTROL; + m_OriginKeyCodes["LeftAlt"] = GLFW_KEY_LEFT_ALT; + m_OriginKeyCodes["LeftSuper"] = GLFW_KEY_LEFT_SUPER; + m_OriginKeyCodes["RightShift"] = GLFW_KEY_RIGHT_SHIFT; + m_OriginKeyCodes["RightControl"] = GLFW_KEY_RIGHT_CONTROL; + m_OriginKeyCodes["RightAlt"] = GLFW_KEY_RIGHT_ALT; + m_OriginKeyCodes["RightSuper"] = GLFW_KEY_RIGHT_SUPER; + m_OriginKeyCodes["Menu"] = GLFW_KEY_MENU; +} + +bool KeyboardInputHandler::BindOrigin(std::string origin, std::string command, float value) +{ + auto originIt = m_OriginKeyCodes.find(origin); + if (originIt == m_OriginKeyCodes.end()) { + return false; + } + + int keyCode = originIt->second; + m_KeyBindings[keyCode] = std::make_tuple(command, value); + return true; +} + +bool KeyboardInputHandler::OnKeyDown(const Events::KeyDown& e) +{ + auto it = m_KeyBindings.find(e.KeyCode); + if (it == m_KeyBindings.end()) { + return false; + } + + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, ic.Value) = it->second; + m_InputProxy->Publish(ic); + + return true; +} + +bool KeyboardInputHandler::OnKeyUp(const Events::KeyUp& e) +{ + auto it = m_KeyBindings.find(e.KeyCode); + if (it == m_KeyBindings.end()) { + return false; + } + + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, std::ignore) = it->second; + ic.Value = 0; + m_InputProxy->Publish(ic); + + return true; +} + diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index 5451289e..5ae9295a 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -31,7 +31,7 @@ Game::Game(int argc, char* argv[]) m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker); m_InputProxy = new InputProxy(m_EventBroker); m_InputProxy->AddHandler(); - m_InputProxy->AddHandler(); + m_InputProxy->LoadBindings("Input.ini"); // Create the root level GUI frame m_FrameStack = new GUI::Frame(m_EventBroker); @@ -54,7 +54,7 @@ Game::Game(int argc, char* argv[]) m_LastTime = glfwGetTime(); - testIntialize(); + debugInitialize(); } Game::~Game() @@ -80,7 +80,7 @@ void Game::Tick() // Iterate through systems and update world! m_SystemPipeline->Update(m_World, dt); - testTick(dt); + debugTick(dt); m_Renderer->Update(dt); m_RenderQueueFactory->Update(m_World); @@ -93,9 +93,9 @@ void Game::Tick() } -bool Game::testOnKeyUp(const Events::KeyUp& e) +bool Game::debugOnInputCommand(const Events::InputCommand& e) { - if (e.KeyCode == GLFW_KEY_R) { + if (e.Command == "DebugReload" && e.Value == 1) { std::string mapToLoad = m_Config->Get("Debug.LoadMap", ""); if (!mapToLoad.empty()) { delete m_World; @@ -108,12 +108,12 @@ bool Game::testOnKeyUp(const Events::KeyUp& e) return false; } -void Game::testIntialize() +void Game::debugInitialize() { - EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &Game::testOnKeyUp); + EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Game::debugOnInputCommand); } -void Game::testTick(double dt) +void Game::debugTick(double dt) { m_EventBroker->Process(); } diff --git a/tools/deploy.bat b/tools/deploy.bat index 5ef074ef..22d513e6 100755 --- a/tools/deploy.bat +++ b/tools/deploy.bat @@ -21,6 +21,7 @@ RMDIR /S /Q "%DeployLocation%\Shaders" MKLINK "%DeployLocation%\Shaders\" "resources\Shaders" /J :: Configuration files MKLINK "%DeployLocation%\DefaultConfig.ini" "resources\DefaultConfig.ini" /H +MKLINK "%DeployLocation%\DefaultInput.ini" "resources\DefaultInput.ini" /H :: Platform specific binaries IF "%~1"=="" GOTO :EOF From 013f911ae262f71e6679f9aa6282aabd023e63ca Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 14:49:43 +0100 Subject: [PATCH 05/56] Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement. --- include/Engine/Core/InputController.h | 11 +- .../Engine/Input/FirstPersonInputController.h | 40 ++++++ include/Engine/Input/MouseInputHandler.h | 33 +++++ include/Game/Game.h | 1 + resources/DefaultInput.ini | 4 + src/Engine/Input/InputProxy.cpp | 2 +- src/Engine/Input/MouseInputHandler.cpp | 121 ++++++++++++++++++ src/Game/Game.cpp | 1 + 8 files changed, 205 insertions(+), 8 deletions(-) create mode 100644 include/Engine/Input/FirstPersonInputController.h create mode 100644 include/Engine/Input/MouseInputHandler.h create mode 100644 src/Engine/Input/MouseInputHandler.cpp diff --git a/include/Engine/Core/InputController.h b/include/Engine/Core/InputController.h index b91fb448..b87d1eff 100644 --- a/include/Engine/Core/InputController.h +++ b/include/Engine/Core/InputController.h @@ -11,25 +11,22 @@ template class InputController { public: - InputController(std::shared_ptr eventBroker) - : EventBroker(eventBroker) + InputController(EventBroker* eventBroker) + : m_EventBroker(eventBroker) { Initialize(); } virtual void Initialize() { EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &InputController::OnCommand); - EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &InputController::OnMouseMove); } - virtual bool OnCommand(const Events::InputCommand &event) { return false; } - virtual bool OnMouseMove(const Events::MouseMove &event) { return false; } + virtual bool OnCommand(const Events::InputCommand& e) { return false; } protected: - std::shared_ptr EventBroker; + EventBroker* m_EventBroker; private: EventRelay m_EInputCommand; - EventRelay m_EMouseMove; }; #endif diff --git a/include/Engine/Input/FirstPersonInputController.h b/include/Engine/Input/FirstPersonInputController.h new file mode 100644 index 00000000..e8b832b5 --- /dev/null +++ b/include/Engine/Input/FirstPersonInputController.h @@ -0,0 +1,40 @@ +#ifndef FirstPersonInputController_h__ +#define FirstPersonInputController_h__ + +#include "../GLM.h" +#include "../Core/InputController.h" + +template +class FirstPersonInputController : public InputController +{ +public: + FirstPersonInputController(EventBroker* eventBroker, unsigned int playerID) + : InputController(eventBroker) + , m_PlayerID(playerID) + { } + + const glm::quat Orientation() const { return m_Orientation; } + + virtual bool OnCommand(const Events::InputCommand& e) override + { + if (m_PlayerID != e.PlayerID) { + return false; + } + + if (e.Command == "Pitch") { + float val = glm::radians(e.Value); + m_Orientation = m_Orientation * glm::angleAxis(-val, glm::vec3(1, 0, 0)); + } + + if (e.Command == "Yaw") { + float val = glm::radians(e.Value); + m_Orientation = glm::angleAxis(-val, glm::vec3(0, 1, 0)) * m_Orientation; + } + } + +private: + const unsigned int m_PlayerID; + glm::quat m_Orientation; +}; + +#endif \ No newline at end of file diff --git a/include/Engine/Input/MouseInputHandler.h b/include/Engine/Input/MouseInputHandler.h new file mode 100644 index 00000000..39889755 --- /dev/null +++ b/include/Engine/Input/MouseInputHandler.h @@ -0,0 +1,33 @@ +#ifndef MouseInputHandler_h__ +#define MouseInputHandler_h__ + +#include +#include "InputHandler.h" +#include "Core/EMousePress.h" +#include "Core/EMouseRelease.h" +#include "Core/EMouseMove.h" + +class MouseInputHandler : public InputHandler +{ +public: + MouseInputHandler(EventBroker* eventBroker, InputProxy* inputProxy); + + bool BindOrigin(std::string origin, std::string command, float value) override; + +private: + std::unordered_map m_OriginCodes; + std::unordered_map m_OriginAxes; + std::unordered_map> m_Bindings; // GLFW_MOUSE_BUTTON... -> command string & value + std::unordered_map> m_Axes; // Axis -> command string & value + + EventRelay m_EMousePress; + bool OnMousePress(const Events::MousePress& e); + EventRelay m_EMouseRelease; + bool OnMouseRelease(const Events::MouseRelease& e); + EventRelay m_EMouseMove; + bool OnMouseMove(const Events::MouseMove& e); + + bool hasOrigin(std::string origin); +}; + +#endif diff --git a/include/Game/Game.h b/include/Game/Game.h index fbd4b017..57941e55 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -11,6 +11,7 @@ #include "Rendering/RenderQueueFactory.h" #include "Input/InputProxy.h" #include "Input/KeyboardInputHandler.h" +#include "Input/MouseInputHandler.h" #include "Core/EKeyDown.h" #include "Core/EntityXMLFile.h" #include "Core/SystemPipeline.h" diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini index bc012c52..b6bbd20f 100644 --- a/resources/DefaultInput.ini +++ b/resources/DefaultInput.ini @@ -1,3 +1,7 @@ +[Mouse] +Sensitivity=0.5 +InvertPitch=false + [Bindings] W=Forward A=Left diff --git a/src/Engine/Input/InputProxy.cpp b/src/Engine/Input/InputProxy.cpp index 65f3f7b4..430cb250 100644 --- a/src/Engine/Input/InputProxy.cpp +++ b/src/Engine/Input/InputProxy.cpp @@ -46,7 +46,7 @@ void InputProxy::Process() for (auto& value : pair.second) { e.Value += value; } - e.Value = std::max(-1.f, std::min(e.Value, 1.f)); + //e.Value = std::max(-1.f, std::min(e.Value, 1.f)); m_EventBroker->Publish(e); LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID); } diff --git a/src/Engine/Input/MouseInputHandler.cpp b/src/Engine/Input/MouseInputHandler.cpp new file mode 100644 index 00000000..2e9c8137 --- /dev/null +++ b/src/Engine/Input/MouseInputHandler.cpp @@ -0,0 +1,121 @@ +#include "Input/MouseInputHandler.h" + +MouseInputHandler::MouseInputHandler(EventBroker* eventBroker, InputProxy* inputProxy) + : InputHandler(eventBroker, inputProxy) +{ + EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &MouseInputHandler::OnMousePress); + EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &MouseInputHandler::OnMouseRelease); + EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &MouseInputHandler::OnMouseMove); + + m_OriginCodes["Mouse1"] = GLFW_MOUSE_BUTTON_1; + m_OriginCodes["MouseLeft"] = GLFW_MOUSE_BUTTON_LEFT; + m_OriginCodes["Mouse2"] = GLFW_MOUSE_BUTTON_2; + m_OriginCodes["MouseRight"] = GLFW_MOUSE_BUTTON_RIGHT; + m_OriginCodes["Mouse3"] = GLFW_MOUSE_BUTTON_3; + m_OriginCodes["MouseMiddle"] = GLFW_MOUSE_BUTTON_MIDDLE; + m_OriginCodes["Mouse4"] = GLFW_MOUSE_BUTTON_4; + m_OriginCodes["Mouse5"] = GLFW_MOUSE_BUTTON_5; + m_OriginCodes["Mouse6"] = GLFW_MOUSE_BUTTON_6; + m_OriginCodes["Mouse7"] = GLFW_MOUSE_BUTTON_7; + m_OriginCodes["Mouse8"] = GLFW_MOUSE_BUTTON_8; + + m_OriginAxes["MouseX"] = 'X'; + m_OriginAxes["MouseY"] = 'Y'; +} + +bool MouseInputHandler::BindOrigin(std::string origin, std::string command, float value) +{ + auto originCode = m_OriginCodes.find(origin); + if (originCode != m_OriginCodes.end()) { + int code = originCode->second; + m_Bindings[code] = std::make_tuple(command, value); + return true; + } + + auto originAxis = m_OriginAxes.find(origin); + if (originAxis != m_OriginAxes.end()) { + char axis = originAxis->second; + float multiplier = 1.f; + // Sensitivity + multiplier *= ResourceManager::Load("Input.ini")->Get("Mouse.Sensitivity", 1.f); + if (axis == 'Y') { + if (ResourceManager::Load("Input.ini")->Get("Mouse.InvertPitch", false)) { + multiplier *= -1.f; + } + } + m_Axes[axis] = std::make_tuple(command, value * multiplier); + return true; + } + + return false; +} + +bool MouseInputHandler::OnMousePress(const Events::MousePress& e) +{ + auto it = m_Bindings.find(e.Button); + if (it == m_Bindings.end()) { + return false; + } + + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, ic.Value) = it->second; + m_InputProxy->Publish(ic); + + return true; +} + +bool MouseInputHandler::OnMouseRelease(const Events::MouseRelease& e) +{ + auto it = m_Bindings.find(e.Button); + if (it == m_Bindings.end()) { + return false; + } + + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, std::ignore) = it->second; + ic.Value = 0; + m_InputProxy->Publish(ic); + + return true; +} + +bool MouseInputHandler::OnMouseMove(const Events::MouseMove& e) +{ + if (std::abs(e.DeltaX) > 0) { + auto it = m_Axes.find('X'); + if (it != m_Axes.end()) { + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, ic.Value) = it->second; + ic.Value *= e.DeltaX; + m_InputProxy->Publish(ic); + } + } + + if (std::abs(e.DeltaY) > 0) { + auto it = m_Axes.find('Y'); + if (it != m_Axes.end()) { + Events::InputCommand ic; + ic.PlayerID = 0; + std::tie(ic.Command, ic.Value) = it->second; + ic.Value *= e.DeltaY; + m_InputProxy->Publish(ic); + } + } + + return true; +} + +bool MouseInputHandler::hasOrigin(std::string origin) +{ + if (m_OriginCodes.find(origin) == m_OriginCodes.end()) { + return false; + } + if (m_OriginAxes.find(origin) == m_OriginAxes.end()) { + return false; + } + return true; +} + diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index 5ae9295a..be988529 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -31,6 +31,7 @@ Game::Game(int argc, char* argv[]) m_InputManager = new InputManager(m_Renderer->Window(), m_EventBroker); m_InputProxy = new InputProxy(m_EventBroker); m_InputProxy->AddHandler(); + m_InputProxy->AddHandler(); m_InputProxy->LoadBindings("Input.ini"); // Create the root level GUI frame From 2e7e8d3546f9248ca20b609b043b7727e946883e Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 14:50:14 +0100 Subject: [PATCH 06/56] Clearing raw input events from event broker to encourage use of input commands instead --- src/Game/Game.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index be988529..b7391bac 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -76,6 +76,7 @@ void Game::Tick() m_EventBroker->Swap(); m_InputProxy->Update(dt); m_EventBroker->Swap(); + m_EventBroker->Clear(); m_InputProxy->Process(); m_EventBroker->Swap(); From 03e226ffeaa34d26fee2bd60fa9e6d0081418ab9 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 17:15:33 +0100 Subject: [PATCH 07/56] Refactored InputProxy to gracefully handle cases where multiple origins send the same command --- .../Engine/Input/FirstPersonInputController.h | 48 ++++++++++++++---- include/Engine/Input/InputHandler.h | 3 +- include/Engine/Input/InputProxy.h | 8 ++- include/Engine/Input/KeyboardInputHandler.h | 2 + resources/DefaultInput.ini | 11 +++-- src/Engine/Input/InputProxy.cpp | 49 ++++++++++++------- src/Engine/Input/KeyboardInputHandler.cpp | 27 ++++++---- 7 files changed, 104 insertions(+), 44 deletions(-) diff --git a/include/Engine/Input/FirstPersonInputController.h b/include/Engine/Input/FirstPersonInputController.h index e8b832b5..d8584494 100644 --- a/include/Engine/Input/FirstPersonInputController.h +++ b/include/Engine/Input/FirstPersonInputController.h @@ -3,6 +3,7 @@ #include "../GLM.h" #include "../Core/InputController.h" +#include "../Core/ELockMouse.h" template class FirstPersonInputController : public InputController @@ -11,9 +12,26 @@ public: FirstPersonInputController(EventBroker* eventBroker, unsigned int playerID) : InputController(eventBroker) , m_PlayerID(playerID) - { } + { + EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &FirstPersonInputController::OnLockMouse); + EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &FirstPersonInputController::OnUnlockMouse); + } const glm::quat Orientation() const { return m_Orientation; } + + void LockMouse() + { + Events::LockMouse e; + m_EventBroker->Publish(e); + m_MouseLocked = true; + } + + void UnlockMouse() + { + Events::UnlockMouse e; + m_EventBroker->Publish(e); + m_MouseLocked = false; + } virtual bool OnCommand(const Events::InputCommand& e) override { @@ -21,20 +39,32 @@ public: return false; } - if (e.Command == "Pitch") { - float val = glm::radians(e.Value); - m_Orientation = m_Orientation * glm::angleAxis(-val, glm::vec3(1, 0, 0)); + if (m_MouseLocked) { + if (e.Command == "Pitch") { + float val = glm::radians(e.Value); + m_Orientation = m_Orientation * glm::angleAxis(-val, glm::vec3(1, 0, 0)); + return true; + } + + if (e.Command == "Yaw") { + float val = glm::radians(e.Value); + m_Orientation = glm::angleAxis(-val, glm::vec3(0, 1, 0)) * m_Orientation; + return true; + } } - if (e.Command == "Yaw") { - float val = glm::radians(e.Value); - m_Orientation = glm::angleAxis(-val, glm::vec3(0, 1, 0)) * m_Orientation; - } + return false; } -private: +protected: const unsigned int m_PlayerID; glm::quat m_Orientation; + bool m_MouseLocked = false; + + EventRelay m_ELockMouse; + bool OnLockMouse(const Events::LockMouse& e) { m_MouseLocked = true; return true; } + EventRelay m_EUnlockMouse; + bool OnUnlockMouse(const Events::UnlockMouse& e) { m_MouseLocked = false; return true; } }; #endif \ No newline at end of file diff --git a/include/Engine/Input/InputHandler.h b/include/Engine/Input/InputHandler.h index c8ecb3af..a9b3c038 100644 --- a/include/Engine/Input/InputHandler.h +++ b/include/Engine/Input/InputHandler.h @@ -13,8 +13,9 @@ public: , m_InputProxy(inputProxy) { } - virtual void Update(double dt) { } virtual bool BindOrigin(std::string origin, std::string command, float value) = 0; + virtual void Update(double dt) { } + virtual float GetCommandValue(std::string command) = 0; protected: EventBroker* m_EventBroker; diff --git a/include/Engine/Input/InputProxy.h b/include/Engine/Input/InputProxy.h index d3ee57d9..43c4940c 100644 --- a/include/Engine/Input/InputProxy.h +++ b/include/Engine/Input/InputProxy.h @@ -20,13 +20,17 @@ public: void Process(); template void AddHandler(); - void Publish(const Events::InputCommand& e); protected: EventBroker* m_EventBroker; std::vector m_Handlers; + std::map> m_CommandHandlers; + // Represents every unique command (has of PlayerID & Command) and all values reported for that command this frame - std::map, std::vector> m_CommandQueue; + //std::map, std::vector> m_CommandQueue; + + std::map m_CurrentCommandValues; + std::map m_LastCommandValues; EventRelay m_EBindOrigin; bool OnBindOrigin(const Events::BindOrigin& e); diff --git a/include/Engine/Input/KeyboardInputHandler.h b/include/Engine/Input/KeyboardInputHandler.h index 53b08f7a..49597fce 100644 --- a/include/Engine/Input/KeyboardInputHandler.h +++ b/include/Engine/Input/KeyboardInputHandler.h @@ -12,10 +12,12 @@ public: KeyboardInputHandler(EventBroker* eventBroker, InputProxy* inputProxy); bool BindOrigin(std::string origin, std::string command, float value) override; + virtual float GetCommandValue(std::string command) override; private: std::unordered_map m_OriginKeyCodes; std::unordered_map> m_KeyBindings; // GLFW_KEY... -> command string & value + std::unordered_map m_CommandValues; EventRelay m_EKeyDown; bool OnKeyDown(const Events::KeyDown& e); diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini index b6bbd20f..3be67287 100644 --- a/resources/DefaultInput.ini +++ b/resources/DefaultInput.ini @@ -3,10 +3,13 @@ Sensitivity=0.5 InvertPitch=false [Bindings] -W=Forward -A=Left -S=Back -D=Right +MouseLeft=PrimaryFire +MouseX=Yaw +MouseY=Pitch +W=+Forward +S=-Forward +D=+Right +A=-Right R=Reload Space=Jump LeftControl=Crouch diff --git a/src/Engine/Input/InputProxy.cpp b/src/Engine/Input/InputProxy.cpp index 430cb250..3fe29b7d 100644 --- a/src/Engine/Input/InputProxy.cpp +++ b/src/Engine/Input/InputProxy.cpp @@ -22,7 +22,16 @@ void InputProxy::LoadBindings(std::string file) e.Origin = origin.first; e.Command = origin.second; e.Value = 1.f; - OnBindOrigin(e); + if (!e.Command.empty()) { + char prefix = e.Command.at(0); + if (prefix == '+' || prefix == '-') { + e.Command = e.Command.substr(1); + if (prefix == '-') { + e.Value *= -1.f; + } + } + OnBindOrigin(e); + } } } @@ -37,26 +46,26 @@ void InputProxy::Update(double dt) void InputProxy::Process() { - // Accumulate the input values of all unique commands published by input handlers - for (auto& pair : m_CommandQueue) { - Events::InputCommand e; - e.PlayerID = pair.first.first; - e.Command = pair.first.second; - e.Value = 0; - for (auto& value : pair.second) { - e.Value += value; + for (auto& pair : m_CommandHandlers) { + const std::string& command = pair.first; + auto handlers = pair.second; + m_CurrentCommandValues[command] = 0.f; + for (auto& handler : handlers) { + m_CurrentCommandValues[command] += handler->GetCommandValue(command); } - //e.Value = std::max(-1.f, std::min(e.Value, 1.f)); - m_EventBroker->Publish(e); - LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID); - } - m_CommandQueue.clear(); -} -void InputProxy::Publish(const Events::InputCommand& e) -{ - auto key = std::make_pair(e.PlayerID, e.Command); - m_CommandQueue[key].push_back(e.Value); + auto last = m_LastCommandValues.find(command); + float currentValue = m_CurrentCommandValues[command]; + if (last == m_LastCommandValues.end() || last->second != currentValue) { + Events::InputCommand e; + e.PlayerID = -1; + e.Command = command; + e.Value = currentValue; + m_EventBroker->Publish(e); + LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID); + m_LastCommandValues[command] = currentValue; + } + } } bool InputProxy::OnBindOrigin(const Events::BindOrigin& e) @@ -65,6 +74,8 @@ bool InputProxy::OnBindOrigin(const Events::BindOrigin& e) for (auto& handler : m_Handlers) { bool result = handler->BindOrigin(e.Origin, e.Command, e.Value); if (result) { + m_CommandHandlers[e.Command].insert(handler); + m_LastCommandValues[e.Command] = 0.f; if (originBound) { LOG_WARNING("Multiple handlers responded to binding input origin \"%s\"!", e.Origin.c_str()); } diff --git a/src/Engine/Input/KeyboardInputHandler.cpp b/src/Engine/Input/KeyboardInputHandler.cpp index 1686d8cd..0a0994aa 100644 --- a/src/Engine/Input/KeyboardInputHandler.cpp +++ b/src/Engine/Input/KeyboardInputHandler.cpp @@ -146,10 +146,10 @@ bool KeyboardInputHandler::OnKeyDown(const Events::KeyDown& e) return false; } - Events::InputCommand ic; - ic.PlayerID = 0; - std::tie(ic.Command, ic.Value) = it->second; - m_InputProxy->Publish(ic); + std::string command; + float value; + std::tie(command, value) = it->second; + m_CommandValues[command] += value; return true; } @@ -161,12 +161,21 @@ bool KeyboardInputHandler::OnKeyUp(const Events::KeyUp& e) return false; } - Events::InputCommand ic; - ic.PlayerID = 0; - std::tie(ic.Command, std::ignore) = it->second; - ic.Value = 0; - m_InputProxy->Publish(ic); + std::string command; + float value; + std::tie(command, value) = it->second; + m_CommandValues[command] -= value; return true; } +float KeyboardInputHandler::GetCommandValue(std::string command) +{ + auto it = m_CommandValues.find(command); + if (it != m_CommandValues.end()) { + return m_CommandValues[command]; + } else { + return 0.f; + } +} + From 30474b70df67aa57e5b6bde07350ada014d7e5eb Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 11 Dec 2015 18:03:48 +0100 Subject: [PATCH 08/56] MouseInputHandler --- include/Engine/Input/InputProxy.h | 3 +- include/Engine/Input/MouseInputHandler.h | 5 ++ .../Rendering/DebugCameraInputController.h | 48 +++++++++++++++++++ src/Engine/Input/InputProxy.cpp | 21 ++++++++ src/Engine/Input/MouseInputHandler.cpp | 34 ++++++++----- src/Engine/Rendering/Renderer.cpp | 31 +++--------- src/Game/Game.cpp | 1 + 7 files changed, 104 insertions(+), 39 deletions(-) create mode 100644 include/Engine/Rendering/DebugCameraInputController.h diff --git a/include/Engine/Input/InputProxy.h b/include/Engine/Input/InputProxy.h index 43c4940c..c7817c22 100644 --- a/include/Engine/Input/InputProxy.h +++ b/include/Engine/Input/InputProxy.h @@ -20,6 +20,7 @@ public: void Process(); template void AddHandler(); + void Publish(const Events::InputCommand& e); protected: EventBroker* m_EventBroker; @@ -27,7 +28,7 @@ protected: std::map> m_CommandHandlers; // Represents every unique command (has of PlayerID & Command) and all values reported for that command this frame - //std::map, std::vector> m_CommandQueue; + std::map, std::vector> m_CommandQueue; std::map m_CurrentCommandValues; std::map m_LastCommandValues; diff --git a/include/Engine/Input/MouseInputHandler.h b/include/Engine/Input/MouseInputHandler.h index 39889755..b9193a2d 100644 --- a/include/Engine/Input/MouseInputHandler.h +++ b/include/Engine/Input/MouseInputHandler.h @@ -13,12 +13,15 @@ public: MouseInputHandler(EventBroker* eventBroker, InputProxy* inputProxy); bool BindOrigin(std::string origin, std::string command, float value) override; + virtual float GetCommandValue(std::string command) override; private: std::unordered_map m_OriginCodes; std::unordered_map m_OriginAxes; std::unordered_map> m_Bindings; // GLFW_MOUSE_BUTTON... -> command string & value std::unordered_map> m_Axes; // Axis -> command string & value + std::unordered_map m_CommandValues; + std::unordered_map m_ContinuousCommandValues; EventRelay m_EMousePress; bool OnMousePress(const Events::MousePress& e); @@ -28,6 +31,8 @@ private: bool OnMouseMove(const Events::MouseMove& e); bool hasOrigin(std::string origin); + + }; #endif diff --git a/include/Engine/Rendering/DebugCameraInputController.h b/include/Engine/Rendering/DebugCameraInputController.h new file mode 100644 index 00000000..551ae0f2 --- /dev/null +++ b/include/Engine/Rendering/DebugCameraInputController.h @@ -0,0 +1,48 @@ +#include "../Input/FirstPersonInputController.h" + +template +class DebugCameraInputController : public FirstPersonInputController +{ +public: + DebugCameraInputController(EventBroker* eventBroker, unsigned int playerID) + : FirstPersonInputController(eventBroker, playerID) + { } + + const glm::vec3 Position() const { return m_Position; } + void SetBaseSpeed(float speed) { m_BaseSpeed = speed; } + + virtual bool OnCommand(const Events::InputCommand& e) override + { + if (e.Command == "PrimaryFire") { + if (e.Value > 0) { + LockMouse(); + } else { + UnlockMouse(); + } + return false; + } + + if (e.Command == "Right") { + float value = std::max(-1.f, std::min(e.Value, 1.f)); + m_Velocity.x = value; + } + if (e.Command == "Forward") { + float value = std::max(-1.f, std::min(e.Value, 1.f)); + m_Velocity.z = -value; + } + + return FirstPersonInputController::OnCommand(e); + } + + void Update(double dt) + { + if (glm::length2(m_Velocity) > 0) { + m_Position += m_Orientation * (glm::normalize(m_Velocity) * m_BaseSpeed); + } + } + +protected: + glm::vec3 m_Position = glm::vec3(0, 0, 0); + glm::vec3 m_Velocity = glm::vec3(0, 0, 0); + float m_BaseSpeed = 0.1f; +}; \ No newline at end of file diff --git a/src/Engine/Input/InputProxy.cpp b/src/Engine/Input/InputProxy.cpp index 3fe29b7d..c3e4d669 100644 --- a/src/Engine/Input/InputProxy.cpp +++ b/src/Engine/Input/InputProxy.cpp @@ -66,6 +66,27 @@ void InputProxy::Process() m_LastCommandValues[command] = currentValue; } } + + // Accumulate the input values of all unique commands published by input handlers + for (auto& pair : m_CommandQueue) { + Events::InputCommand e; + e.PlayerID = pair.first.first; + e.Command = pair.first.second; + e.Value = 0; + for (auto& value : pair.second) { + e.Value += value; + } + //e.Value = std::max(-1.f, std::min(e.Value, 1.f)); + m_EventBroker->Publish(e); + LOG_DEBUG("Input: Published command %s=%f for player %i", e.Command.c_str(), e.Value, e.PlayerID); + } + m_CommandQueue.clear(); +} + +void InputProxy::Publish(const Events::InputCommand& e) +{ + auto key = std::make_pair(e.PlayerID, e.Command); + m_CommandQueue[key].push_back(e.Value); } bool InputProxy::OnBindOrigin(const Events::BindOrigin& e) diff --git a/src/Engine/Input/MouseInputHandler.cpp b/src/Engine/Input/MouseInputHandler.cpp index 2e9c8137..5996b43d 100644 --- a/src/Engine/Input/MouseInputHandler.cpp +++ b/src/Engine/Input/MouseInputHandler.cpp @@ -50,6 +50,16 @@ bool MouseInputHandler::BindOrigin(std::string origin, std::string command, floa return false; } +float MouseInputHandler::GetCommandValue(std::string command) +{ + auto it = m_CommandValues.find(command); + if (it != m_CommandValues.end()) { + return m_CommandValues[command]; + } else { + return 0.f; + } +} + bool MouseInputHandler::OnMousePress(const Events::MousePress& e) { auto it = m_Bindings.find(e.Button); @@ -57,10 +67,10 @@ bool MouseInputHandler::OnMousePress(const Events::MousePress& e) return false; } - Events::InputCommand ic; - ic.PlayerID = 0; - std::tie(ic.Command, ic.Value) = it->second; - m_InputProxy->Publish(ic); + std::string command; + float value; + std::tie(command, value) = it->second; + m_CommandValues[command] += value; return true; } @@ -72,11 +82,10 @@ bool MouseInputHandler::OnMouseRelease(const Events::MouseRelease& e) return false; } - Events::InputCommand ic; - ic.PlayerID = 0; - std::tie(ic.Command, std::ignore) = it->second; - ic.Value = 0; - m_InputProxy->Publish(ic); + std::string command; + float value; + std::tie(command, value) = it->second; + m_CommandValues[command] -= value; return true; } @@ -87,7 +96,7 @@ bool MouseInputHandler::OnMouseMove(const Events::MouseMove& e) auto it = m_Axes.find('X'); if (it != m_Axes.end()) { Events::InputCommand ic; - ic.PlayerID = 0; + ic.PlayerID = -1; std::tie(ic.Command, ic.Value) = it->second; ic.Value *= e.DeltaX; m_InputProxy->Publish(ic); @@ -98,7 +107,7 @@ bool MouseInputHandler::OnMouseMove(const Events::MouseMove& e) auto it = m_Axes.find('Y'); if (it != m_Axes.end()) { Events::InputCommand ic; - ic.PlayerID = 0; + ic.PlayerID = -1; std::tie(ic.Command, ic.Value) = it->second; ic.Value *= e.DeltaY; m_InputProxy->Publish(ic); @@ -117,5 +126,4 @@ bool MouseInputHandler::hasOrigin(std::string origin) return false; } return true; -} - +} \ No newline at end of file diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index 6f4235d2..3bc1d9da 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -1,4 +1,5 @@ #include "Rendering/Renderer.h" +#include "Rendering/DebugCameraInputController.h" void Renderer::Initialize() { @@ -83,6 +84,8 @@ void Renderer::InitializeShaders() void Renderer::InputUpdate(double dt) { + static DebugCameraInputController firstPersonInputController(m_EventBroker, -1); + glm::vec3 m_Position = m_Camera->Position(); if (glfwGetKey(m_Window, GLFW_KEY_O) == GLFW_PRESS) { @@ -112,37 +115,15 @@ void Renderer::InputUpdate(double dt) m_CameraMoveSpeed = 0.5f; } - - static double mousePosX, mousePosY; - glfwGetCursorPos(m_Window, &mousePosX, &mousePosY); - - if (glfwGetKey(m_Window, GLFW_KEY_SPACE) == GLFW_PRESS) { - - - double deltaX, deltaY; - deltaX = mousePosX - (float)Resolution().Width / 2; - deltaY = mousePosY - (float)Resolution().Height / 2; - - float rotationY = -deltaY / 300.f; - float rotationX = -deltaX / 300.f; - glm::quat orientation = m_Camera->Orientation(); - - - orientation = orientation * glm::angleAxis(rotationY, glm::vec3(1, 0, 0)); - orientation = glm::angleAxis(rotationX, glm::vec3(0, 1, 0)) * orientation; - - m_Camera->SetOrientation(orientation); - - glfwSetCursorPos(m_Window, Resolution().Width / 2, Resolution().Height / 2); - } - m_Camera->SetPosition(m_Position); + firstPersonInputController.Update(dt); + m_Camera->SetOrientation(firstPersonInputController.Orientation()); + m_Camera->SetPosition(firstPersonInputController.Position()); } void Renderer::Update(double dt) { m_EventBroker->Process(); InputUpdate(dt); - } void Renderer::Draw(RenderQueueCollection& rq) diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index b7391bac..026857d2 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -71,6 +71,7 @@ void Game::Tick() m_LastTime = currentTime; // Handle input in a weird looking but responsive way + m_EventBroker->Process(); m_EventBroker->Swap(); m_InputManager->Update(dt); m_EventBroker->Swap(); From 653b4689b550c6bb2720e59c27b0f5ba11663f6e Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:07:53 +0100 Subject: [PATCH 09/56] Added KeyboardChar event for keyboard text input --- include/Engine/Core/EKeyboardChar.h | 17 +++++++++++++++++ include/Engine/Core/InputManager.h | 4 ++++ src/Engine/Core/InputManager.cpp | 16 ++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 include/Engine/Core/EKeyboardChar.h diff --git a/include/Engine/Core/EKeyboardChar.h b/include/Engine/Core/EKeyboardChar.h new file mode 100644 index 00000000..8c1654ce --- /dev/null +++ b/include/Engine/Core/EKeyboardChar.h @@ -0,0 +1,17 @@ +#ifndef Events_KeyboardChar_h__ +#define Events_KeyboardChar_h__ + +#include "EventBroker.h" + +namespace Events +{ + +struct KeyboardChar : Event +{ + double Timestamp = 0.f; + unsigned int Char = 0; +}; + +} + +#endif \ No newline at end of file diff --git a/include/Engine/Core/InputManager.h b/include/Engine/Core/InputManager.h index b8fe7f7a..063e691e 100644 --- a/include/Engine/Core/InputManager.h +++ b/include/Engine/Core/InputManager.h @@ -8,6 +8,7 @@ #include "EventBroker.h" #include "EKeyDown.h" #include "EKeyUp.h" +#include "EKeyboardChar.h" #include "EMousePress.h" #include "EMouseRelease.h" #include "EMouseMove.h" @@ -64,6 +65,9 @@ private: void PublishGamepadAxisIfChanged(int gamepadID, Gamepad::Axis axis); void PublishGamepadButtonIfChanged(int gamepadID, Gamepad::Button button); + + static std::vector CharCallbackQueue; + static void GLFWCharCallback(GLFWwindow* window, unsigned int c); }; #endif diff --git a/src/Engine/Core/InputManager.cpp b/src/Engine/Core/InputManager.cpp index 597fd7f6..4fd2e2a5 100644 --- a/src/Engine/Core/InputManager.cpp +++ b/src/Engine/Core/InputManager.cpp @@ -1,10 +1,13 @@ #include "Core/InputManager.h" +std::vector InputManager::CharCallbackQueue; + void InputManager::Initialize() { // TODO: Gamepad //m_LastGamepadAxisState = std::array(); //m_LastGamepadButtonState = std::array(); + glfwSetCharCallback(m_GLFWWindow, &InputManager::GLFWCharCallback); EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &InputManager::OnLockMouse); EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &InputManager::OnUnlockMouse); @@ -73,6 +76,14 @@ void InputManager::Update(double dt) m_EventBroker->Publish(e); } + for (unsigned int& c : CharCallbackQueue) { + Events::KeyboardChar e; + e.Timestamp = glfwGetTime(); + e.Char = c; + m_EventBroker->Publish(e); + } + CharCallbackQueue.clear(); + // // Lock mouse while holding LMB // if (m_CurrentMouseState[GLFW_MOUSE_BUTTON_LEFT]) // { @@ -196,6 +207,11 @@ void InputManager::PublishGamepadButtonIfChanged(int gamepadID, Gamepad::Button } } +void InputManager::GLFWCharCallback(GLFWwindow* window, unsigned int c) +{ + CharCallbackQueue.push_back(c); +} + bool InputManager::OnLockMouse(const Events::LockMouse &event) { m_MouseLocked = true; From 7db1feac1719e4f870c2898fe3ce8e44ba4ed04e Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:08:10 +0100 Subject: [PATCH 10/56] Added basic ImGui implementation --- deps | 2 +- include/Engine/Rendering/ImGuiRenderPass.h | 54 ++++ include/Engine/Rendering/Renderer.h | 2 + src/Engine/Rendering/ImGuiRenderPass.cpp | 320 +++++++++++++++++++++ src/Engine/Rendering/Renderer.cpp | 5 + src/Game/Game.cpp | 4 +- 6 files changed, 384 insertions(+), 3 deletions(-) create mode 100644 include/Engine/Rendering/ImGuiRenderPass.h create mode 100644 src/Engine/Rendering/ImGuiRenderPass.cpp diff --git a/deps b/deps index 1b478d31..f20b9cc1 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit 1b478d3159f12273059a684ee8e187f4a25c89f0 +Subproject commit f20b9cc13bffa39c3b5144bacc5eacd34d43052c diff --git a/include/Engine/Rendering/ImGuiRenderPass.h b/include/Engine/Rendering/ImGuiRenderPass.h new file mode 100644 index 00000000..d28f1143 --- /dev/null +++ b/include/Engine/Rendering/ImGuiRenderPass.h @@ -0,0 +1,54 @@ +#include +#include "../OpenGL.h" +#include "IRenderer.h" +#include "../Core/EventBroker.h" +#include "../Core/EMousePress.h" +#include "../Core/EMouseRelease.h" +#include "../Core/EMouseMove.h" +#include "../Core/EKeyDown.h" +#include "../Core/EKeyUp.h" +#include "../Core/EKeyboardChar.h" + +class ImGuiRenderPass +{ +public: + ImGuiRenderPass(IRenderer* renderer, EventBroker* eventBroker); + + void Update(double dt); + void Draw(); + +private: + IRenderer* m_Renderer; + EventBroker* m_EventBroker; + + GLFWwindow* g_Window; + double g_Time = 0.0; + GLuint g_FontTexture; + int g_ShaderHandle; + int g_VertHandle; + int g_FragHandle; + int g_AttribLocationTex; + int g_AttribLocationProjMtx; + int g_AttribLocationPosition; + int g_AttribLocationUV; + int g_AttribLocationColor; + GLuint g_VboHandle; + GLuint g_VaoHandle; + GLuint g_ElementsHandle; + + EventRelay m_EMousePress; + bool OnMousePress(const Events::MousePress& e); + EventRelay m_EMouseRelease; + bool OnMouseRelease(const Events::MouseRelease& e); + EventRelay m_EMouseMove; + bool OnMouseMove(const Events::MouseMove& e); + EventRelay m_EKeyDown; + bool OnKeyDown(const Events::KeyDown& e); + EventRelay m_EKeyUp; + bool OnKeyUp(const Events::KeyUp& e); + EventRelay m_EKeyboardChar; + bool OnKeyboardChar(const Events::KeyboardChar& e); + + bool createDeviceObjects(); + bool createFontsTexture(); +}; \ No newline at end of file diff --git a/include/Engine/Rendering/Renderer.h b/include/Engine/Rendering/Renderer.h index 886c98ca..b4aae346 100644 --- a/include/Engine/Rendering/Renderer.h +++ b/include/Engine/Rendering/Renderer.h @@ -28,6 +28,7 @@ enum lightType #include "../Core/EventBroker.h" #include "EPicking.h" +#include "ImGuiRenderPass.h" class Renderer : public IRenderer { @@ -54,6 +55,7 @@ private: DrawScenePass* m_DrawScenePass; PickingPass* m_PickingPass; + ImGuiRenderPass* m_ImGuiRenderPass; //----------------------Functions----------------------// void InitializeWindow(); diff --git a/src/Engine/Rendering/ImGuiRenderPass.cpp b/src/Engine/Rendering/ImGuiRenderPass.cpp new file mode 100644 index 00000000..0acf9668 --- /dev/null +++ b/src/Engine/Rendering/ImGuiRenderPass.cpp @@ -0,0 +1,320 @@ +#include "Rendering/ImGuiRenderPass.h" + +ImGuiRenderPass::ImGuiRenderPass(IRenderer* renderer, EventBroker* eventBroker) + : m_Renderer(renderer) + , m_EventBroker(eventBroker) +{ + g_Window = renderer->Window(); + + ImGuiIO& io = ImGui::GetIO(); + io.KeyMap[ImGuiKey_Tab] = GLFW_KEY_TAB; // Keyboard mapping. ImGui will use those indices to peek into the io.KeyDown[] array. + io.KeyMap[ImGuiKey_LeftArrow] = GLFW_KEY_LEFT; + io.KeyMap[ImGuiKey_RightArrow] = GLFW_KEY_RIGHT; + io.KeyMap[ImGuiKey_UpArrow] = GLFW_KEY_UP; + io.KeyMap[ImGuiKey_DownArrow] = GLFW_KEY_DOWN; + io.KeyMap[ImGuiKey_PageUp] = GLFW_KEY_PAGE_UP; + io.KeyMap[ImGuiKey_PageDown] = GLFW_KEY_PAGE_DOWN; + io.KeyMap[ImGuiKey_Home] = GLFW_KEY_HOME; + io.KeyMap[ImGuiKey_End] = GLFW_KEY_END; + io.KeyMap[ImGuiKey_Delete] = GLFW_KEY_DELETE; + io.KeyMap[ImGuiKey_Backspace] = GLFW_KEY_BACKSPACE; + io.KeyMap[ImGuiKey_Enter] = GLFW_KEY_ENTER; + io.KeyMap[ImGuiKey_Escape] = GLFW_KEY_ESCAPE; + io.KeyMap[ImGuiKey_A] = GLFW_KEY_A; + io.KeyMap[ImGuiKey_C] = GLFW_KEY_C; + io.KeyMap[ImGuiKey_V] = GLFW_KEY_V; + io.KeyMap[ImGuiKey_X] = GLFW_KEY_X; + io.KeyMap[ImGuiKey_Y] = GLFW_KEY_Y; + io.KeyMap[ImGuiKey_Z] = GLFW_KEY_Z; + + //io.RenderDrawListsFn = ImGui_ImplGlfwGL3_RenderDrawLists; // Alternatively you can set this to NULL and call ImGui::GetDrawData() after ImGui::Render() to get the same ImDrawData pointer. + //io.SetClipboardTextFn = ImGui_ImplGlfwGL3_SetClipboardText; + //io.GetClipboardTextFn = ImGui_ImplGlfwGL3_GetClipboardText; + + //if (install_callbacks) { + // glfwSetMouseButtonCallback(window, ImGui_ImplGlfwGL3_MouseButtonCallback); + // glfwSetScrollCallback(window, ImGui_ImplGlfwGL3_ScrollCallback); + // glfwSetKeyCallback(window, ImGui_ImplGlfwGL3_KeyCallback); + // glfwSetCharCallback(window, ImGui_ImplGlfwGL3_CharCallback); + //} + + createDeviceObjects(); + + EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &ImGuiRenderPass::OnMousePress); + EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &ImGuiRenderPass::OnMouseRelease); + EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &ImGuiRenderPass::OnMouseMove); + EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &ImGuiRenderPass::OnKeyDown); + EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &ImGuiRenderPass::OnKeyUp); + EVENT_SUBSCRIBE_MEMBER(m_EKeyboardChar, &ImGuiRenderPass::OnKeyboardChar); +} + +void ImGuiRenderPass::Update(double dt) +{ + ImGuiIO& io = ImGui::GetIO(); + + // Setup display size (every frame to accommodate for window resizing) + int w, h; + int display_w, display_h; + glfwGetWindowSize(g_Window, &w, &h); + glfwGetFramebufferSize(g_Window, &display_w, &display_h); + io.DisplaySize = ImVec2((float)w, (float)h); + io.DisplayFramebufferScale = ImVec2((float)display_w / w, (float)display_h / h); + + io.DeltaTime = dt; + + io.KeyCtrl = glfwGetKey(g_Window, GLFW_KEY_LEFT_CONTROL) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_CONTROL); + io.KeyShift = glfwGetKey(g_Window, GLFW_KEY_LEFT_SHIFT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_SHIFT); + io.KeyAlt = glfwGetKey(g_Window, GLFW_KEY_LEFT_ALT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_ALT); + + ImGui::NewFrame(); + + static float val = 0.f; + ImGui::ShowTestWindow(); + //ImGui::LabelText("Label test", "Hi"); + ImGui::SliderFloat("float", &val, 0.f, 100.f); +} + +void ImGuiRenderPass::Draw() +{ + ImGuiIO& io = ImGui::GetIO(); + + ImGui::Render(); + + ImDrawData* draw_data = ImGui::GetDrawData(); + + // Backup GL state + GLint last_program; glGetIntegerv(GL_CURRENT_PROGRAM, &last_program); + GLint last_texture; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); + GLint last_array_buffer; glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &last_array_buffer); + GLint last_element_array_buffer; glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &last_element_array_buffer); + GLint last_vertex_array; glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vertex_array); + GLint last_blend_src; glGetIntegerv(GL_BLEND_SRC, &last_blend_src); + GLint last_blend_dst; glGetIntegerv(GL_BLEND_DST, &last_blend_dst); + GLint last_blend_equation_rgb; glGetIntegerv(GL_BLEND_EQUATION_RGB, &last_blend_equation_rgb); + GLint last_blend_equation_alpha; glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &last_blend_equation_alpha); + GLint last_viewport[4]; glGetIntegerv(GL_VIEWPORT, last_viewport); + GLboolean last_enable_blend = glIsEnabled(GL_BLEND); + GLboolean last_enable_cull_face = glIsEnabled(GL_CULL_FACE); + GLboolean last_enable_depth_test = glIsEnabled(GL_DEPTH_TEST); + GLboolean last_enable_scissor_test = glIsEnabled(GL_SCISSOR_TEST); + + // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled + glEnable(GL_BLEND); + glBlendEquation(GL_FUNC_ADD); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glDisable(GL_CULL_FACE); + glDisable(GL_DEPTH_TEST); + glEnable(GL_SCISSOR_TEST); + glActiveTexture(GL_TEXTURE0); + + // Handle cases of screen coordinates != from framebuffer coordinates (e.g. retina displays) + float fb_height = io.DisplaySize.y * io.DisplayFramebufferScale.y; + draw_data->ScaleClipRects(io.DisplayFramebufferScale); + + // Setup viewport, orthographic projection matrix + glViewport(0, 0, (GLsizei)io.DisplaySize.x, (GLsizei)io.DisplaySize.y); + const float ortho_projection[4][4] = + { + { 2.0f/io.DisplaySize.x, 0.0f, 0.0f, 0.0f }, + { 0.0f, 2.0f/-io.DisplaySize.y, 0.0f, 0.0f }, + { 0.0f, 0.0f, -1.0f, 0.0f }, + { -1.0f, 1.0f, 0.0f, 1.0f }, + }; + glUseProgram(g_ShaderHandle); + glUniform1i(g_AttribLocationTex, 0); + glUniformMatrix4fv(g_AttribLocationProjMtx, 1, GL_FALSE, &ortho_projection[0][0]); + glBindVertexArray(g_VaoHandle); + + for (int n = 0; n < draw_data->CmdListsCount; n++) { + const ImDrawList* cmd_list = draw_data->CmdLists[n]; + const ImDrawIdx* idx_buffer_offset = 0; + + glBindBuffer(GL_ARRAY_BUFFER, g_VboHandle); + glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)cmd_list->VtxBuffer.size() * sizeof(ImDrawVert), (GLvoid*)&cmd_list->VtxBuffer.front(), GL_STREAM_DRAW); + + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, g_ElementsHandle); + glBufferData(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)cmd_list->IdxBuffer.size() * sizeof(ImDrawIdx), (GLvoid*)&cmd_list->IdxBuffer.front(), GL_STREAM_DRAW); + + for (const ImDrawCmd* pcmd = cmd_list->CmdBuffer.begin(); pcmd != cmd_list->CmdBuffer.end(); pcmd++) { + if (pcmd->UserCallback) { + pcmd->UserCallback(cmd_list, pcmd); + } else { + glBindTexture(GL_TEXTURE_2D, (GLuint)(intptr_t)pcmd->TextureId); + glScissor((int)pcmd->ClipRect.x, (int)(fb_height - pcmd->ClipRect.w), (int)(pcmd->ClipRect.z - pcmd->ClipRect.x), (int)(pcmd->ClipRect.w - pcmd->ClipRect.y)); + glDrawElements(GL_TRIANGLES, (GLsizei)pcmd->ElemCount, sizeof(ImDrawIdx) == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, idx_buffer_offset); + } + idx_buffer_offset += pcmd->ElemCount; + } + } + + // Restore modified GL state + glUseProgram(last_program); + glBindTexture(GL_TEXTURE_2D, last_texture); + glBindBuffer(GL_ARRAY_BUFFER, last_array_buffer); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, last_element_array_buffer); + glBindVertexArray(last_vertex_array); + glBlendEquationSeparate(last_blend_equation_rgb, last_blend_equation_alpha); + glBlendFunc(last_blend_src, last_blend_dst); + if (last_enable_blend) glEnable(GL_BLEND); else glDisable(GL_BLEND); + if (last_enable_cull_face) glEnable(GL_CULL_FACE); else glDisable(GL_CULL_FACE); + if (last_enable_depth_test) glEnable(GL_DEPTH_TEST); else glDisable(GL_DEPTH_TEST); + if (last_enable_scissor_test) glEnable(GL_SCISSOR_TEST); else glDisable(GL_SCISSOR_TEST); + glViewport(last_viewport[0], last_viewport[1], (GLsizei)last_viewport[2], (GLsizei)last_viewport[3]); +} + +bool ImGuiRenderPass::OnMousePress(const Events::MousePress& e) +{ + ImGuiIO& io = ImGui::GetIO(); + io.MouseDown[e.Button] = true; + return false; +} + +bool ImGuiRenderPass::OnMouseRelease(const Events::MouseRelease& e) +{ + ImGuiIO& io = ImGui::GetIO(); + io.MouseDown[e.Button] = false; + return false; +} + +bool ImGuiRenderPass::OnMouseMove(const Events::MouseMove& e) +{ + ImGuiIO& io = ImGui::GetIO(); + io.MousePos.x = e.X; + io.MousePos.y = e.Y; + return true; +} + +bool ImGuiRenderPass::OnKeyDown(const Events::KeyDown& e) +{ + ImGuiIO& io = ImGui::GetIO(); + io.KeysDown[e.KeyCode] = true; + return true; +} + +bool ImGuiRenderPass::OnKeyUp(const Events::KeyUp& e) +{ + ImGuiIO& io = ImGui::GetIO(); + io.KeysDown[e.KeyCode] = false; + return true; +} + +bool ImGuiRenderPass::OnKeyboardChar(const Events::KeyboardChar& e) +{ + ImGuiIO& io = ImGui::GetIO(); + if (e.Char > 0 && e.Char < 0x10000) { + io.AddInputCharacter((unsigned short)e.Char); + return true; + } else { + return false; + } +} + +bool ImGuiRenderPass::createDeviceObjects() +{ + // Backup GL state + GLint last_texture, last_array_buffer, last_vertex_array; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); + glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &last_array_buffer); + glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vertex_array); + + const GLchar *vertex_shader = + "#version 330\n" + "uniform mat4 ProjMtx;\n" + "in vec2 Position;\n" + "in vec2 UV;\n" + "in vec4 Color;\n" + "out vec2 Frag_UV;\n" + "out vec4 Frag_Color;\n" + "void main()\n" + "{\n" + " Frag_UV = UV;\n" + " Frag_Color = Color;\n" + " gl_Position = ProjMtx * vec4(Position.xy,0,1);\n" + "}\n"; + + const GLchar* fragment_shader = + "#version 330\n" + "uniform sampler2D Texture;\n" + "in vec2 Frag_UV;\n" + "in vec4 Frag_Color;\n" + "out vec4 Out_Color;\n" + "void main()\n" + "{\n" + " Out_Color = Frag_Color * texture( Texture, Frag_UV.st);\n" + "}\n"; + + g_ShaderHandle = glCreateProgram(); + g_VertHandle = glCreateShader(GL_VERTEX_SHADER); + g_FragHandle = glCreateShader(GL_FRAGMENT_SHADER); + glShaderSource(g_VertHandle, 1, &vertex_shader, 0); + glShaderSource(g_FragHandle, 1, &fragment_shader, 0); + glCompileShader(g_VertHandle); + glCompileShader(g_FragHandle); + glAttachShader(g_ShaderHandle, g_VertHandle); + glAttachShader(g_ShaderHandle, g_FragHandle); + glLinkProgram(g_ShaderHandle); + + g_AttribLocationTex = glGetUniformLocation(g_ShaderHandle, "Texture"); + g_AttribLocationProjMtx = glGetUniformLocation(g_ShaderHandle, "ProjMtx"); + g_AttribLocationPosition = glGetAttribLocation(g_ShaderHandle, "Position"); + g_AttribLocationUV = glGetAttribLocation(g_ShaderHandle, "UV"); + g_AttribLocationColor = glGetAttribLocation(g_ShaderHandle, "Color"); + + glGenBuffers(1, &g_VboHandle); + glGenBuffers(1, &g_ElementsHandle); + + glGenVertexArrays(1, &g_VaoHandle); + glBindVertexArray(g_VaoHandle); + glBindBuffer(GL_ARRAY_BUFFER, g_VboHandle); + glEnableVertexAttribArray(g_AttribLocationPosition); + glEnableVertexAttribArray(g_AttribLocationUV); + glEnableVertexAttribArray(g_AttribLocationColor); + +#define OFFSETOF(TYPE, ELEMENT) ((size_t)&(((TYPE *)0)->ELEMENT)) + glVertexAttribPointer(g_AttribLocationPosition, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)OFFSETOF(ImDrawVert, pos)); + glVertexAttribPointer(g_AttribLocationUV, 2, GL_FLOAT, GL_FALSE, sizeof(ImDrawVert), (GLvoid*)OFFSETOF(ImDrawVert, uv)); + glVertexAttribPointer(g_AttribLocationColor, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(ImDrawVert), (GLvoid*)OFFSETOF(ImDrawVert, col)); +#undef OFFSETOF + + createFontsTexture(); + + // Restore modified GL state + glBindTexture(GL_TEXTURE_2D, last_texture); + glBindBuffer(GL_ARRAY_BUFFER, last_array_buffer); + glBindVertexArray(last_vertex_array); + + return true; +} + +bool ImGuiRenderPass::createFontsTexture() +{ + // Build texture atlas + ImGuiIO& io = ImGui::GetIO(); + + io.Fonts->AddFontFromFileTTF("Fonts/DroidSans.ttf", 13.f); + io.Fonts->AddFontFromFileTTF("Fonts/ProggyClean.ttf", 13.f); + io.Fonts->AddFontFromFileTTF("Fonts/ProggyTiny.ttf", 10.f); + //io.Fonts->AddFontFromFileTTF("Fonts/Karla-Regular.ttf", 15.0f); + + unsigned char* pixels; + int width, height; + io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height); // Load as RGBA 32-bits for OpenGL3 demo because it is more likely to be compatible with user's existing shader. + + // Upload texture to graphics system + GLint last_texture; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); + glGenTextures(1, &g_FontTexture); + glBindTexture(GL_TEXTURE_2D, g_FontTexture); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); + + // Store our identifier + io.Fonts->TexID = (void *)(intptr_t)g_FontTexture; + + // Restore state + glBindTexture(GL_TEXTURE_2D, last_texture); + + return true; +} + diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index c4fa33c4..76e687ee 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -22,6 +22,8 @@ void Renderer::Initialize() m_ScreenQuad = ResourceManager::Load("Models/Core/ScreenQuad.obj"); m_UnitQuad = ResourceManager::Load("Models/Core/UnitQuad.obj"); m_UnitSphere = ResourceManager::Load("Models/Core/UnitSphere.obj"); + + m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker); } void Renderer::InitializeWindow() @@ -127,6 +129,8 @@ void Renderer::Update(double dt) { m_EventBroker->Process(); InputUpdate(dt); + m_EventBroker->Process(); + m_ImGuiRenderPass->Update(dt); } void Renderer::Draw(RenderQueueCollection& rq) @@ -137,6 +141,7 @@ void Renderer::Draw(RenderQueueCollection& rq) m_DrawScenePass->Draw(rq); GLERROR("Renderer::Draw m_DrawScenePass->Draw"); + m_ImGuiRenderPass->Draw(); glfwSwapBuffers(m_Window); } diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index af96eb29..71fa92a5 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -68,6 +68,8 @@ Game::~Game() void Game::Tick() { + glfwPollEvents(); + double currentTime = glfwGetTime(); double dt = currentTime - m_LastTime; m_LastTime = currentTime; @@ -94,8 +96,6 @@ void Game::Tick() GLERROR("Game::Tick m_Renderer->Draw"); m_EventBroker->Swap(); m_EventBroker->Clear(); - - glfwPollEvents(); } From 0c6ac1e060d7af33838f974001f3626049c1fe83 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:14:42 +0100 Subject: [PATCH 11/56] Added ImGui to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 217cb69e..7b04f8ed 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Libraries bundled along with binaries for Windows (MSVC14), available as a submo | **[zlib](http://www.zlib.net)** | 1.28 | [zlib License](http://www.zlib.net/zlib_license.html) | | **[libpng](http://www.libpng.org/pub/png/libpng.html)** | 1.6.19 | [libpng License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt) | | **[Xerces-C++](https://xerces.apache.org/xerces-c)** | 3.1.2 | [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) | +| **[ImGui](https://github.com/ocornut/imgui)** | 2015-12-12 | [MIT License](https://github.com/ocornut/imgui/blob/de3a154f3801de22c8e0bd2aeabf663a70c05972/LICENSE) | #### External libraries Libraries that are too big to be bundled with the project. From 0465fdb16d82dd38ff47d2af7b1c81d2f759d148 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:18:10 +0100 Subject: [PATCH 12/56] Added ImGui for compilation --- src/Engine/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt index 97ed3e68..6ff723da 100644 --- a/src/Engine/CMakeLists.txt +++ b/src/Engine/CMakeLists.txt @@ -78,6 +78,9 @@ set(SOURCE_FILES ${SOURCE_FILES_GUI} ${SOURCE_FILES_Rendering} ${SOURCE_FILES_Rendering_Util} + ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui.cpp + ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_draw.cpp + ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_demo.cpp ) set(LIBRARIES @@ -103,4 +106,4 @@ target_link_libraries(Engine ${LIBRARIES} ) #set_target_properties(Engine PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${INCLUDE_PATH}/PrecompiledHeader.h") -#cotire(Engine) \ No newline at end of file +#cotire(Engine) From af14d60493f8136ce241e66b2601f78209fcebf9 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:30:50 +0100 Subject: [PATCH 13/56] Added MouseScroll event to input manager --- include/Engine/Core/EMouseScroll.h | 17 ++++++++++++++++ include/Engine/Core/InputManager.h | 5 ++++- src/Engine/Core/InputManager.cpp | 31 +++++++++++++++++++++++------- 3 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 include/Engine/Core/EMouseScroll.h diff --git a/include/Engine/Core/EMouseScroll.h b/include/Engine/Core/EMouseScroll.h new file mode 100644 index 00000000..8b2826a7 --- /dev/null +++ b/include/Engine/Core/EMouseScroll.h @@ -0,0 +1,17 @@ +#ifndef Events_MouseScroll_h__ +#define Events_MouseScroll_h__ + +#include "EventBroker.h" + +namespace Events +{ + +struct MouseScroll : Event +{ + double DeltaX; + double DeltaY; +}; + +} + +#endif diff --git a/include/Engine/Core/InputManager.h b/include/Engine/Core/InputManager.h index 063e691e..0d53169e 100644 --- a/include/Engine/Core/InputManager.h +++ b/include/Engine/Core/InputManager.h @@ -12,6 +12,7 @@ #include "EMousePress.h" #include "EMouseRelease.h" #include "EMouseMove.h" +#include "EMouseScroll.h" #include "ELockMouse.h" #include "EGamepadAxis.h" #include "EGamepadButton.h" @@ -66,8 +67,10 @@ private: void PublishGamepadAxisIfChanged(int gamepadID, Gamepad::Axis axis); void PublishGamepadButtonIfChanged(int gamepadID, Gamepad::Button button); - static std::vector CharCallbackQueue; + static std::vector GLFWCharCallbackQueue; static void GLFWCharCallback(GLFWwindow* window, unsigned int c); + static std::vector> GLFWScrollCallbackQueue; + static void GLFWScrollCallback(GLFWwindow* window, double xoffset, double yoffset); }; #endif diff --git a/src/Engine/Core/InputManager.cpp b/src/Engine/Core/InputManager.cpp index 4fd2e2a5..cb901cb8 100644 --- a/src/Engine/Core/InputManager.cpp +++ b/src/Engine/Core/InputManager.cpp @@ -1,6 +1,7 @@ #include "Core/InputManager.h" -std::vector InputManager::CharCallbackQueue; +std::vector InputManager::GLFWCharCallbackQueue; +std::vector> InputManager::GLFWScrollCallbackQueue; void InputManager::Initialize() { @@ -8,6 +9,7 @@ void InputManager::Initialize() //m_LastGamepadAxisState = std::array(); //m_LastGamepadButtonState = std::array(); glfwSetCharCallback(m_GLFWWindow, &InputManager::GLFWCharCallback); + glfwSetScrollCallback(m_GLFWWindow, &InputManager::GLFWScrollCallback); EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &InputManager::OnLockMouse); EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &InputManager::OnUnlockMouse); @@ -39,6 +41,15 @@ void InputManager::Update(double dt) } } + // Keyboard text input + for (unsigned int& c : GLFWCharCallbackQueue) { + Events::KeyboardChar e; + e.Timestamp = glfwGetTime(); + e.Char = c; + m_EventBroker->Publish(e); + } + GLFWCharCallbackQueue.clear(); + // Mouse buttons for (int i = 0; i <= GLFW_MOUSE_BUTTON_LAST; ++i) { m_CurrentMouseState[i] = glfwGetMouseButton(m_GLFWWindow, i); @@ -76,13 +87,13 @@ void InputManager::Update(double dt) m_EventBroker->Publish(e); } - for (unsigned int& c : CharCallbackQueue) { - Events::KeyboardChar e; - e.Timestamp = glfwGetTime(); - e.Char = c; + // Mouse scroll + for (auto& pair : GLFWScrollCallbackQueue) { + Events::MouseScroll e; + std::tie(e.DeltaX, e.DeltaY) = pair; m_EventBroker->Publish(e); } - CharCallbackQueue.clear(); + GLFWScrollCallbackQueue.clear(); // // Lock mouse while holding LMB // if (m_CurrentMouseState[GLFW_MOUSE_BUTTON_LEFT]) @@ -209,7 +220,13 @@ void InputManager::PublishGamepadButtonIfChanged(int gamepadID, Gamepad::Button void InputManager::GLFWCharCallback(GLFWwindow* window, unsigned int c) { - CharCallbackQueue.push_back(c); + GLFWCharCallbackQueue.push_back(c); +} + + +void InputManager::GLFWScrollCallback(GLFWwindow* window, double xoffset, double yoffset) +{ + GLFWScrollCallbackQueue.push_back(std::make_pair(xoffset, yoffset)); } bool InputManager::OnLockMouse(const Events::LockMouse &event) From c81a0546013c6e4ae22d94b364bf4900f4b88647 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:31:03 +0100 Subject: [PATCH 14/56] Subscribed ImGui to MouseScroll event --- include/Engine/Rendering/ImGuiRenderPass.h | 4 ++++ src/Engine/Rendering/ImGuiRenderPass.cpp | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/Engine/Rendering/ImGuiRenderPass.h b/include/Engine/Rendering/ImGuiRenderPass.h index d28f1143..8b979bd0 100644 --- a/include/Engine/Rendering/ImGuiRenderPass.h +++ b/include/Engine/Rendering/ImGuiRenderPass.h @@ -5,6 +5,7 @@ #include "../Core/EMousePress.h" #include "../Core/EMouseRelease.h" #include "../Core/EMouseMove.h" +#include "../Core/EMouseScroll.h" #include "../Core/EKeyDown.h" #include "../Core/EKeyUp.h" #include "../Core/EKeyboardChar.h" @@ -23,6 +24,7 @@ private: GLFWwindow* g_Window; double g_Time = 0.0; + float g_MouseWheel = 0.f; GLuint g_FontTexture; int g_ShaderHandle; int g_VertHandle; @@ -42,6 +44,8 @@ private: bool OnMouseRelease(const Events::MouseRelease& e); EventRelay m_EMouseMove; bool OnMouseMove(const Events::MouseMove& e); + EventRelay m_EMouseScroll; + bool OnMouseScroll(const Events::MouseScroll& e); EventRelay m_EKeyDown; bool OnKeyDown(const Events::KeyDown& e); EventRelay m_EKeyUp; diff --git a/src/Engine/Rendering/ImGuiRenderPass.cpp b/src/Engine/Rendering/ImGuiRenderPass.cpp index 0acf9668..319eb98d 100644 --- a/src/Engine/Rendering/ImGuiRenderPass.cpp +++ b/src/Engine/Rendering/ImGuiRenderPass.cpp @@ -43,6 +43,7 @@ ImGuiRenderPass::ImGuiRenderPass(IRenderer* renderer, EventBroker* eventBroker) EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &ImGuiRenderPass::OnMousePress); EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &ImGuiRenderPass::OnMouseRelease); EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &ImGuiRenderPass::OnMouseMove); + EVENT_SUBSCRIBE_MEMBER(m_EMouseScroll, &ImGuiRenderPass::OnMouseScroll); EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &ImGuiRenderPass::OnKeyDown); EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &ImGuiRenderPass::OnKeyUp); EVENT_SUBSCRIBE_MEMBER(m_EKeyboardChar, &ImGuiRenderPass::OnKeyboardChar); @@ -66,6 +67,9 @@ void ImGuiRenderPass::Update(double dt) io.KeyShift = glfwGetKey(g_Window, GLFW_KEY_LEFT_SHIFT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_SHIFT); io.KeyAlt = glfwGetKey(g_Window, GLFW_KEY_LEFT_ALT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_ALT); + io.MouseWheel = g_MouseWheel; + g_MouseWheel = 0; + ImGui::NewFrame(); static float val = 0.f; @@ -184,6 +188,12 @@ bool ImGuiRenderPass::OnMouseMove(const Events::MouseMove& e) return true; } +bool ImGuiRenderPass::OnMouseScroll(const Events::MouseScroll& e) +{ + g_MouseWheel += (float)e.DeltaY; + return true; +} + bool ImGuiRenderPass::OnKeyDown(const Events::KeyDown& e) { ImGuiIO& io = ImGui::GetIO(); From 2e321e15a513e537efd69b00a09ee2b3955b9408 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:42:00 +0100 Subject: [PATCH 15/56] Cleaned up ImGuiRenderPass --- include/Engine/Rendering/ImGuiRenderPass.h | 4 +- src/Engine/Rendering/ImGuiRenderPass.cpp | 67 ++++++++++------------ 2 files changed, 34 insertions(+), 37 deletions(-) diff --git a/include/Engine/Rendering/ImGuiRenderPass.h b/include/Engine/Rendering/ImGuiRenderPass.h index 8b979bd0..1ca443e9 100644 --- a/include/Engine/Rendering/ImGuiRenderPass.h +++ b/include/Engine/Rendering/ImGuiRenderPass.h @@ -23,7 +23,7 @@ private: EventBroker* m_EventBroker; GLFWwindow* g_Window; - double g_Time = 0.0; + double g_DeltaTime = 0.0; float g_MouseWheel = 0.f; GLuint g_FontTexture; int g_ShaderHandle; @@ -55,4 +55,6 @@ private: bool createDeviceObjects(); bool createFontsTexture(); + + void newFrame(); }; \ No newline at end of file diff --git a/src/Engine/Rendering/ImGuiRenderPass.cpp b/src/Engine/Rendering/ImGuiRenderPass.cpp index 319eb98d..f47438fd 100644 --- a/src/Engine/Rendering/ImGuiRenderPass.cpp +++ b/src/Engine/Rendering/ImGuiRenderPass.cpp @@ -27,17 +27,6 @@ ImGuiRenderPass::ImGuiRenderPass(IRenderer* renderer, EventBroker* eventBroker) io.KeyMap[ImGuiKey_Y] = GLFW_KEY_Y; io.KeyMap[ImGuiKey_Z] = GLFW_KEY_Z; - //io.RenderDrawListsFn = ImGui_ImplGlfwGL3_RenderDrawLists; // Alternatively you can set this to NULL and call ImGui::GetDrawData() after ImGui::Render() to get the same ImDrawData pointer. - //io.SetClipboardTextFn = ImGui_ImplGlfwGL3_SetClipboardText; - //io.GetClipboardTextFn = ImGui_ImplGlfwGL3_GetClipboardText; - - //if (install_callbacks) { - // glfwSetMouseButtonCallback(window, ImGui_ImplGlfwGL3_MouseButtonCallback); - // glfwSetScrollCallback(window, ImGui_ImplGlfwGL3_ScrollCallback); - // glfwSetKeyCallback(window, ImGui_ImplGlfwGL3_KeyCallback); - // glfwSetCharCallback(window, ImGui_ImplGlfwGL3_CharCallback); - //} - createDeviceObjects(); EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &ImGuiRenderPass::OnMousePress); @@ -47,35 +36,14 @@ ImGuiRenderPass::ImGuiRenderPass(IRenderer* renderer, EventBroker* eventBroker) EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &ImGuiRenderPass::OnKeyDown); EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &ImGuiRenderPass::OnKeyUp); EVENT_SUBSCRIBE_MEMBER(m_EKeyboardChar, &ImGuiRenderPass::OnKeyboardChar); + + // Prime the first frame + newFrame(); } void ImGuiRenderPass::Update(double dt) { - ImGuiIO& io = ImGui::GetIO(); - - // Setup display size (every frame to accommodate for window resizing) - int w, h; - int display_w, display_h; - glfwGetWindowSize(g_Window, &w, &h); - glfwGetFramebufferSize(g_Window, &display_w, &display_h); - io.DisplaySize = ImVec2((float)w, (float)h); - io.DisplayFramebufferScale = ImVec2((float)display_w / w, (float)display_h / h); - - io.DeltaTime = dt; - - io.KeyCtrl = glfwGetKey(g_Window, GLFW_KEY_LEFT_CONTROL) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_CONTROL); - io.KeyShift = glfwGetKey(g_Window, GLFW_KEY_LEFT_SHIFT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_SHIFT); - io.KeyAlt = glfwGetKey(g_Window, GLFW_KEY_LEFT_ALT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_ALT); - - io.MouseWheel = g_MouseWheel; - g_MouseWheel = 0; - - ImGui::NewFrame(); - - static float val = 0.f; - ImGui::ShowTestWindow(); - //ImGui::LabelText("Label test", "Hi"); - ImGui::SliderFloat("float", &val, 0.f, 100.f); + g_DeltaTime = dt; } void ImGuiRenderPass::Draw() @@ -164,6 +132,9 @@ void ImGuiRenderPass::Draw() if (last_enable_depth_test) glEnable(GL_DEPTH_TEST); else glDisable(GL_DEPTH_TEST); if (last_enable_scissor_test) glEnable(GL_SCISSOR_TEST); else glDisable(GL_SCISSOR_TEST); glViewport(last_viewport[0], last_viewport[1], (GLsizei)last_viewport[2], (GLsizei)last_viewport[3]); + + // Start next frame + newFrame(); } bool ImGuiRenderPass::OnMousePress(const Events::MousePress& e) @@ -328,3 +299,27 @@ bool ImGuiRenderPass::createFontsTexture() return true; } +void ImGuiRenderPass::newFrame() +{ + ImGuiIO& io = ImGui::GetIO(); + + // Setup display size (every frame to accommodate for window resizing) + int w, h; + int display_w, display_h; + glfwGetWindowSize(g_Window, &w, &h); + glfwGetFramebufferSize(g_Window, &display_w, &display_h); + io.DisplaySize = ImVec2((float)w, (float)h); + io.DisplayFramebufferScale = ImVec2((float)display_w / w, (float)display_h / h); + + io.DeltaTime = g_DeltaTime; + + io.KeyCtrl = glfwGetKey(g_Window, GLFW_KEY_LEFT_CONTROL) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_CONTROL); + io.KeyShift = glfwGetKey(g_Window, GLFW_KEY_LEFT_SHIFT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_SHIFT); + io.KeyAlt = glfwGetKey(g_Window, GLFW_KEY_LEFT_ALT) || glfwGetKey(g_Window, GLFW_KEY_RIGHT_ALT); + + io.MouseWheel = g_MouseWheel; + g_MouseWheel = 0; + + ImGui::NewFrame(); +} + From 8a6030bf571f5dfbd90dce58e71026b1e09dcc81 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 13:37:14 +0100 Subject: [PATCH 16/56] Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components. --- include/Engine/Core/System.h | 38 +++++++++++++++++++++------- include/Engine/Core/SystemPipeline.h | 33 +++++++++++++++++------- include/Game/PlayerSystem.h | 6 ++--- include/Game/RaptorCopterSystem.h | 8 +++--- src/Game/PlayerSystem.cpp | 3 +-- 5 files changed, 60 insertions(+), 28 deletions(-) diff --git a/include/Engine/Core/System.h b/include/Engine/Core/System.h index 37719c51..57b0d2cc 100644 --- a/include/Engine/Core/System.h +++ b/include/Engine/Core/System.h @@ -7,19 +7,39 @@ class System { - friend class SystemPipeline; - -public: - System(EventBroker* eventBroker, std::string componentType) +protected: + System(EventBroker* eventBroker) : m_EventBroker(eventBroker) - , m_ComponentType(componentType) { } - virtual void Update(World* world, ComponentWrapper& component, double dt) = 0; - -protected: - std::string m_ComponentType; EventBroker* m_EventBroker; }; +class PureSystem : public System +{ + friend class SystemPipeline; + +protected: + PureSystem(EventBroker* eventBroker, std::string componentType) + : System(eventBroker) + , m_ComponentType(componentType) + { } + + const std::string m_ComponentType; + + virtual void UpdateComponent(World* world, ComponentWrapper& component, double dt) = 0; +}; + +class ImpureSystem : public System +{ + friend class SystemPipeline; + +protected: + ImpureSystem(EventBroker* eventBroker) + : System(eventBroker) + { } + + virtual void Update(World* world, double dt) = 0; +}; + #endif \ No newline at end of file diff --git a/include/Engine/Core/SystemPipeline.h b/include/Engine/Core/SystemPipeline.h index e4b8bb1f..0f32b422 100644 --- a/include/Engine/Core/SystemPipeline.h +++ b/include/Engine/Core/SystemPipeline.h @@ -14,7 +14,7 @@ public: { } ~SystemPipeline() { - for (auto& pair : m_Systems) { + for (auto& pair : m_PureSystems) { for (auto& system : pair.second) { delete system; } @@ -25,17 +25,28 @@ public: void AddSystem(Arguments... args) { System* system = new T(m_EventBroker, args...); - if (!system->m_ComponentType.empty()) { - m_Systems[system->m_ComponentType].push_back(system); - } else { - LOG_ERROR("Failed to add system \"%s\": Missing component type!", typeid(T).name()); - delete system; + + if (std::is_base_of::value) { + PureSystem* pureSystem = static_cast(system); + if (!pureSystem->m_ComponentType.empty()) { + m_PureSystems[pureSystem->m_ComponentType].push_back(pureSystem); + } else { + LOG_ERROR("Failed to add pure system \"%s\": Missing component type!", typeid(T).name()); + if (std::is_base_of::value) { + delete system; + } + } + } + + if (std::is_base_of::value) { + ImpureSystem* impureSystem = static_cast(system); + m_ImpureSystems.push_back(impureSystem); } } void Update(World* world, double dt) { - for (auto& pair : m_Systems) { + for (auto& pair : m_PureSystems) { const std::string& componentName = pair.first; auto& systems = pair.second; const ComponentPool* pool = world->GetComponents(componentName); @@ -44,15 +55,19 @@ public: } for (auto& component : *pool) { for (auto& system : systems) { - system->Update(world, component, dt); + system->UpdateComponent(world, component, dt); } } } + for (auto& system : m_ImpureSystems) { + system->Update(world, dt); + } } private: EventBroker* m_EventBroker; - std::unordered_map> m_Systems; + std::unordered_map> m_PureSystems; + std::vector m_ImpureSystems; }; #endif \ No newline at end of file diff --git a/include/Game/PlayerSystem.h b/include/Game/PlayerSystem.h index 18752ac6..82dee6b8 100644 --- a/include/Game/PlayerSystem.h +++ b/include/Game/PlayerSystem.h @@ -18,17 +18,17 @@ struct KeyInput bool Right = false; }; -class PlayerSystem : public System +class PlayerSystem : public PureSystem { public: PlayerSystem(EventBroker* eventBroker) - : System(eventBroker, "Player") + : PureSystem(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 UpdateComponent(World* world, ComponentWrapper& player, double dt) override; private: float m_Speed = 5; diff --git a/include/Game/RaptorCopterSystem.h b/include/Game/RaptorCopterSystem.h index cdd6dd90..913efdb3 100644 --- a/include/Game/RaptorCopterSystem.h +++ b/include/Game/RaptorCopterSystem.h @@ -1,16 +1,14 @@ #include "Common.h" #include "Core/System.h" -class RaptorCopterSystem : public System +class RaptorCopterSystem : public PureSystem { public: RaptorCopterSystem(EventBroker* eventBroker) - : System(eventBroker, "RaptorCopter") + : PureSystem(eventBroker, "RaptorCopter") { } - virtual void Initialize() { } - - virtual void Update(World* world, ComponentWrapper& raptorCopter, double dt) override + virtual void UpdateComponent(World* world, ComponentWrapper& raptorCopter, double dt) override { ComponentWrapper& transform = world->GetComponent(raptorCopter.EntityID, "Transform"); (glm::vec3&)transform["Orientation"] += (float)(double)raptorCopter["Speed"] * (float)dt * (glm::vec3)raptorCopter["Axis"]; diff --git a/src/Game/PlayerSystem.cpp b/src/Game/PlayerSystem.cpp index 736ea105..db5fe067 100644 --- a/src/Game/PlayerSystem.cpp +++ b/src/Game/PlayerSystem.cpp @@ -1,7 +1,6 @@ #include "PlayerSystem.h" - -void PlayerSystem::Update(World * world, ComponentWrapper & player, double dt) +void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, double dt) { if (input.Forward) { m_Direction.z = -1; From e5084e13eca48275e8e8289c17c4bc9029ec6fc0 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 13:37:32 +0100 Subject: [PATCH 17/56] Added EditorSystem --- include/Engine/Editor/EditorSystem.h | 11 +++++++++++ include/Game/Game.h | 1 + src/Engine/CMakeLists.txt | 8 +++++++- src/Engine/Editor/EditorSystem.cpp | 6 ++++++ src/Game/Game.cpp | 3 +-- 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 include/Engine/Editor/EditorSystem.h create mode 100644 src/Engine/Editor/EditorSystem.cpp diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h new file mode 100644 index 00000000..9520d2a6 --- /dev/null +++ b/include/Engine/Editor/EditorSystem.h @@ -0,0 +1,11 @@ +#include "../Core/System.h" + +class EditorSystem : public ImpureSystem +{ +public: + EditorSystem(EventBroker* eventBroker) + : ImpureSystem(eventBroker) + { } + + virtual void Update(World* world, double dt) override; +}; \ No newline at end of file diff --git a/include/Game/Game.h b/include/Game/Game.h index 57941e55..7933c8a1 100644 --- a/include/Game/Game.h +++ b/include/Game/Game.h @@ -17,6 +17,7 @@ #include "Core/SystemPipeline.h" #include "RaptorCopterSystem.h" #include "PlayerSystem.h" +#include "Editor/EditorSystem.h" class Game { diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt index 6ff723da..99385d74 100644 --- a/src/Engine/CMakeLists.txt +++ b/src/Engine/CMakeLists.txt @@ -60,7 +60,6 @@ file(GLOB SOURCE_FILES_Rendering_Util "${INCLUDE_PATH}/Rendering/Util/*.h" "Rendering/Util/*.cpp" ) - source_group(Rendering FILES ${SOURCE_FILES_Rendering}) source_group(Rendering\\Util FILES ${SOURCE_FILES_Rendering_Util}) @@ -70,6 +69,12 @@ file(GLOB SOURCE_FILES_GUI ) source_group(GUI FILES ${SOURCE_FILES_GUI}) +file(GLOB SOURCE_FILES_Editor + "${INCLUDE_PATH}/Editor/*.h" + "Editor/*.cpp" +) +source_group(Editor FILES ${SOURCE_FILES_Editor}) + set(SOURCE_FILES ${SOURCE_FILES_Core} ${SOURCE_FILES_Core_Util} @@ -81,6 +86,7 @@ set(SOURCE_FILES ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui.cpp ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_draw.cpp ${CMAKE_SOURCE_DIR}/deps/include/imgui/imgui_demo.cpp + ${SOURCE_FILES_Editor} ) set(LIBRARIES diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp new file mode 100644 index 00000000..c1e359af --- /dev/null +++ b/src/Engine/Editor/EditorSystem.cpp @@ -0,0 +1,6 @@ +#include "Editor/EditorSystem.h" + +void EditorSystem::Update(World* world, double dt) +{ + +} diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index 71fa92a5..e463cb07 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -52,8 +52,7 @@ Game::Game(int argc, char* argv[]) m_SystemPipeline = new SystemPipeline(m_EventBroker); m_SystemPipeline->AddSystem(); m_SystemPipeline->AddSystem(); - - + m_SystemPipeline->AddSystem(); m_LastTime = glfwGetTime(); From b66cf47ff0cf6f8000b00b6550ae035d89110841 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 13:53:03 +0100 Subject: [PATCH 18/56] Revert "Clearing raw input events from event broker to encourage use of input commands instead" This reverts commit 2e7e8d3546f9248ca20b609b043b7727e946883e. --- src/Game/Game.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index e463cb07..061ac835 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -80,7 +80,6 @@ void Game::Tick() m_EventBroker->Swap(); m_InputProxy->Update(dt); m_EventBroker->Swap(); - m_EventBroker->Clear(); m_InputProxy->Process(); m_EventBroker->Swap(); From 2018ba27aef26c5f389772a49a4f051ea5d95ee5 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 19:59:25 +0100 Subject: [PATCH 19/56] Added KnowsEntity function to ComponentPool to query whether an entity has a component attached --- include/Engine/Core/ComponentPool.h | 2 ++ src/Engine/Core/ComponentPool.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/include/Engine/Core/ComponentPool.h b/include/Engine/Core/ComponentPool.h index f0d53864..8dd8dc29 100644 --- a/include/Engine/Core/ComponentPool.h +++ b/include/Engine/Core/ComponentPool.h @@ -54,6 +54,8 @@ public: ComponentWrapper Allocate(EntityID entity); // Get the component belonging to a specific entity ComponentWrapper GetByEntity(EntityID ent); + // Returns true if the pool contains a component for the specified entity + bool KnowsEntity(EntityID ent); // Delete a component and free its memory void Delete(ComponentWrapper& wrapper); diff --git a/src/Engine/Core/ComponentPool.cpp b/src/Engine/Core/ComponentPool.cpp index 146b33f6..ef7f9740 100644 --- a/src/Engine/Core/ComponentPool.cpp +++ b/src/Engine/Core/ComponentPool.cpp @@ -50,6 +50,12 @@ ComponentWrapper ComponentPool::GetByEntity(EntityID ent) return ComponentWrapper(m_ComponentInfo, m_EntityToComponent.at(ent)); } + +bool ComponentPool::KnowsEntity(EntityID ent) +{ + return m_EntityToComponent.find(ent) != m_EntityToComponent.end(); +} + void ComponentPool::Delete(ComponentWrapper& wrapper) { m_EntityToComponent.erase(wrapper.EntityID); From 91ace0d2a0e5582e874032d4b195d6c021ba8a90 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 19:59:50 +0100 Subject: [PATCH 20/56] Fixed bug in ComponentPool::Delete. Wasn't taking EntityID into account when freeing memory. --- src/Engine/Core/ComponentPool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Engine/Core/ComponentPool.cpp b/src/Engine/Core/ComponentPool.cpp index ef7f9740..ca9cc801 100644 --- a/src/Engine/Core/ComponentPool.cpp +++ b/src/Engine/Core/ComponentPool.cpp @@ -59,7 +59,7 @@ bool ComponentPool::KnowsEntity(EntityID ent) void ComponentPool::Delete(ComponentWrapper& wrapper) { m_EntityToComponent.erase(wrapper.EntityID); - m_Pool.Free(wrapper.Data); + m_Pool.Free(wrapper.Data - sizeof(EntityID)); } ComponentPool::iterator ComponentPool::begin() const From 524af211e0b634e6613f352aac0486ba11033159 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 20:04:50 +0100 Subject: [PATCH 21/56] Made resource loading fail gracefully when a resource can't be loaded. Resources should now throw exceptions in their constuctor if the resource can't be loaded. This will result in ResourceManager::Load returning null. --- src/Engine/Core/ResourceManager.cpp | 16 +++++++++++----- src/Engine/Rendering/RawModel.cpp | 2 +- src/Engine/Rendering/RenderQueueFactory.cpp | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Engine/Core/ResourceManager.cpp b/src/Engine/Core/ResourceManager.cpp index 81823dbf..62a60f14 100644 --- a/src/Engine/Core/ResourceManager.cpp +++ b/src/Engine/Core/ResourceManager.cpp @@ -100,7 +100,7 @@ Resource* ResourceManager::Load(std::string resourceType, std::string resourceNa LOG_WARNING("Hot-loading resource \"%s\"", resourceName.c_str()); } - return CreateResource(resourceType, resourceName, parent); + return CreateResource(resourceType, resourceName, parent); } Resource* ResourceManager::CreateResource(std::string resourceType, std::string resourceName, Resource* parent) @@ -112,10 +112,16 @@ Resource* ResourceManager::CreateResource(std::string resourceType, std::string } // Call the factory function - Resource* resource = facIt->second(resourceName); - // Store IDs - resource->TypeID = GetTypeID(resourceType); - resource->ResourceID = GetNewResourceID(resource->TypeID); + Resource* resource; + try { + resource = facIt->second(resourceName); + // Store IDs + resource->TypeID = GetTypeID(resourceType); + resource->ResourceID = GetNewResourceID(resource->TypeID); + } catch (const std::exception& e) { + resource = nullptr; + LOG_ERROR("Failed to load resource \"%s\" of type \"%s\": %s", resourceName.c_str(), resourceType.c_str(), e.what()); + } // Cache m_ResourceCache[std::make_pair(resourceType, resourceName)] = resource; m_ResourceFromName[resourceName] = resource; diff --git a/src/Engine/Rendering/RawModel.cpp b/src/Engine/Rendering/RawModel.cpp index 962c278f..5aec7f22 100644 --- a/src/Engine/Rendering/RawModel.cpp +++ b/src/Engine/Rendering/RawModel.cpp @@ -8,7 +8,7 @@ RawModel::RawModel(std::string fileName) if (scene == nullptr) { LOG_ERROR("Failed to load model \"%s\"", fileName.c_str()); LOG_ERROR("Assimp error: %s", importer.GetErrorString()); - return; + throw std::runtime_error("Failed to open model file."); } auto m = scene->mRootNode->mTransformation; diff --git a/src/Engine/Rendering/RenderQueueFactory.cpp b/src/Engine/Rendering/RenderQueueFactory.cpp index 4b82647c..163a1f86 100644 --- a/src/Engine/Rendering/RenderQueueFactory.cpp +++ b/src/Engine/Rendering/RenderQueueFactory.cpp @@ -77,6 +77,9 @@ void RenderQueueFactory::FillModels(World* world, RenderQueue* renderQueue) } glm::vec4 color = modelC["Color"]; Model* model = ResourceManager::Load(resource); + if (model == nullptr) { + model = ResourceManager::Load("Models/Core/Error.obj"); + } for (auto texGroup : model->TextureGroups) { ModelJob job; From 9a119f38bb7043832db29795e449008c36252b35 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 20:05:48 +0100 Subject: [PATCH 22/56] Added events processing to SystemPipeline --- include/Engine/Core/SystemPipeline.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/Engine/Core/SystemPipeline.h b/include/Engine/Core/SystemPipeline.h index 0f32b422..78ebc966 100644 --- a/include/Engine/Core/SystemPipeline.h +++ b/include/Engine/Core/SystemPipeline.h @@ -25,6 +25,7 @@ public: void AddSystem(Arguments... args) { System* system = new T(m_EventBroker, args...); + m_Systems[typeid(T).name()] = system; if (std::is_base_of::value) { PureSystem* pureSystem = static_cast(system); @@ -32,9 +33,6 @@ public: m_PureSystems[pureSystem->m_ComponentType].push_back(pureSystem); } else { LOG_ERROR("Failed to add pure system \"%s\": Missing component type!", typeid(T).name()); - if (std::is_base_of::value) { - delete system; - } } } @@ -46,6 +44,12 @@ public: void Update(World* world, double dt) { + // Process events + for (auto& pair : m_Systems) { + m_EventBroker->Process(pair.first); + } + + // Update for (auto& pair : m_PureSystems) { const std::string& componentName = pair.first; auto& systems = pair.second; @@ -66,7 +70,8 @@ public: private: EventBroker* m_EventBroker; - std::unordered_map> m_PureSystems; + std::map m_Systems; + std::map> m_PureSystems; std::vector m_ImpureSystems; }; From 5f3c234819aee25c3463e2b3a9f4dc23022519aa Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 20:05:57 +0100 Subject: [PATCH 23/56] Added DeleteComponent function to world --- src/Engine/Core/World.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Engine/Core/World.cpp b/src/Engine/Core/World.cpp index dfab23cd..0f07927c 100644 --- a/src/Engine/Core/World.cpp +++ b/src/Engine/Core/World.cpp @@ -41,6 +41,14 @@ ComponentWrapper World::GetComponent(EntityID entity, std::string componentType) return pool->GetByEntity(entity); } + +void World::DeleteComponent(EntityID entity, std::string componentType) +{ + ComponentPool* pool = m_ComponentPools.at(componentType); + ComponentWrapper c = pool->GetByEntity(entity); + return pool->Delete(c); +} + const ComponentPool* World::GetComponents(std::string componentType) { auto it = m_ComponentPools.find(componentType); From 2f3843e595934c5e4b7fbb79d6aacdd360642587 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 20:06:21 +0100 Subject: [PATCH 24/56] Editor version 1 --- assets | 2 +- include/Engine/Core/World.h | 4 + include/Engine/Editor/EditorSystem.h | 21 +- .../Rendering/DebugCameraInputController.h | 33 +++- include/Engine/Rendering/EPicking.h | 2 +- resources/Schema/Entities/EditorTestWorld.xml | 30 +++ src/Engine/Editor/EditorSystem.cpp | 181 ++++++++++++++++++ src/Engine/Rendering/ImGuiRenderPass.cpp | 17 ++ src/Engine/Rendering/Renderer.cpp | 1 - 9 files changed, 275 insertions(+), 16 deletions(-) create mode 100755 resources/Schema/Entities/EditorTestWorld.xml diff --git a/assets b/assets index b3746822..5874ddf3 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit b37468222e45ec0b2116f1543c578cb9784d43f2 +Subproject commit 5874ddf376e234d0c7de0878c940d3da439a19dd diff --git a/include/Engine/Core/World.h b/include/Engine/Core/World.h index 65dc3be7..39d27ca6 100644 --- a/include/Engine/Core/World.h +++ b/include/Engine/Core/World.h @@ -21,10 +21,14 @@ public: ComponentWrapper AttachComponent(EntityID entity, std::string componentType); // Get a component of an entity ComponentWrapper GetComponent(EntityID entity, std::string componentType); + // Delete a component off an entity + void DeleteComponent(EntityID entity, std::string componentType); // Get all components of the specified type const ComponentPool* GetComponents(std::string componentType); // Get entity parent EntityID GetParent(EntityID entity); + // Get all component pools + const std::unordered_map& GetComponentPools() const { return m_ComponentPools; } private: EntityID m_CurrentEntityID = 1; diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index 9520d2a6..da076942 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -1,11 +1,26 @@ +#include #include "../Core/System.h" +#include "../Core/EMousePress.h" +#include "../Rendering/EPicking.h" class EditorSystem : public ImpureSystem { public: - EditorSystem(EventBroker* eventBroker) - : ImpureSystem(eventBroker) - { } + EditorSystem(EventBroker* eventBroker); virtual void Update(World* world, double dt) override; + +private: + std::vector m_PickingQueue; + EntityID m_Widget = 0; + EntityID m_Selection = 0; + EntityID m_LastSelection = 0; + + EventRelay m_EMousePress; + bool OnMousePress(const Events::MousePress& e); + EventRelay m_EPicking; + bool OnPicking(const Events::Picking& e); + + void drawUI(World* world, double dt); + bool createDeleteButton(std::string componentType); }; \ No newline at end of file diff --git a/include/Engine/Rendering/DebugCameraInputController.h b/include/Engine/Rendering/DebugCameraInputController.h index 551ae0f2..6d5908ef 100644 --- a/include/Engine/Rendering/DebugCameraInputController.h +++ b/include/Engine/Rendering/DebugCameraInputController.h @@ -1,3 +1,4 @@ +#include #include "../Input/FirstPersonInputController.h" template @@ -15,20 +16,31 @@ public: { if (e.Command == "PrimaryFire") { if (e.Value > 0) { - LockMouse(); + if (!ImGui::IsMouseHoveringAnyWindow()) { + LockMouse(); + } } else { UnlockMouse(); } return false; } - if (e.Command == "Right") { - float value = std::max(-1.f, std::min(e.Value, 1.f)); - m_Velocity.x = value; - } - if (e.Command == "Forward") { - float value = std::max(-1.f, std::min(e.Value, 1.f)); - m_Velocity.z = -value; + if (m_MouseLocked || e.Value == 0) { + if (e.Command == "Right") { + float value = std::max(-1.f, std::min(e.Value, 1.f)); + m_Velocity.x = value; + } + if (e.Command == "Forward") { + float value = std::max(-1.f, std::min(e.Value, 1.f)); + m_Velocity.z = -value; + } + if (e.Command == "Sprint") { + if (e.Value > 0.f) { + m_Speed = m_BaseSpeed * 2.f * (e.Value); + } else { + m_Speed = m_BaseSpeed; + } + } } return FirstPersonInputController::OnCommand(e); @@ -37,12 +49,13 @@ public: void Update(double dt) { if (glm::length2(m_Velocity) > 0) { - m_Position += m_Orientation * (glm::normalize(m_Velocity) * m_BaseSpeed); + m_Position += m_Orientation * (glm::normalize(m_Velocity) * m_Speed * (float)dt); } } protected: glm::vec3 m_Position = glm::vec3(0, 0, 0); glm::vec3 m_Velocity = glm::vec3(0, 0, 0); - float m_BaseSpeed = 0.1f; + float m_BaseSpeed = 2.0f; + float m_Speed = m_BaseSpeed; }; \ No newline at end of file diff --git a/include/Engine/Rendering/EPicking.h b/include/Engine/Rendering/EPicking.h index df75854a..66530a01 100644 --- a/include/Engine/Rendering/EPicking.h +++ b/include/Engine/Rendering/EPicking.h @@ -46,7 +46,7 @@ public: if (it != PickingColorsToEntity->end()) { pickData.Entity = it->second; } else { - pickData.Entity = -1; + pickData.Entity = 0; } pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, Resolution.Width - screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix); diff --git a/resources/Schema/Entities/EditorTestWorld.xml b/resources/Schema/Entities/EditorTestWorld.xml new file mode 100755 index 00000000..6e1c0be5 --- /dev/null +++ b/resources/Schema/Entities/EditorTestWorld.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + Models/Core/UnitPlane.obj + + + + + + + + + + An error + + + + + \ No newline at end of file diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index c1e359af..b687fb6a 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -1,6 +1,187 @@ #include "Editor/EditorSystem.h" +#define IMGUI_DEFINE_MATH_OPERATORS +#include + +EditorSystem::EditorSystem(EventBroker* eventBroker) + : ImpureSystem(eventBroker) +{ + EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorSystem::OnMousePress); + EVENT_SUBSCRIBE_MEMBER(m_EPicking, &EditorSystem::OnPicking); +} void EditorSystem::Update(World* world, double dt) { + if (m_Widget == 0) { + m_Widget = world->CreateEntity(); + world->AttachComponent(m_Widget, "Transform"); + auto& model = world->AttachComponent(m_Widget, "Model"); + model["Resource"] = "Models/TranslationWidget.obj"; + } + if (m_Selection != m_LastSelection) { + + } + + if (m_Selection != 0) { + auto selectionTransform = world->GetComponent(m_Selection, "Transform"); + auto widgetTransform = world->GetComponent(m_Widget, "Transform"); + + widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; + } + + drawUI(world, dt); +} + +bool EditorSystem::OnMousePress(const Events::MousePress& e) +{ + if (e.Button == GLFW_MOUSE_BUTTON_RIGHT) { + m_PickingQueue.push_back(glm::vec2(e.X, e.Y)); + } + return true; +} + +bool EditorSystem::OnPicking(const Events::Picking& e) +{ + for (auto& pos : m_PickingQueue) { + auto result = e.Pick(pos); + LOG_INFO("Selected %i", result.Entity); + m_Selection = result.Entity; + } + m_PickingQueue.clear(); + return true; +}; + +void EditorSystem::drawUI(World* world, double dt) +{ + //ImGui::ShowTestWindow(); + //ImGui::ShowStyleEditor(); + + if (ImGui::BeginMainMenuBar()) { + if (ImGui::BeginMenu("File")) { + + if (ImGui::MenuItem("New")) { } + if (ImGui::MenuItem("Open", "Ctrl+O")) { } + if (ImGui::MenuItem("Save", "Ctrl+S")) { } + if (ImGui::MenuItem("Save As...", "Ctrl+Shift+S")) { } + ImGui::Separator(); + if (ImGui::MenuItem("Close Editor", "F1")) { } + + ImGui::EndMenu(); + } + + ImGui::SameLine(); + if (ImGui::Button("Move")) { + auto& model = world->GetComponent(m_Widget, "Model"); + model["Resource"] = "Models/TranslationWidget.obj"; + } + ImGui::SameLine(); + if (ImGui::Button("Rotate")) { + auto& model = world->GetComponent(m_Widget, "Model"); + model["Resource"] = "Models/RotationWidget.obj"; + } + ImGui::SameLine(); + if (ImGui::Button("Scale")) { + auto& model = world->GetComponent(m_Widget, "Model"); + model["Resource"] = "Models/ScaleWidget.obj"; + } + + ImGui::EndMainMenuBar(); + } + + if (ImGui::Begin("Properties")) { + if (m_Selection != 0) { + auto& pools = world->GetComponentPools(); + + std::vector componentTypes; + for (auto& pair : pools) { + // Only add components the entity doesn't already have + if (!pair.second->KnowsEntity(m_Selection)) { + componentTypes.push_back(pair.first.c_str()); + } + } + int item = -1; + ImGui::PushItemWidth(ImGui::GetWindowContentRegionWidth() - 5.f); + if (ImGui::Combo("", &item, componentTypes.data(), componentTypes.size())) { + if (item != -1) { + std::string chosenType = std::string(componentTypes.at(item)); + world->AttachComponent(m_Selection, chosenType); + } + } + ImGui::PopItemWidth(); + + for (auto& pair : pools) { + const std::string& componentType = pair.first; + auto pool = pair.second; + if (!pool->KnowsEntity(m_Selection)) { + continue; + } + auto& ci = pool->ComponentInfo(); + + bool deletePressed = createDeleteButton(componentType); + if (deletePressed) { + world->DeleteComponent(m_Selection, componentType); + continue; + } + + if (ImGui::CollapsingHeader(componentType.c_str())) { + if (!ci.Meta.Annotation.empty()) { + ImGui::Text(ci.Meta.Annotation.c_str()); + } + + auto& component = world->GetComponent(m_Selection, componentType); + for (auto& pair : ci.FieldTypes) { + const std::string& field = pair.first; + const std::string& type = pair.second; + + if (type == "Vector") { + auto& val = component.Property(field); + if (field == "Scale") { + ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, 0.f, 9999.f); + } else if (field == "Orientation") { + ImGui::SliderFloat3(field.c_str(), glm::value_ptr(val), 0.f, glm::pi()); + } else { + ImGui::InputFloat3(field.c_str(), glm::value_ptr(val)); + } + } else if (type == "Color") { + auto& val = component.Property(field); + ImGui::ColorEdit4(field.c_str(), glm::value_ptr(val), true); + } else if (type == "string") { + std::string& val = component.Property(field); + char tempString[1024]; + memcpy(tempString, val.c_str(), std::min(val.length() + 1, sizeof(tempString))); + if (ImGui::InputText(field.c_str(), tempString, sizeof(tempString))) { + val = std::string(tempString); + LOG_DEBUG("%s::%s changed!", componentType.c_str(), field.c_str()); + } + } else if (type == "double") { + float tempVal = static_cast(component.Property(field)); + if (ImGui::InputFloat(field.c_str(), &tempVal, 0.01f, 1.f)) { + component.SetProperty(field, static_cast(tempVal)); + } + } + } + } + } + } + + } + ImGui::End(); +} + +bool EditorSystem::createDeleteButton(std::string componentType) +{ + float width = ImGui::GetContentRegionAvailWidth(); + ImGuiWindow* window = ImGui::GetCurrentWindow(); + auto pos = ImGui::GetCursorScreenPos() + ImVec2(width - 14.f, 1); + ImRect bb = ImRect(pos, pos + ImVec2(14.f, 14.f)); + std::string idString = "#DELETE"; + idString += componentType; + ImGuiID id = window->GetID(idString.c_str()); + bool hovered; + bool held; + bool pressed = ImGui::ButtonBehavior(bb, id, &hovered, &held); + //ImU32 col = window->Color((held && hovered) ? ImGuiCol_CloseButtonActive : hovered ? ImGuiCol_CloseButtonHovered : ImGuiCol_CloseButton); + ImU32 col = window->Color((held && hovered) ? ImGuiCol_CloseButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button); + window->DrawList->AddCircleFilled(bb.GetCenter(), 7.f, col, 16); + return pressed; } diff --git a/src/Engine/Rendering/ImGuiRenderPass.cpp b/src/Engine/Rendering/ImGuiRenderPass.cpp index f47438fd..1cb3ed8c 100644 --- a/src/Engine/Rendering/ImGuiRenderPass.cpp +++ b/src/Engine/Rendering/ImGuiRenderPass.cpp @@ -27,6 +27,21 @@ ImGuiRenderPass::ImGuiRenderPass(IRenderer* renderer, EventBroker* eventBroker) io.KeyMap[ImGuiKey_Y] = GLFW_KEY_Y; io.KeyMap[ImGuiKey_Z] = GLFW_KEY_Z; + ImGuiStyle& style = ImGui::GetStyle(); + style.Alpha = 1.f; + style.WindowPadding = ImVec2(8.f, 7.f); + style.WindowRounding = 4.f; + style.ChildWindowRounding = 0.f; + style.FramePadding = ImVec2(4.f, 2.f); + style.FrameRounding = 2.f; + style.ItemSpacing = ImVec2(6.f, 2.f); + style.ItemInnerSpacing = ImVec2(3.f, 4.f); + style.IndentSpacing = 16.f; + style.ScrollbarSize = 12; + style.ScrollbarRounding = 2.f; + style.GrabMinSize = 13.f; + style.GrabRounding = 3.f; + createDeviceObjects(); EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &ImGuiRenderPass::OnMousePress); @@ -320,6 +335,8 @@ void ImGuiRenderPass::newFrame() io.MouseWheel = g_MouseWheel; g_MouseWheel = 0; + m_EventBroker->Process(); + ImGui::NewFrame(); } diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index 76e687ee..81926f4e 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -129,7 +129,6 @@ void Renderer::Update(double dt) { m_EventBroker->Process(); InputUpdate(dt); - m_EventBroker->Process(); m_ImGuiRenderPass->Update(dt); } From 7c1182c28fbffa7378a69a88cc654c9d05e55325 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 23:39:22 +0100 Subject: [PATCH 25/56] Fixed absolute positions once and for all (maybe?) --- include/Engine/Rendering/RenderQueueFactory.h | 10 +++---- src/Engine/Rendering/RenderQueueFactory.cpp | 26 +++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/Engine/Rendering/RenderQueueFactory.h b/include/Engine/Rendering/RenderQueueFactory.h index b273b672..be2c55ca 100644 --- a/include/Engine/Rendering/RenderQueueFactory.h +++ b/include/Engine/Rendering/RenderQueueFactory.h @@ -13,8 +13,12 @@ public: RenderQueueFactory(); void Update(World* world); - RenderQueueCollection RenderQueues() const { return m_RenderQueues; } + + static glm::vec3 AbsolutePosition(World* world, EntityID entity); + static glm::quat AbsoluteOrientation(World* world, EntityID entity); + static glm::vec3 AbsoluteScale(World* world, EntityID entity); + private: RenderQueueCollection m_RenderQueues; @@ -22,10 +26,6 @@ private: void FillLights(World* world, RenderQueue* renderQueue); glm::mat4 ModelMatrix(World* world, EntityID entity); - - glm::vec3 AbsolutePosition(World* world, EntityID entity); - glm::quat AbsoluteOrientation(World* world, EntityID entity); - glm::vec3 AbsoluteScale(World* world, EntityID entity); }; #endif \ No newline at end of file diff --git a/src/Engine/Rendering/RenderQueueFactory.cpp b/src/Engine/Rendering/RenderQueueFactory.cpp index 163a1f86..7ec57ba4 100644 --- a/src/Engine/Rendering/RenderQueueFactory.cpp +++ b/src/Engine/Rendering/RenderQueueFactory.cpp @@ -23,15 +23,19 @@ glm::mat4 RenderQueueFactory::ModelMatrix(World* world, EntityID entity) return modelMatrix; } - glm::vec3 RenderQueueFactory::AbsolutePosition(World* world, EntityID entity) { glm::vec3 position; do { ComponentWrapper transform = world->GetComponent(entity, "Transform"); - position += (glm::vec3)transform["Position"]; - entity = world->GetParent(entity); + EntityID parent = world->GetParent(entity); + if (parent != 0) { + position += AbsoluteOrientation(world, parent) * (glm::vec3)transform["Position"]; + } else { + position += (glm::vec3)transform["Position"]; + } + entity = parent; } while (entity != 0); return position; @@ -52,15 +56,15 @@ glm::quat RenderQueueFactory::AbsoluteOrientation(World* world, EntityID entity) glm::vec3 RenderQueueFactory::AbsoluteScale(World* world, EntityID entity) { - ComponentWrapper transform = world->GetComponent(entity, "Transform"); - glm::vec3 scale = (glm::vec3)transform["Scale"]; + glm::vec3 scale(1.f); - EntityID parent = world->GetParent(entity); - if (parent != 0) { - return AbsoluteScale(world, parent) * scale; - } else { - return scale; - } + do { + ComponentWrapper transform = world->GetComponent(entity, "Transform"); + scale *= (glm::vec3)transform["Scale"]; + entity = world->GetParent(entity); + } while (entity != 0); + + return scale; } void RenderQueueFactory::FillModels(World* world, RenderQueue* renderQueue) From 7bc492134dbaf75e55ecc69aa7830a90ad3715fe Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 23:39:37 +0100 Subject: [PATCH 26/56] Enabled rendering "transparency" --- src/Engine/Rendering/Renderer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index 81926f4e..be884956 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -144,6 +144,10 @@ void Renderer::Draw(RenderQueueCollection& rq) glfwSwapBuffers(m_Window); } + glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 1.f); + + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); void Renderer::DrawScreenQuad(GLuint textureToDraw) { glBindFramebuffer(GL_FRAMEBUFFER, 0); From b8620eac26861db64f0ed89051bf537d372c190a Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 23:39:59 +0100 Subject: [PATCH 27/56] Made debug camera detect UI focus properly --- include/Engine/Rendering/DebugCameraInputController.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/Engine/Rendering/DebugCameraInputController.h b/include/Engine/Rendering/DebugCameraInputController.h index 6d5908ef..614b071c 100644 --- a/include/Engine/Rendering/DebugCameraInputController.h +++ b/include/Engine/Rendering/DebugCameraInputController.h @@ -14,9 +14,11 @@ public: virtual bool OnCommand(const Events::InputCommand& e) override { + ImGuiIO& io = ImGui::GetIO(); + if (e.Command == "PrimaryFire") { if (e.Value > 0) { - if (!ImGui::IsMouseHoveringAnyWindow()) { + if (!io.WantCaptureMouse) { LockMouse(); } } else { @@ -25,7 +27,7 @@ public: return false; } - if (m_MouseLocked || e.Value == 0) { + if (!io.WantCaptureKeyboard) { if (e.Command == "Right") { float value = std::max(-1.f, std::min(e.Value, 1.f)); m_Velocity.x = value; From 07c47444364a2ceace5f580903b74fbaeb3f9385 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 23:40:45 +0100 Subject: [PATCH 28/56] Added World DeleteEntity, HasComponent and GetEntityChildren --- include/Engine/Core/World.h | 6 +++++ src/Engine/Core/World.cpp | 44 ++++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/include/Engine/Core/World.h b/include/Engine/Core/World.h index 39d27ca6..da31d369 100644 --- a/include/Engine/Core/World.h +++ b/include/Engine/Core/World.h @@ -14,11 +14,15 @@ public: // Create empty entity EntityID CreateEntity(EntityID parent = 0); + // Delete entity and all components within + void DeleteEntity(EntityID entity); // Register a component type and allocate space for it void RegisterComponent(ComponentInfo& ci); // Attach a component to an entity and fill it with default values ComponentWrapper AttachComponent(EntityID entity, std::string componentType); + // Check if an entity has a component + bool HasComponent(EntityID entity, std::string componentType); // Get a component of an entity ComponentWrapper GetComponent(EntityID entity, std::string componentType); // Delete a component off an entity @@ -29,6 +33,8 @@ public: EntityID GetParent(EntityID entity); // Get all component pools const std::unordered_map& GetComponentPools() const { return m_ComponentPools; } + // Get the entity children map + const std::unordered_multimap& GetEntityChildren() const { return m_EntityChildren; } private: EntityID m_CurrentEntityID = 1; diff --git a/src/Engine/Core/World.cpp b/src/Engine/Core/World.cpp index 0f07927c..7ee5e6a7 100644 --- a/src/Engine/Core/World.cpp +++ b/src/Engine/Core/World.cpp @@ -11,12 +11,43 @@ EntityID World::CreateEntity(EntityID parent /*= 0*/) { EntityID newEntity = generateEntityID(); m_EntityParents[newEntity] = parent; - if (parent != 0) { - m_EntityChildren.insert(std::make_pair(parent, newEntity)); - } + m_EntityChildren.insert(std::make_pair(parent, newEntity)); return newEntity; } + +void World::DeleteEntity(EntityID entity) +{ + // Delete components + for (auto& pair : m_ComponentPools) { + auto& pool = pair.second; + if (pool->KnowsEntity(entity)) { + auto& c = pool->GetByEntity(entity); + pool->Delete(c); + } + } + + // Loop through children + std::vector childrenToDelete; + auto children = m_EntityChildren.equal_range(entity); + for (auto it = children.first; it != children.second; ++it) { + childrenToDelete.push_back(it->second); + } + for (auto& child : childrenToDelete) { + DeleteEntity(child); + } + + EntityID parent = m_EntityParents.at(entity); + m_EntityParents.erase(entity); + auto parentChildren = m_EntityChildren.equal_range(parent); + for (auto it = parentChildren.first; it != parentChildren.second; ++it) { + if (it->second == entity) { + m_EntityChildren.erase(it); + break; + } + } +} + void World::RegisterComponent(ComponentInfo& ci) { m_ComponentPools[ci.Name] = new ComponentPool(ci); @@ -35,6 +66,13 @@ ComponentWrapper World::AttachComponent(EntityID entity, std::string componentTy return c; } + +bool World::HasComponent(EntityID entity, std::string componentType) +{ + ComponentPool* pool = m_ComponentPools.at(componentType); + return pool->KnowsEntity(entity); +} + ComponentWrapper World::GetComponent(EntityID entity, std::string componentType) { ComponentPool* pool = m_ComponentPools.at(componentType); From 545869e342c8f13a6b70a92074ba3ab900c4846f Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sun, 13 Dec 2015 23:41:00 +0100 Subject: [PATCH 29/56] Added scene graph UI to Editor --- include/Engine/Editor/EditorSystem.h | 2 + src/Engine/Editor/EditorSystem.cpp | 61 +++++++++++++++++++++++----- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index da076942..28088823 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -2,6 +2,7 @@ #include "../Core/System.h" #include "../Core/EMousePress.h" #include "../Rendering/EPicking.h" +#include "../Rendering/RenderQueueFactory.h" class EditorSystem : public ImpureSystem { @@ -15,6 +16,7 @@ private: EntityID m_Widget = 0; EntityID m_Selection = 0; EntityID m_LastSelection = 0; + glm::vec3 m_Position; EventRelay m_EMousePress; bool OnMousePress(const Events::MousePress& e); diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index b687fb6a..bc879a11 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -23,19 +23,22 @@ void EditorSystem::Update(World* world, double dt) } if (m_Selection != 0) { - auto selectionTransform = world->GetComponent(m_Selection, "Transform"); - auto widgetTransform = world->GetComponent(m_Widget, "Transform"); + if (world->HasComponent(m_Selection, "Transform")) { + glm::vec3 pos = RenderQueueFactory::AbsolutePosition(world, m_Selection); + auto widgetTransform = world->GetComponent(m_Widget, "Transform"); + widgetTransform["Position"] = pos; + } else { + m_Selection = 0; + } + } - widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; - } - drawUI(world, dt); } bool EditorSystem::OnMousePress(const Events::MousePress& e) { if (e.Button == GLFW_MOUSE_BUTTON_RIGHT) { - m_PickingQueue.push_back(glm::vec2(e.X, e.Y)); + m_PickingQueue.push_back(glm::vec2((int)e.X, (int)e.Y)); } return true; } @@ -53,7 +56,7 @@ bool EditorSystem::OnPicking(const Events::Picking& e) void EditorSystem::drawUI(World* world, double dt) { - //ImGui::ShowTestWindow(); + ImGui::ShowTestWindow(); //ImGui::ShowStyleEditor(); if (ImGui::BeginMainMenuBar()) { @@ -88,7 +91,7 @@ void EditorSystem::drawUI(World* world, double dt) ImGui::EndMainMenuBar(); } - if (ImGui::Begin("Properties")) { + if (ImGui::Begin("Components")) { if (m_Selection != 0) { auto& pools = world->GetComponentPools(); @@ -136,11 +139,19 @@ void EditorSystem::drawUI(World* world, double dt) if (type == "Vector") { auto& val = component.Property(field); if (field == "Scale") { - ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, 0.f, 9999.f); + ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits::max()); } else if (field == "Orientation") { - ImGui::SliderFloat3(field.c_str(), glm::value_ptr(val), 0.f, glm::pi()); + glm::vec3 times = val / glm::vec3(glm::pi()); + times.x = std::floor(times.x); + times.y = std::floor(times.y); + times.z = std::floor(times.z); + glm::vec3 tempVal = val - (times*glm::pi()); + if (ImGui::SliderFloat3(field.c_str(), glm::value_ptr(tempVal), 0.f, glm::pi())) { + val = tempVal; + } } else { - ImGui::InputFloat3(field.c_str(), glm::value_ptr(val)); + //ImGui::InputFloat3(field.c_str(), glm::value_ptr(val)); + ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, std::numeric_limits::lowest(), std::numeric_limits::max()); } } else if (type == "Color") { auto& val = component.Property(field); @@ -166,6 +177,34 @@ void EditorSystem::drawUI(World* world, double dt) } ImGui::End(); + + if (ImGui::Begin("Entitites")) { + auto entityChildren = world->GetEntityChildren(); + std::function recurse = [&](EntityID parent) { + auto range = entityChildren.equal_range(parent); + for (auto it = range.first; it != range.second; it++) { + ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once); + if (ImGui::TreeNode((std::string("#") + std::to_string(it->second)).c_str())) { + if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(0)) { + m_Selection = it->second; + } + ImGui::SameLine(); + if (ImGui::Button("Add")) { + EntityID entity = world->CreateEntity(it->second); + world->AttachComponent(entity, "Transform"); + } + ImGui::SameLine(); + if (ImGui::Button("Delete")) { + world->DeleteEntity(it->second); + } + recurse(it->second); + ImGui::TreePop(); + } + } + }; + recurse(0); + } + ImGui::End(); } bool EditorSystem::createDeleteButton(std::string componentType) From 3a9577c9fb0cb14271c0e5be0ec4ed137bfdd5b3 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 14:08:05 +0100 Subject: [PATCH 30/56] fixup! Enabled rendering "transparency" --- src/Engine/Rendering/Renderer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index be884956..68402469 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -138,16 +138,16 @@ void Renderer::Draw(RenderQueueCollection& rq) //DrawScreenQuad(m_PickingPass->PickingTexture()); //CullLights(); + glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 1.f); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + m_DrawScenePass->Draw(rq); GLERROR("Renderer::Draw m_DrawScenePass->Draw"); m_ImGuiRenderPass->Draw(); glfwSwapBuffers(m_Window); } - glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 1.f); - - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); void Renderer::DrawScreenQuad(GLuint textureToDraw) { glBindFramebuffer(GL_FRAMEBUFFER, 0); From 797036c20474acb9d97bf78bde298966767b2c11 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 14:19:45 +0100 Subject: [PATCH 31/56] Fixed picking event --- include/Engine/Rendering/EPicking.h | 4 +++- src/Engine/Rendering/PickingPass.cpp | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/Engine/Rendering/EPicking.h b/include/Engine/Rendering/EPicking.h index 66530a01..044a944b 100644 --- a/include/Engine/Rendering/EPicking.h +++ b/include/Engine/Rendering/EPicking.h @@ -40,6 +40,8 @@ public: { PickData pickData; + // Invert screen y coordinate + screenCoord.y = Resolution.Height - screenCoord.y; ScreenCoords::PixelData data = ScreenCoords::ToPixelData(screenCoord, PickingBuffer, *DepthBuffer); auto it = PickingColorsToEntity->find(glm::vec2(data.Color[0], data.Color[1])); @@ -48,7 +50,7 @@ public: } else { pickData.Entity = 0; } - pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, Resolution.Width - screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix); + pickData.Position = ScreenCoords::ToWorldPos(screenCoord.x, screenCoord.y, data.Depth, Resolution, ProjectionMatrix, ViewMatrix); return pickData; } diff --git a/src/Engine/Rendering/PickingPass.cpp b/src/Engine/Rendering/PickingPass.cpp index 7d4cb66f..d45c0322 100644 --- a/src/Engine/Rendering/PickingPass.cpp +++ b/src/Engine/Rendering/PickingPass.cpp @@ -93,12 +93,15 @@ void PickingPass::Draw(RenderQueueCollection& rq) GLERROR("PickingPass Error"); //Publish pick event every frame with the pick data that can be picked by the event + int fbWidth; + int fbHeight; + glfwGetFramebufferSize(m_Renderer->Window(), &fbWidth, &fbHeight); Events::Picking pickEvent = Events::Picking( &m_PickingBuffer, &m_DepthBuffer, m_Renderer->Camera()->ProjectionMatrix(), m_Renderer->Camera()->ViewMatrix(), - m_Renderer->Resolution(), + Rectangle(fbWidth, fbHeight), &m_PickingColorsToEntity); m_EventBroker->Publish(pickEvent); From 7719274a37c324e8446fe7c8ff9c1dec855b6dab Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 14:53:57 +0100 Subject: [PATCH 32/56] Correct asset reference for fonts --- assets | 2 +- src/Engine/Rendering/ImGuiRenderPass.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets b/assets index 5874ddf3..95823e12 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 5874ddf376e234d0c7de0878c940d3da439a19dd +Subproject commit 95823e122ab11135170d1d70ab2535ae1d332fdd diff --git a/src/Engine/Rendering/ImGuiRenderPass.cpp b/src/Engine/Rendering/ImGuiRenderPass.cpp index 1cb3ed8c..f2147ea8 100644 --- a/src/Engine/Rendering/ImGuiRenderPass.cpp +++ b/src/Engine/Rendering/ImGuiRenderPass.cpp @@ -288,8 +288,8 @@ bool ImGuiRenderPass::createFontsTexture() ImGuiIO& io = ImGui::GetIO(); io.Fonts->AddFontFromFileTTF("Fonts/DroidSans.ttf", 13.f); - io.Fonts->AddFontFromFileTTF("Fonts/ProggyClean.ttf", 13.f); - io.Fonts->AddFontFromFileTTF("Fonts/ProggyTiny.ttf", 10.f); + //io.Fonts->AddFontFromFileTTF("Fonts/ProggyClean.ttf", 13.f); + //io.Fonts->AddFontFromFileTTF("Fonts/ProggyTiny.ttf", 10.f); //io.Fonts->AddFontFromFileTTF("Fonts/Karla-Regular.ttf", 15.0f); unsigned char* pixels; From bc6a211276b899983b3677bf5462100fb00b11e2 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 14:54:11 +0100 Subject: [PATCH 33/56] Removed RenderState log spam --- src/Engine/Rendering/RenderState.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Engine/Rendering/RenderState.cpp b/src/Engine/Rendering/RenderState.cpp index 87f4a30d..34c88ece 100644 --- a/src/Engine/Rendering/RenderState.cpp +++ b/src/Engine/Rendering/RenderState.cpp @@ -9,7 +9,6 @@ bool RenderState::Enable(GLenum GLEnable) { if(glIsEnabled(GLEnable)) { - LOG_WARNING("Trying to enable somthing that is already enabled."); return false; } m_Enables.push_back(GLEnable); From fb2cd0c6ae0f5c601cd386538d51a8690f47b246 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 15:20:55 +0100 Subject: [PATCH 34/56] Fixed float angle wrapping --- include/Engine/Editor/EditorSystem.h | 1 + src/Engine/Editor/EditorSystem.cpp | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index 28088823..949795ff 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -1,4 +1,5 @@ #include +#include #include "../Core/System.h" #include "../Core/EMousePress.h" #include "../Rendering/EPicking.h" diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index bc879a11..80b41bf9 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -141,12 +141,8 @@ void EditorSystem::drawUI(World* world, double dt) if (field == "Scale") { ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits::max()); } else if (field == "Orientation") { - glm::vec3 times = val / glm::vec3(glm::pi()); - times.x = std::floor(times.x); - times.y = std::floor(times.y); - times.z = std::floor(times.z); - glm::vec3 tempVal = val - (times*glm::pi()); - if (ImGui::SliderFloat3(field.c_str(), glm::value_ptr(tempVal), 0.f, glm::pi())) { + glm::vec3 tempVal = glm::fmod(val, glm::vec3(glm::two_pi())); + if (ImGui::SliderFloat3(field.c_str(), glm::value_ptr(tempVal), 0.f, glm::two_pi())) { val = tempVal; } } else { From 798c73132e458e51056c787849c1607aee893d7b Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 16:11:08 +0100 Subject: [PATCH 35/56] Fixed ScreenCoords::ToPixelData stack corruption --- src/Engine/Rendering/Util/ScreenCoords.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Engine/Rendering/Util/ScreenCoords.cpp b/src/Engine/Rendering/Util/ScreenCoords.cpp index 36dd08a1..36f1295e 100644 --- a/src/Engine/Rendering/Util/ScreenCoords.cpp +++ b/src/Engine/Rendering/Util/ScreenCoords.cpp @@ -32,11 +32,10 @@ glm::vec3 ScreenCoords::ToWorldPos(glm::vec2 screenCoord, float depth, float scr ScreenCoords::PixelData ScreenCoords::ToPixelData(float x, float y, FrameBuffer* PickDataBuffer, GLuint DepthBuffer) { PickDataBuffer->Bind(); - unsigned char pdata[2]; - glReadPixels(x, y, 1, 1, GL_RG, GL_UNSIGNED_BYTE, &pdata); + unsigned char pdata[3]; + glReadPixels(x, y, 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &pdata); PickDataBuffer->Unbind(); - glBindFramebuffer(GL_FRAMEBUFFER, DepthBuffer); float depthData; glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depthData); From f8d927cd917e67e52439258264340ad1e1083a1b Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 16:11:37 +0100 Subject: [PATCH 36/56] Don't render invisible model components --- src/Engine/Rendering/RenderQueueFactory.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Engine/Rendering/RenderQueueFactory.cpp b/src/Engine/Rendering/RenderQueueFactory.cpp index 7ec57ba4..8d5bb420 100644 --- a/src/Engine/Rendering/RenderQueueFactory.cpp +++ b/src/Engine/Rendering/RenderQueueFactory.cpp @@ -75,6 +75,10 @@ void RenderQueueFactory::FillModels(World* world, RenderQueue* renderQueue) } for (auto& modelC : *models) { + bool visible = modelC["Visible"]; + if (!visible) { + continue; + } std::string resource = modelC["Resource"]; if (resource.empty()) { continue; From ea239b19bdddc4ce89e3188c49758524effc084c Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 16:12:20 +0100 Subject: [PATCH 37/56] Fixed component type resolution order to prioritize custom types before native ones, since namespace information doesn't exist at that stage. --- resources/Schema/Components/Test.xml | 6 --- resources/Schema/Components/Test.xsd | 20 ------- src/Engine/Core/EntityXMLFile.cpp | 78 ++++++++++++++++------------ 3 files changed, 46 insertions(+), 58 deletions(-) delete mode 100644 resources/Schema/Components/Test.xml delete mode 100644 resources/Schema/Components/Test.xsd diff --git a/resources/Schema/Components/Test.xml b/resources/Schema/Components/Test.xml deleted file mode 100644 index 9e49d37a..00000000 --- a/resources/Schema/Components/Test.xml +++ /dev/null @@ -1,6 +0,0 @@ - - 1 - 1.333 - - - \ No newline at end of file diff --git a/resources/Schema/Components/Test.xsd b/resources/Schema/Components/Test.xsd deleted file mode 100644 index e31f83af..00000000 --- a/resources/Schema/Components/Test.xsd +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - ECS Test Component - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Engine/Core/EntityXMLFile.cpp b/src/Engine/Core/EntityXMLFile.cpp index b96e366e..bf8daceb 100644 --- a/src/Engine/Core/EntityXMLFile.cpp +++ b/src/Engine/Core/EntityXMLFile.cpp @@ -415,6 +415,7 @@ std::size_t EntityXMLFile::getTypeStride(std::string typeName) std::map typeStrides{ { "bool", sizeof(bool) }, { "int", sizeof(int) }, + { "float", sizeof(float) }, { "double", sizeof(double) }, { "string", sizeof(std::string) }, { "Vector", sizeof(glm::vec3) }, @@ -443,39 +444,52 @@ void EntityXMLFile::writeData(const xercesc::DOMElement* element, std::string ty { using namespace xercesc; - XSValue::DataType dataType = XSValue::getDataType(XSTR(typeName.c_str())); - if (dataType == XSValue::DataType::dt_MAXCOUNT) { - if (typeName == "Vector") { - glm::vec3 vec; - vec.x = getFloatAttribute(element, "X"); - vec.y = getFloatAttribute(element, "Y"); - vec.z = getFloatAttribute(element, "Z"); - memcpy(outData, reinterpret_cast(&vec), getTypeStride(typeName)); - } else if (typeName == "Color") { - glm::vec4 vec; - vec.r = getFloatAttribute(element, "R"); - vec.g = getFloatAttribute(element, "G"); - vec.b = getFloatAttribute(element, "B"); - vec.a = getFloatAttribute(element, "A"); - memcpy(outData, reinterpret_cast(&vec), getTypeStride(typeName)); - } else if (typeName == "Quaternion") { - glm::quat q; - q.x = getFloatAttribute(element, "X"); - q.y = getFloatAttribute(element, "Y"); - q.z = getFloatAttribute(element, "Z"); - q.w = getFloatAttribute(element, "W"); - memcpy(outData, reinterpret_cast(&q), getTypeStride(typeName)); - } - } else if (dataType == XSValue::DataType::dt_string) { - char* str = XMLString::transcode(element->getTextContent()); - std::string standardString(str); - new (outData) std::string(str); - XMLString::release(&str); - //memcpy(outData, reinterpret_cast(&standardString), getTypeStride(typeName)); - } else { + if (typeName == "Vector") { + glm::vec3 vec; + vec.x = getFloatAttribute(element, "X"); + vec.y = getFloatAttribute(element, "Y"); + vec.z = getFloatAttribute(element, "Z"); + memcpy(outData, reinterpret_cast(&vec), getTypeStride(typeName)); + } else if (typeName == "Color") { + glm::vec4 vec; + vec.r = getFloatAttribute(element, "R"); + vec.g = getFloatAttribute(element, "G"); + vec.b = getFloatAttribute(element, "B"); + vec.a = getFloatAttribute(element, "A"); + memcpy(outData, reinterpret_cast(&vec), getTypeStride(typeName)); + } else if (typeName == "Quaternion") { + glm::quat q; + q.x = getFloatAttribute(element, "X"); + q.y = getFloatAttribute(element, "Y"); + q.z = getFloatAttribute(element, "Z"); + q.w = getFloatAttribute(element, "W"); + memcpy(outData, reinterpret_cast(&q), getTypeStride(typeName)); + } else if (typeName == "float") { XSValue::Status status; - XSValue* val = XSValue::getActualValue(element->getTextContent(), dataType, status); - memcpy(outData, reinterpret_cast(&val->fData.fValue), getTypeStride(typeName)); + XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_float, status); + memcpy(outData, reinterpret_cast(&val->fData.fValue.f_float), getTypeStride(typeName)); + } else if (typeName == "double") { + XSValue::Status status; + XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_double, status); + memcpy(outData, reinterpret_cast(&val->fData.fValue.f_double), getTypeStride(typeName)); + } else if (typeName == "bool") { + XSValue::Status status; + XSValue* val = XSValue::getActualValue(element->getTextContent(), xercesc::XSValue::DataType::dt_boolean, status); + memcpy(outData, reinterpret_cast(&val->fData.fValue.f_bool), getTypeStride(typeName)); + } else { + XSValue::DataType dataType = XSValue::getDataType(XSTR(typeName.c_str())); + if (dataType == XSValue::DataType::dt_string) { + char* str = XMLString::transcode(element->getTextContent()); + std::string standardString(str); + new (outData) std::string(str); + XMLString::release(&str); + //memcpy(outData, reinterpret_cast(&standardString), getTypeStride(typeName)); + } else { + //XSValue::Status status; + //XSValue* val = XSValue::getActualValue(element->getTextContent(), dataType, status); + //memcpy(outData, reinterpret_cast(&val->fData.fValue), getTypeStride(typeName)); + LOG_WARNING("Unknown native data type: %s", typeName.c_str()); + } } } From cddd9026fb7c7ac6a4dcd9b5b9eff1f35f30ed0b Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 16:12:52 +0100 Subject: [PATCH 38/56] Toggle editor with "ToggleEditor" command. Enable editor with "Debug.EnableEditor" config variable. --- include/Engine/Editor/EditorSystem.h | 6 +++++ src/Engine/Editor/EditorSystem.cpp | 34 ++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index 949795ff..92e237d1 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -2,6 +2,8 @@ #include #include "../Core/System.h" #include "../Core/EMousePress.h" +#include "../Core/ConfigFile.h" +#include "../Input/EInputCommand.h" #include "../Rendering/EPicking.h" #include "../Rendering/RenderQueueFactory.h" @@ -13,12 +15,16 @@ public: virtual void Update(World* world, double dt) override; private: + bool m_Enabled; + bool m_Visible; std::vector m_PickingQueue; EntityID m_Widget = 0; EntityID m_Selection = 0; EntityID m_LastSelection = 0; glm::vec3 m_Position; + EventRelay m_EInputCommand; + bool OnInputCommand(const Events::InputCommand& e); EventRelay m_EMousePress; bool OnMousePress(const Events::MousePress& e); EventRelay m_EPicking; diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index 80b41bf9..a56ba79c 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -5,12 +5,25 @@ EditorSystem::EditorSystem(EventBroker* eventBroker) : ImpureSystem(eventBroker) { + auto config = ResourceManager::Load("Config.ini"); + m_Enabled = config->Get("Debug.EditorEnabled", false); + m_Visible = m_Enabled; + + if (!m_Enabled) { + return; + } + + EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &EditorSystem::OnInputCommand); EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorSystem::OnMousePress); EVENT_SUBSCRIBE_MEMBER(m_EPicking, &EditorSystem::OnPicking); } void EditorSystem::Update(World* world, double dt) { + if (!m_Enabled) { + return; + } + if (m_Widget == 0) { m_Widget = world->CreateEntity(); world->AttachComponent(m_Widget, "Transform"); @@ -22,6 +35,8 @@ void EditorSystem::Update(World* world, double dt) } + auto& widgetModel = world->GetComponent(m_Widget, "Model"); + widgetModel["Visible"] = m_Visible; if (m_Selection != 0) { if (world->HasComponent(m_Selection, "Transform")) { glm::vec3 pos = RenderQueueFactory::AbsolutePosition(world, m_Selection); @@ -30,11 +45,24 @@ void EditorSystem::Update(World* world, double dt) } else { m_Selection = 0; } - } + } + + if (!m_Visible) { + return; + } drawUI(world, dt); } + +bool EditorSystem::OnInputCommand(const Events::InputCommand& e) +{ + if (e.Command == "ToggleEditor" && e.Value > 0) { + m_Visible = !m_Visible; + } + return true; +} + bool EditorSystem::OnMousePress(const Events::MousePress& e) { if (e.Button == GLFW_MOUSE_BUTTON_RIGHT) { @@ -146,7 +174,6 @@ void EditorSystem::drawUI(World* world, double dt) val = tempVal; } } else { - //ImGui::InputFloat3(field.c_str(), glm::value_ptr(val)); ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, std::numeric_limits::lowest(), std::numeric_limits::max()); } } else if (type == "Color") { @@ -165,6 +192,9 @@ void EditorSystem::drawUI(World* world, double dt) if (ImGui::InputFloat(field.c_str(), &tempVal, 0.01f, 1.f)) { component.SetProperty(field, static_cast(tempVal)); } + } else if (type == "bool") { + auto& val = component.Property(field); + ImGui::Checkbox(field.c_str(), &val); } } } From 522679b14cffcd0ef3a1ce43a51570e22f8d6932 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 20:13:45 +0100 Subject: [PATCH 39/56] Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT --- include/Engine/Rendering/RenderState.h | 18 ++- src/Engine/Rendering/DrawScenePassState.cpp | 2 +- src/Engine/Rendering/PickingPassState.cpp | 2 +- src/Engine/Rendering/RenderState.cpp | 145 +++++++++----------- 4 files changed, 80 insertions(+), 87 deletions(-) diff --git a/include/Engine/Rendering/RenderState.h b/include/Engine/Rendering/RenderState.h index e7ba2f80..c6eb8775 100644 --- a/include/Engine/Rendering/RenderState.h +++ b/include/Engine/Rendering/RenderState.h @@ -1,6 +1,7 @@ #ifndef RenderState_h__ #define RenderState_h__ +#include #include "../Common.h" #include "../OpenGL.h" #include "../GLM.h" @@ -8,16 +9,19 @@ class RenderState { public: - RenderState(); + RenderState() = default; ~RenderState(); - bool Enable(GLenum GLEnable); - bool CullFace(GLenum GlFaceToCull); + + bool Enable(GLenum cap); + bool Disable(GLenum cap); + bool CullFace(GLenum mode); bool ClearColor(glm::vec4 color); bool Clear(GLbitfield mask); - bool BindBuffer(GLint buffer); + bool BindFramebuffer(GLint framebuffer); + bool BlendEquation(GLenum mode); + bool BlendFunc(GLenum sfactor, GLenum dfactor); + private: - std::vector m_Enables; - float m_preClearColor[4]; - int m_preBuffer; + std::vector> m_ResetFunctions; }; #endif \ No newline at end of file diff --git a/src/Engine/Rendering/DrawScenePassState.cpp b/src/Engine/Rendering/DrawScenePassState.cpp index 59654775..9e7497a3 100644 --- a/src/Engine/Rendering/DrawScenePassState.cpp +++ b/src/Engine/Rendering/DrawScenePassState.cpp @@ -4,7 +4,7 @@ DrawScenePassState::DrawScenePassState() { GLERROR("---"); - BindBuffer(0); + BindFramebuffer(0); GLERROR("---"); Enable(GL_DEPTH_TEST); Enable(GL_CULL_FACE); diff --git a/src/Engine/Rendering/PickingPassState.cpp b/src/Engine/Rendering/PickingPassState.cpp index a52fa546..1e28ea66 100644 --- a/src/Engine/Rendering/PickingPassState.cpp +++ b/src/Engine/Rendering/PickingPassState.cpp @@ -4,7 +4,7 @@ PickingPassState::PickingPassState(GLuint frameBuffer) { GLERROR("---2"); - BindBuffer(frameBuffer); + BindFramebuffer(frameBuffer); GLERROR("---3"); Enable(GL_DEPTH_TEST); Enable(GL_CULL_FACE); diff --git a/src/Engine/Rendering/RenderState.cpp b/src/Engine/Rendering/RenderState.cpp index 34c88ece..631e7ff5 100644 --- a/src/Engine/Rendering/RenderState.cpp +++ b/src/Engine/Rendering/RenderState.cpp @@ -1,110 +1,99 @@ #include "Rendering/RenderState.h" -RenderState::RenderState() +bool RenderState::Enable(GLenum cap) { - -} - -bool RenderState::Enable(GLenum GLEnable) -{ - if(glIsEnabled(GLEnable)) - { + if (glIsEnabled(cap)) { return false; } - m_Enables.push_back(GLEnable); - glEnable(GLEnable); - if (GLERROR("RenderState::Enable")) - { - return false; - } - return true; + m_ResetFunctions.push_back(std::bind(glDisable, cap)); + glEnable(cap); + return !GLERROR("RenderState::Enable"); } -bool RenderState::CullFace(GLenum GLCullFace) +bool RenderState::Disable(GLenum cap) { - if(!glIsEnabled(GL_CULL_FACE)) - { + if (!glIsEnabled(cap)) { + return false; + } + m_ResetFunctions.push_back(std::bind(glEnable, cap)); + glDisable(cap); + return !GLERROR("RenderState::Disable"); +} + +bool RenderState::CullFace(GLenum mode) +{ + if (!glIsEnabled(GL_CULL_FACE)) { LOG_ERROR("Setting GL_CULL_FACE without enabling it."); return false; } - GLint a; - glGetIntegerv(GL_CULL_FACE_MODE, &a); - if(a != GL_BACK) - { - //LOG_INFO("Setting Cullface to back, unessesary since this is already default."); - glCullFace(GLCullFace); - } - if (GLERROR("RenderState::CullFace")) - { - return false; - } - return true; + GLint original; + glGetIntegerv(GL_CULL_FACE_MODE, &original); + m_ResetFunctions.push_back(std::bind(glCullFace, original)); + glCullFace(mode); + return !GLERROR("RenderState::CullFace"); } bool RenderState::ClearColor(glm::vec4 color) { - glGetFloatv(GL_COLOR_CLEAR_VALUE, &m_preClearColor[0]); + GLfloat original[4]; + glGetFloatv(GL_COLOR_CLEAR_VALUE, &original[0]); + m_ResetFunctions.push_back(std::bind(glClearColor, original[0], original[1], original[2], original[3])); glClearColor(color.r, color.g, color.b, color.a); - if (GLERROR("RenderState::ClearColor")) { - return false; - } - return true; + return !GLERROR("RenderState::ClearColor"); } bool RenderState::Clear(GLbitfield mask) { glClear(mask); - if (GLERROR("RenderState::Clear")) { - return false; - } - return true; + return !GLERROR("RenderState::Clear"); } -bool RenderState::BindBuffer(GLint buffer) +bool RenderState::BindFramebuffer(GLint framebuffer) { - glGetIntegerv(GL_FRAMEBUFFER_BINDING, &m_preBuffer); - if (buffer == m_preBuffer) - { - return true; - } - glBindFramebuffer(GL_FRAMEBUFFER, buffer); - if (GLERROR("RenderState::BindBuffer")) - { - printf("BufferID: %i\npreBufferID: %i\n", buffer, m_preBuffer); - return false; - } - return true; + GLint originalRead; + glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &originalRead); + GLint originalDraw; + glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &originalDraw); + m_ResetFunctions.push_back([originalRead, originalDraw]() { + glBindFramebuffer(GL_READ_FRAMEBUFFER, originalRead); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, originalDraw); + }); + glBindFramebuffer(GL_FRAMEBUFFER, framebuffer); + return !GLERROR("RenderState::BindBuffer"); +} + + +bool RenderState::BlendEquation(GLenum mode) +{ + GLint originalRGB; + glGetIntegerv(GL_BLEND_EQUATION_RGB, &originalRGB); + GLint originalAlpha; + glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &originalAlpha); + m_ResetFunctions.push_back(std::bind(glBlendEquationSeparate, originalRGB, originalAlpha)); + glBlendEquation(mode); + return !GLERROR("RenderState::BlendEquation"); +} + +bool RenderState::BlendFunc(GLenum sfactor, GLenum dfactor) +{ + GLint originalSrcRGB; + glGetIntegerv(GL_BLEND_SRC_RGB, &originalSrcRGB); + GLint originalSrcAlpha; + glGetIntegerv(GL_BLEND_SRC_ALPHA, &originalSrcAlpha); + GLint originalDestRGB; + glGetIntegerv(GL_BLEND_DST_RGB, &originalDestRGB); + GLint originalDestAlpha; + glGetIntegerv(GL_BLEND_DST_ALPHA, &originalDestAlpha); + m_ResetFunctions.push_back(std::bind(glBlendFuncSeparate, originalSrcRGB, originalSrcAlpha, originalDestRGB, originalDestAlpha)); + glBlendFunc(sfactor, dfactor); + return !GLERROR("RenderState::BlendFunc"); } RenderState::~RenderState() { - GLERROR("RenderState::~RenderState Pre"); - GLint n_buffer = -1; - glGetIntegerv(GL_FRAMEBUFFER_BINDING, &n_buffer); - - //Set cullface to default - if (glIsEnabled(GL_CULL_FACE)) { - glCullFace(GL_BACK); + for (auto& f : m_ResetFunctions) { + f(); } - GLERROR("RenderState::~RenderState glCullFace"); - - //Set color to default - glClearColor(m_preClearColor[0], m_preClearColor[1], m_preClearColor[2], m_preClearColor[3]); - GLERROR("RenderState::~RenderState glClearColor"); - - //Disable Enables - for (auto i : m_Enables) - { - glDisable(i); - } - GLERROR("RenderState::~RenderState glDisable"); - - if(m_preBuffer != 0) - { - glBindFramebuffer(GL_FRAMEBUFFER, 0); - } - m_Enables.clear(); - GLERROR("RenderState::~RenderState glBindFramebuffer"); } From 422e6f5264f028645cc638ecaccda192d5f18eb5 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 20:25:16 +0100 Subject: [PATCH 40/56] Created a RenderState for ImGuiRenderPass --- include/Engine/Rendering/ImGuiRenderPass.h | 17 ++++++++++ src/Engine/Rendering/ImGuiRenderPass.cpp | 39 ++-------------------- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/include/Engine/Rendering/ImGuiRenderPass.h b/include/Engine/Rendering/ImGuiRenderPass.h index 1ca443e9..e9d359ba 100644 --- a/include/Engine/Rendering/ImGuiRenderPass.h +++ b/include/Engine/Rendering/ImGuiRenderPass.h @@ -1,6 +1,7 @@ #include #include "../OpenGL.h" #include "IRenderer.h" +#include "RenderState.h" #include "../Core/EventBroker.h" #include "../Core/EMousePress.h" #include "../Core/EMouseRelease.h" @@ -10,6 +11,22 @@ #include "../Core/EKeyUp.h" #include "../Core/EKeyboardChar.h" +class ImGuiRenderState : public RenderState +{ +public: + ImGuiRenderState() + : RenderState() + { + BindFramebuffer(0); + Enable(GL_BLEND); + BlendEquation(GL_FUNC_ADD); + BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + Disable(GL_CULL_FACE); + Disable(GL_DEPTH_TEST); + Enable(GL_SCISSOR_TEST); + } +}; + class ImGuiRenderPass { public: diff --git a/src/Engine/Rendering/ImGuiRenderPass.cpp b/src/Engine/Rendering/ImGuiRenderPass.cpp index f2147ea8..96f987d9 100644 --- a/src/Engine/Rendering/ImGuiRenderPass.cpp +++ b/src/Engine/Rendering/ImGuiRenderPass.cpp @@ -69,29 +69,8 @@ void ImGuiRenderPass::Draw() ImDrawData* draw_data = ImGui::GetDrawData(); - // Backup GL state - GLint last_program; glGetIntegerv(GL_CURRENT_PROGRAM, &last_program); - GLint last_texture; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last_texture); - GLint last_array_buffer; glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &last_array_buffer); - GLint last_element_array_buffer; glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &last_element_array_buffer); - GLint last_vertex_array; glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vertex_array); - GLint last_blend_src; glGetIntegerv(GL_BLEND_SRC, &last_blend_src); - GLint last_blend_dst; glGetIntegerv(GL_BLEND_DST, &last_blend_dst); - GLint last_blend_equation_rgb; glGetIntegerv(GL_BLEND_EQUATION_RGB, &last_blend_equation_rgb); - GLint last_blend_equation_alpha; glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &last_blend_equation_alpha); - GLint last_viewport[4]; glGetIntegerv(GL_VIEWPORT, last_viewport); - GLboolean last_enable_blend = glIsEnabled(GL_BLEND); - GLboolean last_enable_cull_face = glIsEnabled(GL_CULL_FACE); - GLboolean last_enable_depth_test = glIsEnabled(GL_DEPTH_TEST); - GLboolean last_enable_scissor_test = glIsEnabled(GL_SCISSOR_TEST); - - // Setup render state: alpha-blending enabled, no face culling, no depth testing, scissor enabled - glEnable(GL_BLEND); - glBlendEquation(GL_FUNC_ADD); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDisable(GL_CULL_FACE); - glDisable(GL_DEPTH_TEST); - glEnable(GL_SCISSOR_TEST); + // Set up render state + ImGuiRenderState state; glActiveTexture(GL_TEXTURE0); // Handle cases of screen coordinates != from framebuffer coordinates (e.g. retina displays) @@ -134,20 +113,6 @@ void ImGuiRenderPass::Draw() } } - // Restore modified GL state - glUseProgram(last_program); - glBindTexture(GL_TEXTURE_2D, last_texture); - glBindBuffer(GL_ARRAY_BUFFER, last_array_buffer); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, last_element_array_buffer); - glBindVertexArray(last_vertex_array); - glBlendEquationSeparate(last_blend_equation_rgb, last_blend_equation_alpha); - glBlendFunc(last_blend_src, last_blend_dst); - if (last_enable_blend) glEnable(GL_BLEND); else glDisable(GL_BLEND); - if (last_enable_cull_face) glEnable(GL_CULL_FACE); else glDisable(GL_CULL_FACE); - if (last_enable_depth_test) glEnable(GL_DEPTH_TEST); else glDisable(GL_DEPTH_TEST); - if (last_enable_scissor_test) glEnable(GL_SCISSOR_TEST); else glDisable(GL_SCISSOR_TEST); - glViewport(last_viewport[0], last_viewport[1], (GLsizei)last_viewport[2], (GLsizei)last_viewport[3]); - // Start next frame newFrame(); } From c296c4eb3b47bc12492e2e70cae7283859ce9b82 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 21:30:43 +0100 Subject: [PATCH 41/56] Fixed picking pass... again... --- src/Engine/Rendering/PickingPass.cpp | 30 +++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Engine/Rendering/PickingPass.cpp b/src/Engine/Rendering/PickingPass.cpp index d45c0322..148b272c 100644 --- a/src/Engine/Rendering/PickingPass.cpp +++ b/src/Engine/Rendering/PickingPass.cpp @@ -48,26 +48,31 @@ void PickingPass::Draw(RenderQueueCollection& rq) m_PickingColorsToEntity.clear(); PickingPassState* state = new PickingPassState(m_PickingBuffer.GetHandle()); - int r = 1; + int r = 0; int g = 0; //TODO: Render: Add code for more jobs than modeljobs. GLuint ShaderHandle = m_PickingProgram->GetHandle(); m_PickingProgram->Bind(); + std::map entityColors; + for (auto &job : rq.Forward) { auto modelJob = std::dynamic_pointer_cast(job); if (modelJob) { - //--------------- - //TODO: Renderer: IMPORTANT: Fixa detta så det inte loopar igenom listan varje frame. - //--------------- int pickColor[2] = { r, g }; - for (auto i : m_PickingColorsToEntity) { - if (modelJob->Entity == i.second) { - pickColor[0] = i.first.x; - pickColor[1] = i.first.y; - r -= 1; + auto color = entityColors.find(modelJob->Entity); + if (color != entityColors.end()) { + pickColor[0] = color->second[0]; + pickColor[1] = color->second[1]; + } else { + entityColors[modelJob->Entity] = glm::vec2(pickColor[0], pickColor[1]); + if (r + 10 > 255) { + r = 0; + g += 1; + } else { + r += 1; } } m_PickingColorsToEntity[glm::vec2(pickColor[0], pickColor[1])] = modelJob->Entity; @@ -82,11 +87,6 @@ void PickingPass::Draw(RenderQueueCollection& rq) glBindVertexArray(modelJob->Model->VAO); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, modelJob->Model->ElementBuffer); glDrawElementsBaseVertex(GL_TRIANGLES, modelJob->EndIndex - modelJob->StartIndex + 1, GL_UNSIGNED_INT, nullptr, modelJob->StartIndex); - r += 1; - if (r > 255) { - r = 0; - g += 1; - } } } m_PickingBuffer.Unbind(); @@ -105,6 +105,8 @@ void PickingPass::Draw(RenderQueueCollection& rq) &m_PickingColorsToEntity); m_EventBroker->Publish(pickEvent); + + delete state; } void PickingPass::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type) const From 51dd627ae379d21ea211a84ceff98c8a4512e4d5 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Dec 2015 22:32:20 +0100 Subject: [PATCH 42/56] Added Fonts to deploy.bat --- tools/deploy.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/deploy.bat b/tools/deploy.bat index 22d513e6..f629058c 100755 --- a/tools/deploy.bat +++ b/tools/deploy.bat @@ -11,6 +11,8 @@ RMDIR "%DeployLocation%\Textures" MKLINK "%DeployLocation%\Textures\" "assets\Textures\" /J RMDIR "%DeployLocation%\Audio" MKLINK "%DeployLocation%\Audio\" "assets\Audio\" /J +RMDIR "%DeployLocation%\Fonts" +MKLINK "%DeployLocation%\Fonts\" "assets\Fonts\" /J ECHO Deploying resources to %DeployLocation% :: Schemas From 322aedaf72832ba24a65c96d5a8f31ceed6de41a Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Tue, 15 Dec 2015 18:01:20 +0100 Subject: [PATCH 43/56] Basic transformation widgets --- assets | 2 +- include/Engine/Editor/EditorSystem.h | 37 +++- include/Engine/Rendering/EPicking.h | 3 + src/Engine/Editor/EditorSystem.cpp | 277 +++++++++++++++++++++++---- src/Engine/Rendering/Renderer.cpp | 4 +- src/Game/Game.cpp | 2 +- 6 files changed, 285 insertions(+), 40 deletions(-) diff --git a/assets b/assets index 95823e12..c5f67434 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 95823e122ab11135170d1d70ab2535ae1d332fdd +Subproject commit c5f674349a915ab1a2b4da632d87a9832d1f6fab diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index 92e237d1..be4cd608 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -2,34 +2,69 @@ #include #include "../Core/System.h" #include "../Core/EMousePress.h" +#include "../Core/EMouseRelease.h" +#include "../Core/EMouseMove.h" #include "../Core/ConfigFile.h" #include "../Input/EInputCommand.h" +#include "../Rendering/IRenderer.h" #include "../Rendering/EPicking.h" #include "../Rendering/RenderQueueFactory.h" class EditorSystem : public ImpureSystem { public: - EditorSystem(EventBroker* eventBroker); + EditorSystem(EventBroker* eventBroker, IRenderer* renderer); virtual void Update(World* world, double dt) override; private: + IRenderer* m_Renderer; + World* m_World = nullptr; + bool m_Enabled; bool m_Visible; std::vector m_PickingQueue; + + enum class WidgetMode + { + None, + Translate, + Rotate, + Scale + } m_WidgetMode = WidgetMode::None; + + enum class WidgetSpace + { + Local, + Global + } m_WidgetSpace = WidgetSpace::Global; + EntityID m_Widget = 0; + EntityID m_WidgetX = 0; + EntityID m_WidgetY = 0; + EntityID m_WidgetZ = 0; + EntityID m_WidgetOrigin = 0; + glm::vec3 m_WidgetCurrentAxis; + float m_WidgetPickingDepth = 0.f; + EntityID m_Selection = 0; EntityID m_LastSelection = 0; glm::vec3 m_Position; EventRelay m_EInputCommand; bool OnInputCommand(const Events::InputCommand& e); + EventRelay m_EMouseRelease; + bool OnMouseRelease(const Events::MouseRelease& e); EventRelay m_EMousePress; bool OnMousePress(const Events::MousePress& e); + EventRelay m_EMouseMove; + bool OnMouseMove(const Events::MouseMove& e); EventRelay m_EPicking; bool OnPicking(const Events::Picking& e); + void updateWidget(); + void setWidgetMode(WidgetMode newMode); + void setWidgetSpace(WidgetSpace space); void drawUI(World* world, double dt); bool createDeleteButton(std::string componentType); }; \ No newline at end of file diff --git a/include/Engine/Rendering/EPicking.h b/include/Engine/Rendering/EPicking.h index 044a944b..85c4b629 100644 --- a/include/Engine/Rendering/EPicking.h +++ b/include/Engine/Rendering/EPicking.h @@ -34,6 +34,8 @@ public: EntityID Entity; //World position of the "pick" glm::vec3 Position; + // Depth + float Depth; }; PickData Pick(glm::vec2 screenCoord) const @@ -43,6 +45,7 @@ public: // Invert screen y coordinate screenCoord.y = Resolution.Height - screenCoord.y; ScreenCoords::PixelData data = ScreenCoords::ToPixelData(screenCoord, PickingBuffer, *DepthBuffer); + pickData.Depth = data.Depth; auto it = PickingColorsToEntity->find(glm::vec2(data.Color[0], data.Color[1])); if (it != PickingColorsToEntity->end()) { diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index a56ba79c..fbad2281 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -2,8 +2,9 @@ #define IMGUI_DEFINE_MATH_OPERATORS #include -EditorSystem::EditorSystem(EventBroker* eventBroker) +EditorSystem::EditorSystem(EventBroker* eventBroker, IRenderer* renderer) : ImpureSystem(eventBroker) + , m_Renderer(renderer) { auto config = ResourceManager::Load("Config.ini"); m_Enabled = config->Get("Debug.EditorEnabled", false); @@ -15,51 +16,52 @@ EditorSystem::EditorSystem(EventBroker* eventBroker) EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &EditorSystem::OnInputCommand); EVENT_SUBSCRIBE_MEMBER(m_EMousePress, &EditorSystem::OnMousePress); + EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &EditorSystem::OnMouseRelease); + EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &EditorSystem::OnMouseMove); EVENT_SUBSCRIBE_MEMBER(m_EPicking, &EditorSystem::OnPicking); } void EditorSystem::Update(World* world, double dt) { + m_World = world; + if (!m_Enabled) { return; } - if (m_Widget == 0) { - m_Widget = world->CreateEntity(); - world->AttachComponent(m_Widget, "Transform"); - auto& model = world->AttachComponent(m_Widget, "Model"); - model["Resource"] = "Models/TranslationWidget.obj"; - } - - if (m_Selection != m_LastSelection) { - - } - - auto& widgetModel = world->GetComponent(m_Widget, "Model"); - widgetModel["Visible"] = m_Visible; - if (m_Selection != 0) { - if (world->HasComponent(m_Selection, "Transform")) { - glm::vec3 pos = RenderQueueFactory::AbsolutePosition(world, m_Selection); - auto widgetTransform = world->GetComponent(m_Widget, "Transform"); - widgetTransform["Position"] = pos; - } else { - m_Selection = 0; - } - } - if (!m_Visible) { return; } + updateWidget(); + drawUI(world, dt); } - bool EditorSystem::OnInputCommand(const Events::InputCommand& e) { if (e.Command == "ToggleEditor" && e.Value > 0) { m_Visible = !m_Visible; } + + if (e.Command == "EditorToolMove" && e.Value > 0) { + setWidgetMode(WidgetMode::Translate); + } + if (e.Command == "EditorToolRotate" && e.Value > 0) { + setWidgetMode(WidgetMode::Rotate); + } + if (e.Command == "EditorToolScale" && e.Value > 0) { + setWidgetMode(WidgetMode::Scale); + } + + if (e.Command == "EditorToggleTransformSpace" && e.Value > 0) { + if (m_WidgetSpace == WidgetSpace::Global) { + setWidgetSpace(WidgetSpace::Local); + } else if (m_WidgetSpace == WidgetSpace::Local) { + setWidgetSpace(WidgetSpace::Global); + } + } + return true; } @@ -71,17 +73,216 @@ bool EditorSystem::OnMousePress(const Events::MousePress& e) return true; } +bool EditorSystem::OnMouseMove(const Events::MouseMove& e) +{ + if (m_Widget == 0) { + return false; + } + + auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); + glm::vec3 widgetOrientation = widgetTransform["Orientation"]; + + glm::quat totalOrientation = m_Renderer->Camera()->Orientation() * glm::inverse(glm::quat(widgetOrientation)); + + int width; + int height; + glfwGetFramebufferSize(m_Renderer->Window(), &width, &height); + Rectangle res(width, height); + + glm::vec2 delta2(res.Width / 2.f + e.DeltaX, res.Height / 2.f + -e.DeltaY); + glm::vec3 deltaWorld = ScreenCoords::ToWorldPos( + delta2, + m_WidgetPickingDepth, + res, + m_Renderer->Camera()->ProjectionMatrix(), + glm::toMat4(glm::inverse(totalOrientation)) + ); + glm::vec3 origin = ScreenCoords::ToWorldPos( + glm::vec2(res.Width / 2.f, res.Height / 2.f), + m_WidgetPickingDepth, + res, + m_Renderer->Camera()->ProjectionMatrix(), + glm::toMat4(glm::inverse(totalOrientation)) + ); + deltaWorld = deltaWorld - origin; + glm::vec3 movement = deltaWorld * m_WidgetCurrentAxis; + + if (glm::length2(m_WidgetCurrentAxis) > 0.f) { + auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); + if (m_WidgetMode == WidgetMode::Translate) { + if (m_WidgetSpace == WidgetSpace::Global) { + (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Position"] += movement; + } else if (m_WidgetSpace == WidgetSpace::Local) { + auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); + (glm::vec3&)selectionTransform["Position"] += glm::quat((glm::vec3&)selectionTransform["Orientation"]) * movement; + } + } else if (m_WidgetMode == WidgetMode::Rotate) { + glm::vec3 finalMovement; + finalMovement.x = -deltaWorld.y * m_WidgetCurrentAxis.x; + finalMovement.y = deltaWorld.x * m_WidgetCurrentAxis.y; + finalMovement.z = deltaWorld.y * m_WidgetCurrentAxis.z; + glm::vec3& selectionOrientation = m_World->GetComponent(m_Selection, "Transform")["Orientation"]; + if (m_WidgetSpace == WidgetSpace::Global) { + glm::quat currentOrientation = glm::quat(selectionOrientation); + glm::quat deltaOrientation(finalMovement); + selectionOrientation = glm::eulerAngles(deltaOrientation * currentOrientation); // (currentOrientation * deltaOrientation) * glm::vec3(0, 0, -1); + } else if (m_WidgetSpace == WidgetSpace::Local) { + glm::quat currentOrientation(selectionOrientation); + glm::quat deltaOrientation(finalMovement); + selectionOrientation = glm::eulerAngles(currentOrientation * deltaOrientation); // (currentOrientation * deltaOrientation) * glm::vec3(0, 0, -1); + widgetTransform["Orientation"] = selectionOrientation; + } + } else if (m_WidgetMode == WidgetMode::Scale) { + glm::vec3& scaleX = m_World->GetComponent(m_WidgetX, "Transform")["Scale"]; + glm::vec3& scaleY = m_World->GetComponent(m_WidgetY, "Transform")["Scale"]; + glm::vec3& scaleZ = m_World->GetComponent(m_WidgetZ, "Transform")["Scale"]; + if (m_WidgetCurrentAxis.x > 0) { + scaleX.x += movement.x; + } + if (m_WidgetCurrentAxis.y > 0) { + scaleY.y += movement.y; + } + if (m_WidgetCurrentAxis.z > 0) { + scaleZ.z += movement.z; + } + if (m_WidgetCurrentAxis.x > 0 && m_WidgetCurrentAxis.y > 0 && m_WidgetCurrentAxis.z > 0) { + float max = glm::max(scaleX.x, glm::max(scaleY.y, scaleZ.z)); + (glm::vec3&)m_World->GetComponent(m_WidgetOrigin, "Transform")["Scale"] = glm::vec3(max); + } + (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Scale"] += movement; + } + } + + return true; +} + +bool EditorSystem::OnMouseRelease(const Events::MouseRelease& e) +{ + if (glm::length2(m_WidgetCurrentAxis) > 0.f) { + m_WidgetCurrentAxis = glm::vec3(0.f); + //setWidgetMode(m_WidgetMode); + } + + return true; +} + bool EditorSystem::OnPicking(const Events::Picking& e) { for (auto& pos : m_PickingQueue) { auto result = e.Pick(pos); - LOG_INFO("Selected %i", result.Entity); - m_Selection = result.Entity; + EntityID entity = result.Entity; + if (glm::length2(m_WidgetCurrentAxis) > 0.f) { + } else { + LOG_INFO("Selected %i", entity); + if (entity != 0) { + EntityID parent = m_World->GetParent(entity); + if (parent == m_Widget) { + m_WidgetCurrentAxis = glm::vec3( + (entity == m_WidgetX) || (entity == m_WidgetOrigin), + (entity == m_WidgetY) || (entity == m_WidgetOrigin), + (entity == m_WidgetZ) || (entity == m_WidgetOrigin) + ); + m_WidgetPickingDepth = result.Depth; + + //auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); + //auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); + //widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; + } else { + m_Selection = entity; + } + } else { + m_Selection = 0; + } + } } m_PickingQueue.clear(); return true; }; + +void EditorSystem::updateWidget() +{ + if (m_Widget == 0) { + m_Widget = m_World->CreateEntity(); + m_World->AttachComponent(m_Widget, "Transform"); + m_WidgetX = m_World->CreateEntity(m_Widget); + m_World->AttachComponent(m_WidgetX, "Transform"); + m_World->AttachComponent(m_WidgetX, "Model"); + m_WidgetY = m_World->CreateEntity(m_Widget); + m_World->AttachComponent(m_WidgetY, "Transform"); + m_World->AttachComponent(m_WidgetY, "Model"); + m_WidgetZ = m_World->CreateEntity(m_Widget); + m_World->AttachComponent(m_WidgetZ, "Transform"); + m_World->AttachComponent(m_WidgetZ, "Model"); + m_WidgetOrigin = m_World->CreateEntity(m_Widget); + m_World->AttachComponent(m_WidgetOrigin, "Transform"); + m_World->AttachComponent(m_WidgetOrigin, "Model"); + setWidgetMode(WidgetMode::Translate); + } + + if (m_Selection != 0) { + auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); + auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); + widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; + } +} + +void EditorSystem::setWidgetMode(WidgetMode newMode) +{ + if (m_Widget == 0) { + return; + } + + auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); + widgetTransform["Orientation"] = glm::vec3(0.f); + m_World->GetComponent(m_WidgetX, "Transform")["Scale"] = glm::vec3(1.f); + m_World->GetComponent(m_WidgetY, "Transform")["Scale"] = glm::vec3(1.f); + m_World->GetComponent(m_WidgetZ, "Transform")["Scale"] = glm::vec3(1.f); + m_World->GetComponent(m_WidgetOrigin, "Transform")["Scale"] = glm::vec3(1.f); + + if (newMode == WidgetMode::Translate) { + m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/TranslationWidgetX.obj"; + m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/TranslationWidgetY.obj"; + m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/TranslationWidgetZ.obj"; + m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = false; + if (m_Selection != 0) { + if (m_WidgetSpace == WidgetSpace::Local) { + auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); + widgetTransform["Orientation"] = (glm::vec3)selectionTransform["Orientation"]; + } + } + } else if (newMode == WidgetMode::Scale) { + m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/ScaleWidgetX.obj"; + m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/ScaleWidgetY.obj"; + m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/ScaleWidgetZ.obj"; + m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = true; + m_World->GetComponent(m_WidgetOrigin, "Model")["Resource"] = "Models/ScaleWidgetOrigin.obj"; + if (m_Selection != 0) { + auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); + widgetTransform["Orientation"] = (glm::vec3)selectionTransform["Orientation"]; + } + } else if (newMode == WidgetMode::Rotate) { + m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/RotationWidgetX.obj"; + m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/RotationWidgetY.obj"; + m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/RotationWidgetZ.obj"; + m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = false; + if (m_Selection != 0) { + auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); + if (m_WidgetSpace == WidgetSpace::Local) { + widgetTransform["Orientation"] = (glm::vec3)selectionTransform["Orientation"]; + } + } + } + m_WidgetMode = newMode; +} + + +void EditorSystem::setWidgetSpace(WidgetSpace space) +{ + m_WidgetSpace = space; + setWidgetMode(m_WidgetMode); +} + void EditorSystem::drawUI(World* world, double dt) { ImGui::ShowTestWindow(); @@ -102,24 +303,32 @@ void EditorSystem::drawUI(World* world, double dt) ImGui::SameLine(); if (ImGui::Button("Move")) { - auto& model = world->GetComponent(m_Widget, "Model"); - model["Resource"] = "Models/TranslationWidget.obj"; + setWidgetMode(WidgetMode::Translate); } ImGui::SameLine(); if (ImGui::Button("Rotate")) { - auto& model = world->GetComponent(m_Widget, "Model"); - model["Resource"] = "Models/RotationWidget.obj"; + setWidgetMode(WidgetMode::Rotate); } ImGui::SameLine(); if (ImGui::Button("Scale")) { - auto& model = world->GetComponent(m_Widget, "Model"); - model["Resource"] = "Models/ScaleWidget.obj"; + setWidgetMode(WidgetMode::Scale); + } + ImGui::SameLine(); + if (m_WidgetSpace == WidgetSpace::Global) { + if (ImGui::Button("(Global)")) { + setWidgetSpace(WidgetSpace::Local); + } + } else if (m_WidgetSpace == WidgetSpace::Local) { + if (ImGui::Button("(Local)")) { + setWidgetSpace(WidgetSpace::Global); + } } ImGui::EndMainMenuBar(); } - if (ImGui::Begin("Components")) { + std::string title = std::string("Components #") + std::to_string(m_Selection) + std::string("###Components"); + if (ImGui::Begin(title.c_str())) { if (m_Selection != 0) { auto& pools = world->GetComponentPools(); diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index 68402469..06810412 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -135,12 +135,10 @@ void Renderer::Update(double dt) void Renderer::Draw(RenderQueueCollection& rq) { m_PickingPass->Draw(rq); - //DrawScreenQuad(m_PickingPass->PickingTexture()); + DrawScreenQuad(m_PickingPass->PickingTexture()); //CullLights(); glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 1.f); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); m_DrawScenePass->Draw(rq); GLERROR("Renderer::Draw m_DrawScenePass->Draw"); diff --git a/src/Game/Game.cpp b/src/Game/Game.cpp index 061ac835..7f7559e0 100644 --- a/src/Game/Game.cpp +++ b/src/Game/Game.cpp @@ -52,7 +52,7 @@ Game::Game(int argc, char* argv[]) m_SystemPipeline = new SystemPipeline(m_EventBroker); m_SystemPipeline->AddSystem(); m_SystemPipeline->AddSystem(); - m_SystemPipeline->AddSystem(); + m_SystemPipeline->AddSystem(m_Renderer); m_LastTime = glfwGetTime(); From bd6adcc15773b4ce9d6144954379a45a5563ecb0 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Wed, 16 Dec 2015 12:05:31 +0100 Subject: [PATCH 44/56] Added SetParent to World --- include/Engine/Core/World.h | 3 +++ src/Engine/Core/World.cpp | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/Engine/Core/World.h b/include/Engine/Core/World.h index da31d369..92378816 100644 --- a/include/Engine/Core/World.h +++ b/include/Engine/Core/World.h @@ -31,6 +31,8 @@ public: const ComponentPool* GetComponents(std::string componentType); // Get entity parent EntityID GetParent(EntityID entity); + // Change the parent of an entity + void SetParent(EntityID entity, EntityID parent); // Get all component pools const std::unordered_map& GetComponentPools() const { return m_ComponentPools; } // Get the entity children map @@ -40,6 +42,7 @@ private: EntityID m_CurrentEntityID = 1; std::unordered_map m_EntityParents; + // TODO: This should be a more effective structure std::unordered_multimap m_EntityChildren; std::unordered_map m_ComponentPools; diff --git a/src/Engine/Core/World.cpp b/src/Engine/Core/World.cpp index 7ee5e6a7..5443d388 100644 --- a/src/Engine/Core/World.cpp +++ b/src/Engine/Core/World.cpp @@ -99,6 +99,22 @@ EntityID World::GetParent(EntityID entity) return m_EntityParents.at(entity); } + +void World::SetParent(EntityID entity, EntityID parent) +{ + EntityID lastParent = m_EntityParents.at(entity); + auto parentChildren = m_EntityChildren.equal_range(lastParent); + for (auto it = parentChildren.first; it != parentChildren.second; it++) { + if (it->second == entity) { + m_EntityChildren.erase(it); + break; + } + } + + m_EntityParents[entity] = parent; + m_EntityChildren.insert(std::make_pair(parent, entity)); +} + EntityID World::generateEntityID() { // TODO: Make EntityID generation smarter From 661532e355e7144f044460fd365c31d8077231fe Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Wed, 16 Dec 2015 12:05:55 +0100 Subject: [PATCH 45/56] Slightly more usable entity tree --- include/Engine/Editor/EditorSystem.h | 1 + src/Engine/Editor/EditorSystem.cpp | 76 ++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index be4cd608..021a14ca 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -67,4 +67,5 @@ private: void setWidgetSpace(WidgetSpace space); void drawUI(World* world, double dt); bool createDeleteButton(std::string componentType); + void changeParent(EntityID entity, EntityID newParent); }; \ No newline at end of file diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index fbad2281..e224ca6b 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -414,23 +414,62 @@ void EditorSystem::drawUI(World* world, double dt) ImGui::End(); if (ImGui::Begin("Entitites")) { + static EntityID draggingEntity = 0; auto entityChildren = world->GetEntityChildren(); std::function recurse = [&](EntityID parent) { auto range = entityChildren.equal_range(parent); for (auto it = range.first; it != range.second; it++) { + + ImVec2 pos = ImGui::GetCursorScreenPos(); + float width = ImGui::GetContentRegionAvailWidth(); + ImRect bb(pos + ImVec2(20, 0), pos + ImVec2(width, 13)); + auto window = ImGui::GetCurrentWindow(); + if (m_Selection == it->second) { + const ImU32 col = window->Color(ImGuiCol_HeaderActive); + window->DrawList->AddRectFilled(bb.Min, bb.Max, col); + } + ImGuiID id = window->GetID((std::string("#SelectButton") + std::to_string(it->second)).c_str()); + bool hovered = false; + bool held = false; + if (ImGui::ButtonBehavior(bb, id, &hovered, &held)) { + m_Selection = it->second; + } + if (held) { + ImVec2 entityDragDelta = ImGui::GetMouseDragDelta(0); + if (std::abs(entityDragDelta.x) > 0 && std::abs(entityDragDelta.y) > 0) { + if (draggingEntity == 0) { + draggingEntity = it->second; + LOG_DEBUG("Started drag of entity %i", draggingEntity); + } + ImGui::SetNextWindowPos(ImGui::GetIO().MousePos + ImVec2(20, 0)); + ImGui::Begin("Change parent", nullptr, ImVec2(0, 0), 0.3f, ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoSavedSettings); + ImGui::Text("#%i", draggingEntity); + ImGui::End(); + } + } + ImGui::SetNextTreeNodeOpened(true, ImGuiSetCond_Once); if (ImGui::TreeNode((std::string("#") + std::to_string(it->second)).c_str())) { - if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(0)) { - m_Selection = it->second; + if (draggingEntity != 0 && ImGui::IsItemHoveredRect() && ImGui::IsMouseReleased(0)) { + LOG_DEBUG("Changed parent of %i to %i", draggingEntity, it->second); + changeParent(draggingEntity, it->second); + draggingEntity = 0; } - ImGui::SameLine(); - if (ImGui::Button("Add")) { - EntityID entity = world->CreateEntity(it->second); - world->AttachComponent(entity, "Transform"); - } - ImGui::SameLine(); - if (ImGui::Button("Delete")) { - world->DeleteEntity(it->second); + + if (ImGui::BeginPopupContextItem("item context menu")) { + if (ImGui::Button("Add")) { + EntityID entity = world->CreateEntity(it->second); + world->AttachComponent(entity, "Transform"); + } + ImGui::SameLine(); + if (ImGui::Button("Delete")) { + world->DeleteEntity(it->second); + ImGui::CloseCurrentPopup(); + if (m_Selection == it->second) { + m_Selection = 0; + } + } + ImGui::EndPopup(); } recurse(it->second); ImGui::TreePop(); @@ -459,3 +498,20 @@ bool EditorSystem::createDeleteButton(std::string componentType) window->DrawList->AddCircleFilled(bb.GetCenter(), 7.f, col, 16); return pressed; } + +void EditorSystem::changeParent(EntityID entity, EntityID newParent) +{ + if (entity == newParent) { + return; + } + + // An entity can't be a child to one of its own children + auto children = m_World->GetEntityChildren().equal_range(entity); + for (auto it = children.first; it != children.second; it++) { + if (it->second == newParent) { + return; + } + } + + m_World->SetParent(entity, newParent); +} From dbbbb7b4e7518a4e56955986e33a3a78c65b5abb Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Wed, 16 Dec 2015 17:20:56 +0100 Subject: [PATCH 46/56] Working rotations and translations relative to global and local space for children --- deps | 2 +- resources/Schema/Components/Transform.xml | 2 +- resources/Schema/Entities/EditorTestWorld.xml | 23 +++++++++++- src/Engine/Core/EntityXMLFile.cpp | 4 +- src/Engine/Editor/EditorSystem.cpp | 37 +++++++++++++------ 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/deps b/deps index f20b9cc1..e6399158 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit f20b9cc13bffa39c3b5144bacc5eacd34d43052c +Subproject commit e63991581a268f3eb85f86782d0bdf3687695795 diff --git a/resources/Schema/Components/Transform.xml b/resources/Schema/Components/Transform.xml index 276b89e7..00202aa4 100644 --- a/resources/Schema/Components/Transform.xml +++ b/resources/Schema/Components/Transform.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/resources/Schema/Entities/EditorTestWorld.xml b/resources/Schema/Entities/EditorTestWorld.xml index 6e1c0be5..7fa8e96a 100755 --- a/resources/Schema/Entities/EditorTestWorld.xml +++ b/resources/Schema/Entities/EditorTestWorld.xml @@ -2,7 +2,10 @@ - + + + + @@ -19,12 +22,28 @@ - + + An error + + + + + + + + + An error + + + + + + \ No newline at end of file diff --git a/src/Engine/Core/EntityXMLFile.cpp b/src/Engine/Core/EntityXMLFile.cpp index bf8daceb..c6e00a1b 100644 --- a/src/Engine/Core/EntityXMLFile.cpp +++ b/src/Engine/Core/EntityXMLFile.cpp @@ -431,12 +431,12 @@ float EntityXMLFile::getFloatAttribute(const xercesc::DOMElement* element, const { using namespace xercesc; XSValue::Status status; - XSValue* val = XSValue::getActualValue(element->getAttribute(XSTR(attribute)), xercesc::XSValue::DataType::dt_float, status); + XSValue* val = XSValue::getActualValue(element->getAttribute(XSTR(attribute)), xercesc::XSValue::DataType::dt_double, status); if (val == nullptr) { LOG_ERROR("Element \"%s\" doesn't have an \"%s\" attribute!", XSTR(element->getTagName()), attribute); return 0.f; } else { - return val->fData.fValue.f_float; + return static_cast(val->fData.fValue.f_double); } } diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index e224ca6b..d27a463b 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -111,26 +111,37 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e) auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); if (m_WidgetMode == WidgetMode::Translate) { if (m_WidgetSpace == WidgetSpace::Global) { - (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Position"] += movement; + EntityID parent = m_World->GetParent(m_Selection); + glm::quat inverseParentOrientation; + if (parent != 0) { + inverseParentOrientation = glm::inverse(RenderQueueFactory::AbsoluteOrientation(m_World, parent)); + } + (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Position"] += inverseParentOrientation * movement; } else if (m_WidgetSpace == WidgetSpace::Local) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); - (glm::vec3&)selectionTransform["Position"] += glm::quat((glm::vec3&)selectionTransform["Orientation"]) * movement; + (glm::vec3&)selectionTransform["Position"] += glm::quat((glm::vec3)selectionTransform["Orientation"]) * movement; } } else if (m_WidgetMode == WidgetMode::Rotate) { glm::vec3 finalMovement; finalMovement.x = -deltaWorld.y * m_WidgetCurrentAxis.x; finalMovement.y = deltaWorld.x * m_WidgetCurrentAxis.y; finalMovement.z = deltaWorld.y * m_WidgetCurrentAxis.z; - glm::vec3& selectionOrientation = m_World->GetComponent(m_Selection, "Transform")["Orientation"]; if (m_WidgetSpace == WidgetSpace::Global) { - glm::quat currentOrientation = glm::quat(selectionOrientation); + EntityID parent = m_World->GetParent(m_Selection); + glm::quat parentOrientation; + if (parent != 0) { + parentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, parent); + } + glm::vec3& selectionOrientation = m_World->GetComponent(m_Selection, "Transform")["Orientation"]; + //glm::quat currentOrientation = RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection); + glm::quat currentOrientation = parentOrientation * glm::quat(selectionOrientation); glm::quat deltaOrientation(finalMovement); - selectionOrientation = glm::eulerAngles(deltaOrientation * currentOrientation); // (currentOrientation * deltaOrientation) * glm::vec3(0, 0, -1); + selectionOrientation = glm::eulerAngles(glm::inverse(parentOrientation) * (deltaOrientation * currentOrientation)); } else if (m_WidgetSpace == WidgetSpace::Local) { + glm::vec3& selectionOrientation = m_World->GetComponent(m_Selection, "Transform")["Orientation"]; glm::quat currentOrientation(selectionOrientation); glm::quat deltaOrientation(finalMovement); - selectionOrientation = glm::eulerAngles(currentOrientation * deltaOrientation); // (currentOrientation * deltaOrientation) * glm::vec3(0, 0, -1); - widgetTransform["Orientation"] = selectionOrientation; + selectionOrientation = glm::eulerAngles(currentOrientation * deltaOrientation); } } else if (m_WidgetMode == WidgetMode::Scale) { glm::vec3& scaleX = m_World->GetComponent(m_WidgetX, "Transform")["Scale"]; @@ -189,6 +200,7 @@ bool EditorSystem::OnPicking(const Events::Picking& e) //widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; } else { m_Selection = entity; + setWidgetMode(m_WidgetMode); } } else { m_Selection = 0; @@ -222,8 +234,11 @@ void EditorSystem::updateWidget() if (m_Selection != 0) { auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); - auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); - widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; + glm::vec3 selectionPosition = RenderQueueFactory::AbsolutePosition(m_World, m_Selection); + widgetTransform["Position"] = selectionPosition; + if (m_WidgetSpace == WidgetSpace::Local) { + widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection)); + } } } @@ -248,7 +263,7 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) if (m_Selection != 0) { if (m_WidgetSpace == WidgetSpace::Local) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); - widgetTransform["Orientation"] = (glm::vec3)selectionTransform["Orientation"]; + widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection)); } } } else if (newMode == WidgetMode::Scale) { @@ -269,7 +284,7 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) if (m_Selection != 0) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); if (m_WidgetSpace == WidgetSpace::Local) { - widgetTransform["Orientation"] = (glm::vec3)selectionTransform["Orientation"]; + widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection)); } } } From a914a7f924ffa0815e7f405dce6a5d7a8f5d790f Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Wed, 16 Dec 2015 17:22:35 +0100 Subject: [PATCH 47/56] Switched to deps/master branch --- deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps b/deps index e6399158..1ae6ba5b 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit e63991581a268f3eb85f86782d0bdf3687695795 +Subproject commit 1ae6ba5b1297ed71b560aee211b9f0007ba52547 From d4f5856304764696770c8598d5155c01eb072ec7 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 10:44:34 +0100 Subject: [PATCH 48/56] Component attributes no longer get set on the wrong entity when switching selection while editing a field --- src/Engine/Editor/EditorSystem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index d27a463b..2463aec6 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -199,6 +199,7 @@ bool EditorSystem::OnPicking(const Events::Picking& e) //auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); //widgetTransform["Position"] = (glm::vec3)selectionTransform["Position"]; } else { + ImGui::SetActiveID(0, nullptr); m_Selection = entity; setWidgetMode(m_WidgetMode); } From b87f5592916614a380efe56f11a7db9b710c3d12 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 10:46:49 +0100 Subject: [PATCH 49/56] Updated default configs with editor stuff --- resources/DefaultConfig.ini | 1 + resources/DefaultInput.ini | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/resources/DefaultConfig.ini b/resources/DefaultConfig.ini index 0d95de03..208f413c 100644 --- a/resources/DefaultConfig.ini +++ b/resources/DefaultConfig.ini @@ -1,6 +1,7 @@ [Debug] LogLevel=1 LoadMap= +EditorEnabled=false [Video] Fullscreen=false diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini index 3be67287..b0b9e3d0 100644 --- a/resources/DefaultInput.ini +++ b/resources/DefaultInput.ini @@ -14,3 +14,8 @@ R=Reload Space=Jump LeftControl=Crouch LeftShift=Sprint +F1=ToggleEditor +1=EditorToolMove +2=EditorToolRotate +3=EditorToolScale +X=EditorToggleTransformSpace \ No newline at end of file From c8460e0a6c6bad967cfe2c0cdf3ce8cc56c75385 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 10:55:54 +0100 Subject: [PATCH 50/56] It's no use --- src/Engine/Rendering/Renderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index 06810412..21ff6c5a 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -135,7 +135,7 @@ void Renderer::Update(double dt) void Renderer::Draw(RenderQueueCollection& rq) { m_PickingPass->Draw(rq); - DrawScreenQuad(m_PickingPass->PickingTexture()); + //DrawScreenQuad(m_PickingPass->PickingTexture()); //CullLights(); glClearColor(255.f / 255, 163.f / 255, 176.f / 255, 1.f); From 800065400541c4650dfbd0719d555d69f5bb2008 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 15:28:05 +0100 Subject: [PATCH 51/56] Model loading now fetches material opacity value properly --- src/Engine/Rendering/RawModel.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Engine/Rendering/RawModel.cpp b/src/Engine/Rendering/RawModel.cpp index 5aec7f22..95a75a15 100644 --- a/src/Engine/Rendering/RawModel.cpp +++ b/src/Engine/Rendering/RawModel.cpp @@ -76,13 +76,15 @@ RawModel::RawModel(std::string fileName) } // Material diffuse color - aiColor4D diffuse; + aiColor3D diffuse; material->Get(AI_MATKEY_COLOR_DIFFUSE, diffuse); - desc.DiffuseVertexColor = glm::vec4(diffuse.r, diffuse.g, diffuse.b, diffuse.a); + float opacity; + material->Get(AI_MATKEY_OPACITY, opacity); + desc.DiffuseVertexColor = glm::vec4(diffuse.r, diffuse.g, diffuse.b, opacity); // Material specular color - aiColor4D specular; + aiColor3D specular; material->Get(AI_MATKEY_COLOR_SPECULAR, specular); - desc.SpecularVertexColor = glm::vec4(specular.r, specular.g, specular.b, specular.a); + desc.SpecularVertexColor = glm::vec4(specular.r, specular.g, specular.b, 1.f); m_Vertices.push_back(desc); } From c1b9404e524138c47edf83b2965221b44642bc66 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 13:26:12 +0100 Subject: [PATCH 52/56] Created a FileDropped event for when a file is dropped onto the client by the OS --- include/Engine/Core/EFileDropped.h | 16 ++++++++++++++++ include/Engine/Core/InputManager.h | 3 +++ src/Engine/Core/InputManager.cpp | 18 ++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 include/Engine/Core/EFileDropped.h diff --git a/include/Engine/Core/EFileDropped.h b/include/Engine/Core/EFileDropped.h new file mode 100644 index 00000000..1ad22a2f --- /dev/null +++ b/include/Engine/Core/EFileDropped.h @@ -0,0 +1,16 @@ +#ifndef EFileDropped_h__ +#define EFileDropped_h__ + +#include "EventBroker.h" + +namespace Events +{ + +struct FileDropped : Event +{ + std::string Path; +}; + +} + +#endif \ No newline at end of file diff --git a/include/Engine/Core/InputManager.h b/include/Engine/Core/InputManager.h index 0d53169e..3b035dbe 100644 --- a/include/Engine/Core/InputManager.h +++ b/include/Engine/Core/InputManager.h @@ -16,6 +16,7 @@ #include "ELockMouse.h" #include "EGamepadAxis.h" #include "EGamepadButton.h" +#include "EFileDropped.h" class InputManager { @@ -71,6 +72,8 @@ private: static void GLFWCharCallback(GLFWwindow* window, unsigned int c); static std::vector> GLFWScrollCallbackQueue; static void GLFWScrollCallback(GLFWwindow* window, double xoffset, double yoffset); + static std::vector GLFWDropCallbackQueue; + static void GLFWDropCallback(GLFWwindow* window, int count, const char* paths[]); }; #endif diff --git a/src/Engine/Core/InputManager.cpp b/src/Engine/Core/InputManager.cpp index cb901cb8..50dcac7c 100644 --- a/src/Engine/Core/InputManager.cpp +++ b/src/Engine/Core/InputManager.cpp @@ -2,6 +2,7 @@ std::vector InputManager::GLFWCharCallbackQueue; std::vector> InputManager::GLFWScrollCallbackQueue; +std::vector InputManager::GLFWDropCallbackQueue; void InputManager::Initialize() { @@ -10,6 +11,7 @@ void InputManager::Initialize() //m_LastGamepadButtonState = std::array(); glfwSetCharCallback(m_GLFWWindow, &InputManager::GLFWCharCallback); glfwSetScrollCallback(m_GLFWWindow, &InputManager::GLFWScrollCallback); + glfwSetDropCallback(m_GLFWWindow, &InputManager::GLFWDropCallback); EVENT_SUBSCRIBE_MEMBER(m_ELockMouse, &InputManager::OnLockMouse); EVENT_SUBSCRIBE_MEMBER(m_EUnlockMouse, &InputManager::OnUnlockMouse); @@ -95,6 +97,14 @@ void InputManager::Update(double dt) } GLFWScrollCallbackQueue.clear(); + // File drop + for (auto& path : GLFWDropCallbackQueue) { + Events::FileDropped e; + e.Path = path; + m_EventBroker->Publish(e); + } + GLFWDropCallbackQueue.clear(); + // // Lock mouse while holding LMB // if (m_CurrentMouseState[GLFW_MOUSE_BUTTON_LEFT]) // { @@ -229,6 +239,14 @@ void InputManager::GLFWScrollCallback(GLFWwindow* window, double xoffset, double GLFWScrollCallbackQueue.push_back(std::make_pair(xoffset, yoffset)); } + +void InputManager::GLFWDropCallback(GLFWwindow* window, int count, const char* paths[]) +{ + for (int i = 0; i < count; i++) { + GLFWDropCallbackQueue.push_back(std::string(paths[i])); + } +} + bool InputManager::OnLockMouse(const Events::LockMouse &event) { m_MouseLocked = true; From cf6dde6c092955e135111486304716d22f9619d9 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 13:26:55 +0100 Subject: [PATCH 53/56] Boost dependency updated to version 1.60! --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b04f8ed..7c5f2268 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,4 @@ Libraries that are too big to be bundled with the project. | Project | Version | License | Root folder environment variable (Windows) | | ---------------------------------------------------------- | ----------- | --------------------------------------------------------------------------- | ------------------------------------------ | -| **[Boost](http://www.boost.org)** | 1.59.0+ | [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt) | BOOST_ROOT | +| **[Boost](http://www.boost.org)** | 1.60.0+ | [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt) | BOOST_ROOT | From a655f0bae5f428361f41ca5c8e4da689c537baba Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 13:28:31 +0100 Subject: [PATCH 54/56] Drag-and-drop asset picking and base work for showing component field tooltips in the editor --- assets | 2 +- include/Engine/Editor/EditorSystem.h | 5 ++++ src/Engine/Editor/EditorSystem.cpp | 42 +++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/assets b/assets index c5f67434..673d4a4e 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit c5f674349a915ab1a2b4da632d87a9832d1f6fab +Subproject commit 673d4a4e4c5a3f5bc9fedf82234e8f8751f63a44 diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index 021a14ca..6709775d 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -1,5 +1,6 @@ #include #include +#include #include "../Core/System.h" #include "../Core/EMousePress.h" #include "../Core/EMouseRelease.h" @@ -8,6 +9,7 @@ #include "../Input/EInputCommand.h" #include "../Rendering/IRenderer.h" #include "../Rendering/EPicking.h" +#include "../Core/EFileDropped.h" #include "../Rendering/RenderQueueFactory.h" class EditorSystem : public ImpureSystem @@ -50,6 +52,7 @@ private: EntityID m_Selection = 0; EntityID m_LastSelection = 0; glm::vec3 m_Position; + std::string m_LastDroppedFile; EventRelay m_EInputCommand; bool OnInputCommand(const Events::InputCommand& e); @@ -61,6 +64,8 @@ private: bool OnMouseMove(const Events::MouseMove& e); EventRelay m_EPicking; bool OnPicking(const Events::Picking& e); + EventRelay m_EFileDropped; + bool OnFileDropped(const Events::FileDropped& e); void updateWidget(); void setWidgetMode(WidgetMode newMode); diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index 2463aec6..32f5b162 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -19,6 +19,7 @@ EditorSystem::EditorSystem(EventBroker* eventBroker, IRenderer* renderer) EVENT_SUBSCRIBE_MEMBER(m_EMouseRelease, &EditorSystem::OnMouseRelease); EVENT_SUBSCRIBE_MEMBER(m_EMouseMove, &EditorSystem::OnMouseMove); EVENT_SUBSCRIBE_MEMBER(m_EPicking, &EditorSystem::OnPicking); + EVENT_SUBSCRIBE_MEMBER(m_EFileDropped, &EditorSystem::OnFileDropped); } void EditorSystem::Update(World* world, double dt) @@ -36,6 +37,11 @@ void EditorSystem::Update(World* world, double dt) updateWidget(); drawUI(world, dt); + + // Clear drop queue if it wasn't handled by any UI element + if (!m_LastDroppedFile.empty()) { + m_LastDroppedFile = ""; + } } bool EditorSystem::OnInputCommand(const Events::InputCommand& e) @@ -212,6 +218,12 @@ bool EditorSystem::OnPicking(const Events::Picking& e) return true; }; +bool EditorSystem::OnFileDropped(const Events::FileDropped& e) +{ + m_LastDroppedFile = boost::filesystem::path(e.Path).lexically_relative(boost::filesystem::current_path()).string(); + std::replace(m_LastDroppedFile.begin(), m_LastDroppedFile.end(), '\\', '/'); + return true; +} void EditorSystem::updateWidget() { @@ -389,37 +401,53 @@ void EditorSystem::drawUI(World* world, double dt) const std::string& field = pair.first; const std::string& type = pair.second; + ImGui::PushID(field.c_str()); if (type == "Vector") { auto& val = component.Property(field); if (field == "Scale") { - ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits::max()); + ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, 0.f, std::numeric_limits::max()); } else if (field == "Orientation") { glm::vec3 tempVal = glm::fmod(val, glm::vec3(glm::two_pi())); - if (ImGui::SliderFloat3(field.c_str(), glm::value_ptr(tempVal), 0.f, glm::two_pi())) { + if (ImGui::SliderFloat3("", glm::value_ptr(tempVal), 0.f, glm::two_pi())) { val = tempVal; } } else { - ImGui::DragFloat3(field.c_str(), glm::value_ptr(val), 0.1f, std::numeric_limits::lowest(), std::numeric_limits::max()); + ImGui::DragFloat3("", glm::value_ptr(val), 0.1f, std::numeric_limits::lowest(), std::numeric_limits::max()); } } else if (type == "Color") { auto& val = component.Property(field); - ImGui::ColorEdit4(field.c_str(), glm::value_ptr(val), true); + ImGui::ColorEdit4("", glm::value_ptr(val), true); } else if (type == "string") { std::string& val = component.Property(field); char tempString[1024]; memcpy(tempString, val.c_str(), std::min(val.length() + 1, sizeof(tempString))); - if (ImGui::InputText(field.c_str(), tempString, sizeof(tempString))) { + if (ImGui::InputText("", tempString, sizeof(tempString))) { val = std::string(tempString); LOG_DEBUG("%s::%s changed!", componentType.c_str(), field.c_str()); } + // DROP STUFF + if (ImGui::IsItemHovered() && !m_LastDroppedFile.empty()) { + val = m_LastDroppedFile; + m_LastDroppedFile = ""; + } + } else if (type == "double") { float tempVal = static_cast(component.Property(field)); - if (ImGui::InputFloat(field.c_str(), &tempVal, 0.01f, 1.f)) { + if (ImGui::InputFloat("", &tempVal, 0.01f, 1.f)) { component.SetProperty(field, static_cast(tempVal)); } } else if (type == "bool") { auto& val = component.Property(field); - ImGui::Checkbox(field.c_str(), &val); + ImGui::Checkbox("", &val); + } else { + ImGui::TextDisabled(type.c_str()); + } + ImGui::PopID(); + + ImGui::SameLine(); + ImGui::Text(field.c_str()); + if (ImGui::IsItemHovered()) { + ImGui::SetTooltip("field annotation goes here"); } } } From 00f6056f7c28631d1fdab1166e1d3850909464b6 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 14:16:08 +0100 Subject: [PATCH 55/56] Uniform scaling when dragging scaling widget origin --- src/Engine/Editor/EditorSystem.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index 32f5b162..ed615a50 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -153,6 +153,13 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e) glm::vec3& scaleX = m_World->GetComponent(m_WidgetX, "Transform")["Scale"]; glm::vec3& scaleY = m_World->GetComponent(m_WidgetY, "Transform")["Scale"]; glm::vec3& scaleZ = m_World->GetComponent(m_WidgetZ, "Transform")["Scale"]; + + if (m_WidgetCurrentAxis.x > 0 && m_WidgetCurrentAxis.y > 0 && m_WidgetCurrentAxis.z > 0) { + float movementLength = glm::length(movement); + float dot = glm::dot((glm::vec3)widgetOrientation, movement); + movement = glm::vec3(movementLength) * glm::sign(dot); + (glm::vec3&)m_World->GetComponent(m_WidgetOrigin, "Transform")["Scale"] += movement; + } if (m_WidgetCurrentAxis.x > 0) { scaleX.x += movement.x; } @@ -162,14 +169,19 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e) if (m_WidgetCurrentAxis.z > 0) { scaleZ.z += movement.z; } - if (m_WidgetCurrentAxis.x > 0 && m_WidgetCurrentAxis.y > 0 && m_WidgetCurrentAxis.z > 0) { - float max = glm::max(scaleX.x, glm::max(scaleY.y, scaleZ.z)); - (glm::vec3&)m_World->GetComponent(m_WidgetOrigin, "Transform")["Scale"] = glm::vec3(max); - } (glm::vec3&)m_World->GetComponent(m_Selection, "Transform")["Scale"] += movement; } } + + /*LOG_DEBUG("DELTA %f", e.DeltaX); + if (e.X < 0) { + glfwSetCursorPos(m_Renderer->Window(), width - 1, e.Y); + } + if (e.X >= width) { + glfwSetCursorPos(m_Renderer->Window(), 0, e.Y); + }*/ + return true; } @@ -287,7 +299,7 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) m_World->GetComponent(m_WidgetOrigin, "Model")["Resource"] = "Models/ScaleWidgetOrigin.obj"; if (m_Selection != 0) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); - widgetTransform["Orientation"] = (glm::vec3)selectionTransform["Orientation"]; + widgetTransform["Orientation"] = glm::eulerAngles(RenderQueueFactory::AbsoluteOrientation(m_World, m_Selection)); } } else if (newMode == WidgetMode::Rotate) { m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/RotationWidgetX.obj"; From e9128efd136b928d6c20f17a04bfbdb77437d0f2 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Thu, 17 Dec 2015 14:26:20 +0100 Subject: [PATCH 56/56] Translation widget planes --- include/Engine/Editor/EditorSystem.h | 3 +++ src/Engine/Editor/EditorSystem.cpp | 33 +++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/include/Engine/Editor/EditorSystem.h b/include/Engine/Editor/EditorSystem.h index 6709775d..779b7f97 100644 --- a/include/Engine/Editor/EditorSystem.h +++ b/include/Engine/Editor/EditorSystem.h @@ -43,8 +43,11 @@ private: EntityID m_Widget = 0; EntityID m_WidgetX = 0; + EntityID m_WidgetPlaneX = 0; EntityID m_WidgetY = 0; + EntityID m_WidgetPlaneY = 0; EntityID m_WidgetZ = 0; + EntityID m_WidgetPlaneZ = 0; EntityID m_WidgetOrigin = 0; glm::vec3 m_WidgetCurrentAxis; float m_WidgetPickingDepth = 0.f; diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp index ed615a50..a43ca900 100644 --- a/src/Engine/Editor/EditorSystem.cpp +++ b/src/Engine/Editor/EditorSystem.cpp @@ -85,6 +85,9 @@ bool EditorSystem::OnMouseMove(const Events::MouseMove& e) return false; } + if (m_Selection == 0) { + return false; + } auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); glm::vec3 widgetOrientation = widgetTransform["Orientation"]; @@ -207,9 +210,9 @@ bool EditorSystem::OnPicking(const Events::Picking& e) EntityID parent = m_World->GetParent(entity); if (parent == m_Widget) { m_WidgetCurrentAxis = glm::vec3( - (entity == m_WidgetX) || (entity == m_WidgetOrigin), - (entity == m_WidgetY) || (entity == m_WidgetOrigin), - (entity == m_WidgetZ) || (entity == m_WidgetOrigin) + (entity == m_WidgetX) || (entity == m_WidgetOrigin) || (entity == m_WidgetPlaneY || entity == m_WidgetPlaneZ), + (entity == m_WidgetY) || (entity == m_WidgetOrigin) || (entity == m_WidgetPlaneX || entity == m_WidgetPlaneZ), + (entity == m_WidgetZ) || (entity == m_WidgetOrigin) || (entity == m_WidgetPlaneX || entity == m_WidgetPlaneY) ); m_WidgetPickingDepth = result.Depth; @@ -245,12 +248,24 @@ void EditorSystem::updateWidget() m_WidgetX = m_World->CreateEntity(m_Widget); m_World->AttachComponent(m_WidgetX, "Transform"); m_World->AttachComponent(m_WidgetX, "Model"); + m_WidgetPlaneX = m_World->CreateEntity(m_Widget); + m_World->AttachComponent(m_WidgetPlaneX, "Transform"); + m_World->AttachComponent(m_WidgetPlaneX, "Model"); + m_World->GetComponent(m_WidgetPlaneX, "Model")["Resource"] = "Models/WidgetPlaneX.obj"; m_WidgetY = m_World->CreateEntity(m_Widget); m_World->AttachComponent(m_WidgetY, "Transform"); m_World->AttachComponent(m_WidgetY, "Model"); + m_WidgetPlaneY = m_World->CreateEntity(m_Widget); + m_World->AttachComponent(m_WidgetPlaneY, "Transform"); + m_World->AttachComponent(m_WidgetPlaneY, "Model"); + m_World->GetComponent(m_WidgetPlaneY, "Model")["Resource"] = "Models/WidgetPlaneY.obj"; m_WidgetZ = m_World->CreateEntity(m_Widget); m_World->AttachComponent(m_WidgetZ, "Transform"); m_World->AttachComponent(m_WidgetZ, "Model"); + m_WidgetPlaneZ = m_World->CreateEntity(m_Widget); + m_World->AttachComponent(m_WidgetPlaneZ, "Transform"); + m_World->AttachComponent(m_WidgetPlaneZ, "Model"); + m_World->GetComponent(m_WidgetPlaneZ, "Model")["Resource"] = "Models/WidgetPlaneZ.obj"; m_WidgetOrigin = m_World->CreateEntity(m_Widget); m_World->AttachComponent(m_WidgetOrigin, "Transform"); m_World->AttachComponent(m_WidgetOrigin, "Model"); @@ -276,15 +291,24 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) auto widgetTransform = m_World->GetComponent(m_Widget, "Transform"); widgetTransform["Orientation"] = glm::vec3(0.f); m_World->GetComponent(m_WidgetX, "Transform")["Scale"] = glm::vec3(1.f); + m_World->GetComponent(m_WidgetPlaneX, "Model")["Visible"] = false; m_World->GetComponent(m_WidgetY, "Transform")["Scale"] = glm::vec3(1.f); + m_World->GetComponent(m_WidgetPlaneY, "Model")["Visible"] = false; m_World->GetComponent(m_WidgetZ, "Transform")["Scale"] = glm::vec3(1.f); + m_World->GetComponent(m_WidgetPlaneZ, "Model")["Visible"] = false; m_World->GetComponent(m_WidgetOrigin, "Transform")["Scale"] = glm::vec3(1.f); + m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = false; if (newMode == WidgetMode::Translate) { m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/TranslationWidgetX.obj"; m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/TranslationWidgetY.obj"; m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/TranslationWidgetZ.obj"; - m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = false; + // Temporarily disabled for local space until I can figure out what's wrong with the math + if (m_WidgetSpace != WidgetSpace::Local) { + m_World->GetComponent(m_WidgetPlaneX, "Model")["Visible"] = true; + m_World->GetComponent(m_WidgetPlaneY, "Model")["Visible"] = true; + m_World->GetComponent(m_WidgetPlaneZ, "Model")["Visible"] = true; + } if (m_Selection != 0) { if (m_WidgetSpace == WidgetSpace::Local) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); @@ -305,7 +329,6 @@ void EditorSystem::setWidgetMode(WidgetMode newMode) m_World->GetComponent(m_WidgetX, "Model")["Resource"] = "Models/RotationWidgetX.obj"; m_World->GetComponent(m_WidgetY, "Model")["Resource"] = "Models/RotationWidgetY.obj"; m_World->GetComponent(m_WidgetZ, "Model")["Resource"] = "Models/RotationWidgetZ.obj"; - m_World->GetComponent(m_WidgetOrigin, "Model")["Visible"] = false; if (m_Selection != 0) { auto selectionTransform = m_World->GetComponent(m_Selection, "Transform"); if (m_WidgetSpace == WidgetSpace::Local) {