From 653b4689b550c6bb2720e59c27b0f5ba11663f6e Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Sat, 12 Dec 2015 18:07:53 +0100 Subject: [PATCH 01/30] 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 02/30] 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 03/30] 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 04/30] 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 05/30] 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 06/30] 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 07/30] 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 08/30] 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 09/30] 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 10/30] 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 11/30] 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 12/30] 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 13/30] 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 14/30] 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 15/30] 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 16/30] 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 17/30] 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 18/30] 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 19/30] 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 20/30] 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 21/30] 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 22/30] 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 23/30] 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 24/30] 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 25/30] 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 26/30] 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 27/30] 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 28/30] 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 29/30] 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 30/30] 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); } } }