refactor: document windows handling + scene tree features

CMakeLists.txt

@@ -5,6 +5,7 @@ project(client CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(NEXO_COVERAGE OFF CACHE BOOL "Enable coverage for binaries")
 set(NEXO_GIT_SUBMODULE OFF CACHE BOOL "Enable git submodules init and update")

common/Logger.hpp

@@ -40,21 +40,23 @@ namespace nexo {
 
     enum class LogLevel {
         FATAL,
-        ERROR,
+        ERR,
         WARN,
         INFO,
         DEBUG,
-        DEV
+        DEV,
+        USER
     };
 
     inline std::string toString(const LogLevel level)
     {
         switch (level)
         {
             case LogLevel::FATAL: return "FATAL";
-            case LogLevel::ERROR: return "ERROR";
+            case LogLevel::ERR: return "ERROR";
             case LogLevel::WARN: return "WARN";
             case LogLevel::INFO: return "INFO";
+            case LogLevel::USER: return "USER";
             case LogLevel::DEBUG: return "DEBUG";
             case LogLevel::DEV: return "DEV";
         }
@@ -71,7 +73,7 @@ namespace nexo {
 
     inline void defaultCallback(const LogLevel level, const std::string &message)
     {
-        if (level == LogLevel::FATAL || level == LogLevel::ERROR)
+        if (level == LogLevel::FATAL || level == LogLevel::ERR)
             std::cerr << "[" << toString(level) << "] " << message << std::endl;
         else
             std::cout << "[" << toString(level) << "] " << message << std::endl;
@@ -258,7 +260,7 @@ namespace nexo {
         NEXO_LOG_ONCE_KEY(fmt, ##__VA_ARGS__), ##__VA_ARGS__)
 
 #define NEXO_FATAL nexo::LogLevel::FATAL
-#define NEXO_ERROR nexo::LogLevel::ERROR
+#define NEXO_ERROR nexo::LogLevel::ERR
 #define NEXO_WARN nexo::LogLevel::WARN
 #define NEXO_INFO nexo::LogLevel::INFO
 #define NEXO_DEBUG nexo::LogLevel::DEBUG

common/math/Projection.cpp

@@ -0,0 +1,39 @@
+//// Projection.cpp ///////////////////////////////////////////////////////////////
+//
+//  zzzzz       zzz  zzzzzzzzzzzzz    zzzz      zzzz       zzzzzz  zzzzz
+//  zzzzzzz     zzz  zzzz                    zzzz       zzzz           zzzz
+//  zzz   zzz   zzz  zzzzzzzzzzzzz         zzzz        zzzz             zzz
+//  zzz    zzz  zzz  z                  zzzz  zzzz      zzzz           zzzz
+//  zzz         zzz  zzzzzzzzzzzzz    zzzz       zzz      zzzzzzz  zzzzz
+//
+//  Author:      Mehdy MORVAN
+//  Date:        20/04/2025
+//  Description: Source file for the math projection utils
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Projection.hpp"
+
+namespace nexo::math {
+
+    const glm::vec3 projectRayToWorld(float x, float y,
+                                    const glm::mat4 &viewProjectionMatrix,
+                                    const glm::vec3 &cameraPosition,
+                                    unsigned int width, unsigned int height
+    ) {
+        // Convert to NDC
+        float ndcX = (2.0f * x) / width - 1.0f;
+        float ndcY = 1.0f - (2.0f * y) / height;
+
+        glm::mat4 inverseViewProj = glm::inverse(viewProjectionMatrix);
+
+        // Points in NDC space at near and far planes
+        glm::vec4 nearPoint = inverseViewProj * glm::vec4(ndcX, ndcY, -1.0f, 1.0f);
+
+        nearPoint /= nearPoint.w;
+
+        glm::vec3 rayDir = glm::normalize(glm::vec3(nearPoint) - cameraPosition);
+
+        return rayDir;
+    }
+}

common/math/Projection.hpp

@@ -0,0 +1,24 @@
+//// Projection.hpp ///////////////////////////////////////////////////////////////
+//
+//  zzzzz       zzz  zzzzzzzzzzzzz    zzzz      zzzz       zzzzzz  zzzzz
+//  zzzzzzz     zzz  zzzz                    zzzz       zzzz           zzzz
+//  zzz   zzz   zzz  zzzzzzzzzzzzz         zzzz        zzzz             zzz
+//  zzz    zzz  zzz  z                  zzzz  zzzz      zzzz           zzzz
+//  zzz         zzz  zzzzzzzzzzzzz    zzzz       zzz      zzzzzzz  zzzzz
+//
+//  Author:      Mehdy MORVAN
+//  Date:        20/04/2025
+//  Description: Header file for the math projection utils
+//
+///////////////////////////////////////////////////////////////////////////////
+#pragma once
+
+#include <glm/glm.hpp>
+
+namespace nexo::math {
+    const glm::vec3 projectRayToWorld(float x, float y,
+                                    const glm::mat4 &viewProjectionMatrix,
+                                    const glm::vec3 &cameraPosition,
+                                    unsigned int width, unsigned int height
+    );
+}

common/math/Vector.cpp

@@ -46,4 +46,9 @@ namespace nexo::math {
 
         return glm::degrees(euler);
    	}
+
+    bool isPosInBounds(const glm::vec2 pos, const glm::vec2 &min, const glm::vec2 &max)
+    {
+        return pos.x >= min.x && pos.x <= max.x && pos.y >= min.y && pos.y <= max.y;
+    }
 }

common/math/Vector.hpp

@@ -44,4 +44,6 @@ namespace nexo::math {
 	*       when sinp approaches ±1.
 	*/
 	glm::vec3 customQuatToEuler(const glm::quat &q);
+
+	bool isPosInBounds(const glm::vec2 pos, const glm::vec2 &min, const glm::vec2 &max);
 }

editor/CMakeLists.txt

@@ -15,21 +15,64 @@ set(SRCS
         editor/src/backends/ImGuiBackend.cpp
         editor/src/backends/opengl/openglImGuiBackend.cpp
         editor/src/context/Selector.cpp
-        editor/src/Components/Components.cpp
-        editor/src/Components/EntityPropertiesComponents.cpp
-        editor/src/Components/Widgets.cpp
+        editor/src/context/ActionManager.cpp
+        editor/src/context/ActionHistory.cpp
+        editor/src/context/ActionGroup.cpp
+        editor/src/context/actions/EntityActions.cpp
+        editor/src/ImNexo/EntityProperties.cpp
+        editor/src/ImNexo/Components.cpp
+        editor/src/ImNexo/Elements.cpp
+        editor/src/ImNexo/Panels.cpp
+        editor/src/ImNexo/Utils.cpp
+        editor/src/ImNexo/Widgets.cpp
         editor/src/utils/ScenePreview.cpp
         editor/src/utils/Config.cpp
         editor/src/utils/String.cpp
+        editor/src/utils/FileSystem.cpp
+        editor/src/utils/EditorProps.cpp
+        editor/src/inputs/Command.cpp
+        editor/src/inputs/InputManager.cpp
+        editor/src/inputs/WindowState.cpp
         editor/src/Editor.cpp
         editor/src/WindowRegistry.cpp
         editor/src/DockingRegistry.cpp
-        editor/src/DocumentWindows/ConsoleWindow.cpp
-        editor/src/DocumentWindows/EditorScene.cpp
-        editor/src/DocumentWindows/SceneTreeWindow.cpp
+        editor/src/ADocumentWindow.cpp
+        editor/src/DocumentWindows/EditorScene/Gizmo.cpp
+        editor/src/DocumentWindows/EditorScene/Init.cpp
+        editor/src/DocumentWindows/EditorScene/Shortcuts.cpp
+        editor/src/DocumentWindows/EditorScene/Show.cpp
+        editor/src/DocumentWindows/EditorScene/Shutdown.cpp
+        editor/src/DocumentWindows/EditorScene/Toolbar.cpp
+        editor/src/DocumentWindows/EditorScene/Update.cpp
+        editor/src/DocumentWindows/AssetManager/Init.cpp
+        editor/src/DocumentWindows/AssetManager/Show.cpp
+        editor/src/DocumentWindows/AssetManager/Shutdown.cpp
+        editor/src/DocumentWindows/AssetManager/Update.cpp
+        editor/src/DocumentWindows/ConsoleWindow/Init.cpp
+        editor/src/DocumentWindows/ConsoleWindow/Log.cpp
+        editor/src/DocumentWindows/ConsoleWindow/Show.cpp
+        editor/src/DocumentWindows/ConsoleWindow/Shutdown.cpp
+        editor/src/DocumentWindows/ConsoleWindow/Update.cpp
+        editor/src/DocumentWindows/ConsoleWindow/Utils.cpp
+        editor/src/DocumentWindows/InspectorWindow/Init.cpp
+        editor/src/DocumentWindows/InspectorWindow/Show.cpp
+        editor/src/DocumentWindows/InspectorWindow/Shutdown.cpp
+        editor/src/DocumentWindows/InspectorWindow/Update.cpp
+        editor/src/DocumentWindows/MaterialInspector/Init.cpp
+        editor/src/DocumentWindows/MaterialInspector/Show.cpp
+        editor/src/DocumentWindows/MaterialInspector/Shutdown.cpp
+        editor/src/DocumentWindows/MaterialInspector/Update.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Hovering.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Init.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/NodeHandling.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Rename.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/SceneCreation.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Selection.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Show.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Shutdown.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Update.cpp
+        editor/src/DocumentWindows/SceneTreeWindow/Shortcuts.cpp
         editor/src/DocumentWindows/PopupManager.cpp
-        editor/src/DocumentWindows/InspectorWindow.cpp
-        editor/src/DocumentWindows/MaterialInspector.cpp
         editor/src/DocumentWindows/EntityProperties/TransformProperty.cpp
         editor/src/DocumentWindows/EntityProperties/RenderProperty.cpp
         editor/src/DocumentWindows/EntityProperties/AmbientLightProperty.cpp
@@ -38,7 +81,7 @@ set(SRCS
         editor/src/DocumentWindows/EntityProperties/SpotLightProperty.cpp
         editor/src/DocumentWindows/EntityProperties/CameraProperty.cpp
         editor/src/DocumentWindows/EntityProperties/CameraController.cpp
-        editor/src/DocumentWindows/AssetManagerWindow.cpp
+        editor/src/DocumentWindows/EntityProperties/CameraTarget.cpp
 )
 
 # Windows App Icon

editor/main.cpp

@@ -13,12 +13,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "src/Editor.hpp"
-#include "src/DocumentWindows/ConsoleWindow.hpp"
-#include "src/DocumentWindows/EditorScene.hpp"
-#include "src/DocumentWindows/SceneTreeWindow.hpp"
-#include "src/DocumentWindows/InspectorWindow.hpp"
-#include "src/DocumentWindows/AssetManagerWindow.hpp"
-#include "src/DocumentWindows/MaterialInspector.hpp"
+#include "src/DocumentWindows/ConsoleWindow/ConsoleWindow.hpp"
+#include "src/DocumentWindows/EditorScene/EditorScene.hpp"
+#include "src/DocumentWindows/SceneTreeWindow/SceneTreeWindow.hpp"
+#include "src/DocumentWindows/InspectorWindow/InspectorWindow.hpp"
+#include "src/DocumentWindows/AssetManager/AssetManagerWindow.hpp"
+#include "src/DocumentWindows/MaterialInspector/MaterialInspector.hpp"
 
 #include <thread>
 #include <core/exceptions/Exceptions.hpp>
@@ -30,14 +30,14 @@ int main(int argc, char **argv)
         loguru::g_stderr_verbosity = loguru::Verbosity_3;
         nexo::editor::Editor &editor = nexo::editor::Editor::getInstance();
 
-        editor.registerWindow<nexo::editor::EditorScene>(NEXO_WND_USTRID_DEFAULT_SCENE);
+        editor.registerWindow<nexo::editor::EditorScene>("Default Scene" NEXO_WND_USTRID_DEFAULT_SCENE + std::to_string(0));
         editor.registerWindow<nexo::editor::SceneTreeWindow>(NEXO_WND_USTRID_SCENE_TREE);
         editor.registerWindow<nexo::editor::InspectorWindow>(NEXO_WND_USTRID_INSPECTOR);
         editor.registerWindow<nexo::editor::ConsoleWindow>(NEXO_WND_USTRID_CONSOLE);
         editor.registerWindow<nexo::editor::MaterialInspector>(NEXO_WND_USTRID_MATERIAL_INSPECTOR);
         editor.registerWindow<nexo::editor::AssetManagerWindow>(NEXO_WND_USTRID_ASSET_MANAGER);
 
-        if (auto defaultScene = editor.getWindow<nexo::editor::EditorScene>(NEXO_WND_USTRID_DEFAULT_SCENE).lock())
+        if (auto defaultScene = editor.getWindow<nexo::editor::EditorScene>("Default Scene" NEXO_WND_USTRID_DEFAULT_SCENE + std::to_string(0)).lock())
             defaultScene->setDefault();
 
         editor.init();

editor/src/ADocumentWindow.cpp

@@ -0,0 +1,83 @@
+//// ADocumentWindow.cpp ///////////////////////////////////////////////////////////////
+//
+//  zzzzz       zzz  zzzzzzzzzzzzz    zzzz      zzzz       zzzzzz  zzzzz
+//  zzzzzzz     zzz  zzzz                    zzzz       zzzz           zzzz
+//  zzz   zzz   zzz  zzzzzzzzzzzzz         zzzz        zzzz             zzz
+//  zzz    zzz  zzz  z                  zzzz  zzzz      zzzz           zzzz
+//  zzz         zzz  zzzzzzzzzzzzz    zzzz       zzz      zzzzzzz  zzzzz
+//
+//  Author:      Mehdy MORVAN
+//  Date:        29/04/2025
+//  Description: Source file for the abstract document window class
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "ADocumentWindow.hpp"
+
+namespace nexo::editor {
+
+    void ADocumentWindow::beginRender(const std::string &windowName)
+    {
+        dockingUpdate(windowName);
+        visibilityUpdate();
+        sizeUpdate();
+    }
+
+    void ADocumentWindow::dockingUpdate(const std::string &windowName)
+    {
+        if (ImGuiWindow* currentWindow = ImGui::GetCurrentWindow(); currentWindow)
+        {
+            const bool isDocked = currentWindow->DockIsActive;
+            const ImGuiID currentDockID = currentWindow->DockId;
+            auto dockId = m_windowRegistry.getDockId(windowName);
+
+            // If it's the first time opening the window and we have a dock id saved in the registry, then we force set it
+            if (m_firstOpened && ((dockId && currentDockID != *dockId)))
+                ImGui::DockBuilderDockWindow(windowName.c_str(), *dockId);
+            // If the docks ids differ, it means the window got rearranged in the global layout
+            // If we are docked but we dont have a dock id saved in the registry, it means the user moved the window
+            // In both cases, we update our docking registry with the new dock id
+            else if ((dockId && currentDockID != *dockId) || (isDocked && !dockId))
+                m_windowRegistry.setDockId(windowName, currentDockID);
+
+
+            // If it is not docked anymore, we have a floating window without docking node,
+            // So we erase it from the docking registry
+            if (!m_firstOpened && !isDocked)
+                m_windowRegistry.resetDockId(windowName);
+            m_firstOpened = false;
+        }
+    }
+
+    void ADocumentWindow::visibilityUpdate()
+    {
+        m_focused = ImGui::IsWindowFocused();
+        bool isDocked = ImGui::IsWindowDocked();
+        ImGuiWindow* window = ImGui::GetCurrentWindow();
+
+        if (isDocked) {
+            ImGuiID dock_id = ImGui::GetWindowDockID();
+            ImGuiDockNode* node = ImGui::DockBuilderGetNode(dock_id);
+
+            // If the window is currently being rendered with normal content,
+            // and not hidden or set to skip items, then it is visible
+            m_isVisibleInDock = !window->Hidden && !window->SkipItems && window->Active;
+        }
+        else {
+            // Not docked windows are visible if we've reached this point
+            m_isVisibleInDock = true;
+        }
+
+        m_hovered = ImGui::IsWindowHovered();
+    }
+
+    void ADocumentWindow::sizeUpdate()
+    {
+        ImGuiWindow* window = ImGui::GetCurrentWindow();
+        m_windowPos = window->Pos;
+        m_windowSize = window->Size;
+        m_contentSizeMin = ImGui::GetWindowContentRegionMin();
+        m_contentSizeMax = ImGui::GetWindowContentRegionMax();
+        m_contentSize = ImGui::GetContentRegionAvail();
+    }
+}