Merging dev to master

.gitignore

@@ -22,4 +22,5 @@ cmake_install.cmake
 Debug/
 Release/
 .vs/
-CMakeFiles/
+CMakeFiles/
+BuildProjects_Temporary/

CMakeLists.txt

@@ -12,16 +12,62 @@ project(FocalEngineEditor)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_CXX_FLAGS_DEBUG "/MP /ZI /W3 /Od /MDd /JMC /sdl /FC /D IMGUI_IMPL_OPENGL_LOADER_GLEW /D WIN32 /D _WINDOWS /D _DEBUG /D FE_DEBUG_ENABLED")
-set(CMAKE_CXX_FLAGS_RELEASE "/MP /W3 /O2 /Oi /Gy /sdl /FC /GL /OPT:REF /OPT:ICF /D IMGUI_IMPL_OPENGL_LOADER_GLEW /D NDEBUG /D WIN32 /D _WINDOWS")
+# Set compiler flags based on USE_STATIC_RUNTIME
+if(MSVC)
+    # Disable C4251 warning
+    add_compile_options(/wd4251)
+
+    if(USE_STATIC_RUNTIME)
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+		set(VISUAL_NODE_SYSTEM_USE_STATIC_RUNTIME ON CACHE BOOL "Use static runtime (/MT) instead of dynamic (/MD) for VisualNodeSystem" FORCE)
+    else()
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+		set(VISUAL_NODE_SYSTEM_USE_STATIC_RUNTIME OFF CACHE BOOL "Use static runtime (/MT) instead of dynamic (/MD) for VisualNodeSystem" FORCE)
+    endif()
+
+    # Always add /MP for multi-processor compilation
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+endif()
+
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI /W3 /Od /JMC /sdl /FC /D IMGUI_IMPL_OPENGL_LOADER_GLEW /D WIN32 /D _WINDOWS /D _DEBUG /D FE_DEBUG_ENABLED")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W3 /O2 /Oi /Gy /sdl /FC /GL /OPT:REF /OPT:ICF /D IMGUI_IMPL_OPENGL_LOADER_GLEW /D NDEBUG /D WIN32 /D _WINDOWS")
 
 # Turn on the ability to create folders to organize projects (.vcproj)
 # It creates "CMakePredefinedTargets" folder by default and adds CMake
 # defined projects like INSTALL.vcproj and ZERO_CHECK.vcproj
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-# Force your path to Dear ImGui
+# Editor should be built with these options
+set(BUILD_SHARED_LIBS ON CACHE BOOL "Build FEBasicApplication as a shared library" FORCE)
+set(USE_STATIC_RUNTIME OFF CACHE BOOL "Use static runtime (/MT) instead of dynamic (/MD)" FORCE)
+
+# Set up Visual node system
 set(DEAR_IMGUI_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/SubSystems/FocalEngine/SubSystems/FEBasicApplication/ThirdParty/imgui CACHE PATH "Path to Dear ImGui directory." FORCE)
+if(BUILD_SHARED_LIBS)
+	set(VISUAL_NODE_SYSTEM_BUILD_SHARED_LIBS ON CACHE BOOL "Build VisualNodeSystem as a shared library" FORCE)
+	# Set options for VisualNodeSystem
+	set(VISUAL_NODE_SYSTEM_USE_EXTERNAL_IMGUI ON CACHE BOOL "Use external ImGui from FEBasicApplication" FORCE)
+	set(EXTERNAL_IMGUI_LIBRARY FEBasicApplication CACHE FILEPATH "Path to external ImGui library" FORCE)
+
+    if(USE_STATIC_RUNTIME)
+        message(WARNING "Building a shared library with static runtime is uncommon and may lead to issues.")
+        set(VISUAL_NODE_SYSTEM_GLFW_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/SubSystems/FocalEngine/SubSystems/FEBasicApplication/ThirdParty/GLFW/lib/x64/glfw3_mt.lib CACHE PATH "Path to GLFW library." FORCE)
+    else()
+        set(VISUAL_NODE_SYSTEM_GLFW_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/SubSystems/FocalEngine/SubSystems/FEBasicApplication/ThirdParty/GLFW/lib/x64/glfw3dll.lib CACHE PATH "Path to GLFW library." FORCE)
+    endif()
+
+    set(VISUAL_NODE_SYSTEM_GLFW_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/SubSystems/FocalEngine/SubSystems/FEBasicApplication/ThirdParty/ CACHE PATH "Path to GLFW include directory.")
+else()
+	set(VISUAL_NODE_SYSTEM_BUILD_SHARED_LIBS OFF CACHE BOOL "Build VisualNodeSystem as a shared library" FORCE)
+
+    if(USE_STATIC_RUNTIME)
+        set(VISUAL_NODE_SYSTEM_GLFW_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/SubSystems/FocalEngine/SubSystems/FEBasicApplication/ThirdParty/GLFW/lib/x64/glfw3_mt.lib CACHE PATH "Path to GLFW library." FORCE)
+    else()
+        set(VISUAL_NODE_SYSTEM_GLFW_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/SubSystems/FocalEngine/SubSystems/FEBasicApplication/ThirdParty/GLFW/lib/x64/glfw3.lib CACHE PATH "Path to GLFW library." FORCE)
+    endif()
+endif()
 
 if(NOT TARGET VisualNodeSystem)
 	add_subdirectory(SubSystems/NodeSystem/VisualNodeSystem)
@@ -31,6 +77,15 @@ if(NOT TARGET FocalEngine)
 	add_subdirectory(SubSystems/FocalEngine)
 endif()
 
+if(USE_STATIC_RUNTIME)
+    # Add standard FocalEngine native scripts
+    # TODO: This should be done in the FocalEngine project, or make it simpler to add it user projects
+    file(GLOB Unpacked_NativeScript_2B7956623302254F620A675F_SRC
+	    "SubSystems/FocalEngine/Resources/UserScriptsData/ExtractedScriptModules/2B7956623302254F620A675F/FirstScript.h"
+	    "SubSystems/FocalEngine/Resources/UserScriptsData/ExtractedScriptModules/2B7956623302254F620A675F/FirstScript.cpp"
+    )
+endif()
+
 # Extract the relative path of the engine folder
 file(RELATIVE_PATH RELATIVE_PATH_TO_ENGINE_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}" "${ENGINE_FOLDER}")
 # We need to re-configure the Config.h file for the engine
@@ -40,56 +95,83 @@ set(ENGINE_FOLDER "${RELATIVE_PATH_TO_ENGINE_FOLDER}")
 configure_file(${ENGINE_FOLDER}/ResourceManager/Config.h.in ${ENGINE_FOLDER}/ResourceManager/Config.h @ONLY)
 
 # *************** EDITOR ***************
-file(GLOB Editor_SRC
-	"main.cpp"
+
+set(EDITOR_SOURCE_FILES "")
+list(APPEND EDITOR_SOURCE_FILES
+    "main.cpp"
 	"FEEditor.cpp"
 	"FEEditor.h"
-	"FEEditorContentBrowser.cpp"
 	"FEEditorDragAndDropManager.cpp"
 	"FEEditorDragAndDropManager.h"
 	"FEEditorGizmoManager.cpp"
 	"FEEditorGizmoManager.h"
 	"FEEditorHaloSelectionEffect.cpp"
 	"FEEditorHaloSelectionEffect.h"
-	"FEEditorInternalResources.cpp"
-	"FEEditorInternalResources.h"
 	"FEEditorPreviewManager.cpp"
 	"FEEditorPreviewManager.h"
 	"FEEditorSelectedObject.cpp"
 	"FEEditorSelectedObject.h"
 	"FEEditorVirtualFileSystem.cpp"
 	"FEEditorVirtualFileSystem.h"
-	"FEProject.cpp"
-	"FEProject.h"
+	"FEEditorScriptingSystem.cpp"
+	"FEEditorScriptingSystem.h"
+	"FEProjectBuildSystem.cpp"
+	"FEProjectBuildSystem.h"
+)
+
+if(USE_STATIC_RUNTIME)
+	list(APPEND EDITOR_SOURCE_FILES
+		${Unpacked_NativeScript_2B7956623302254F620A675F_SRC}
+	)
+endif()
+
+file(GLOB ProjectManagment_SRC
+	"SubSystems/ProjectManagment/FEProjectManager.cpp"
+	"SubSystems/ProjectManagment/FEProjectManager.h"
+	"SubSystems/ProjectManagment/FEProject.cpp"
+	"SubSystems/ProjectManagment/FEProject.h"
 )
 
 file(GLOB FEDearImguiWrapper_SRC
 	"FEDearImguiWrapper/FEDearImguiWrapper.cpp"
 	"FEDearImguiWrapper/FEDearImguiWrapper.h"
 )
 
-file(GLOB FEEditorSubWindows_SRC
-	"FEEditorSubWindows/deletePopups.cpp"
-	"FEEditorSubWindows/deletePopups.h"
-	"FEEditorSubWindows/editPopups.cpp"
-	"FEEditorSubWindows/editPopups.h"
-	"FEEditorSubWindows/gyzmosSettingsWindow.h"
-	"FEEditorSubWindows/combineChannelsToTexturePopUp.cpp"
-	"FEEditorSubWindows/combineChannelsToTexturePopUp.h"
-	"FEEditorSubWindows/projectWasModifiedPopUp.cpp"
-	"FEEditorSubWindows/projectWasModifiedPopUp.h"
-	"FEEditorSubWindows/renamePopups.cpp"
-	"FEEditorSubWindows/renamePopups.h"
-	"FEEditorSubWindows/selectPopups.cpp"
-	"FEEditorSubWindows/selectPopups.h"
-	"FEEditorSubWindows/shaderEditorWindow.cpp"
-	"FEEditorSubWindows/shaderEditorWindow.h"
-	"FEEditorSubWindows/resizeTexturePopup.cpp"
-	"FEEditorSubWindows/resizeTexturePopup.h"
-	"FEEditorSubWindows/prefabEditorWindow.cpp"
-	"FEEditorSubWindows/prefabEditorWindow.h"
-	"FEEditorSubWindows/debugTextureViewWindow.cpp"
-	"FEEditorSubWindows/debugTextureViewWindow.h"
+file(GLOB EditorWindows_BaseWindowClasses_SRC
+	"EditorWindows/EditorBaseWindowClasses/FEEditorSceneWindow.h"
+	"EditorWindows/EditorBaseWindowClasses/FEEditorSceneWindow.cpp"
+)
+
+file(GLOB EditorWindows_SRC
+	"EditorWindows/DeletePopups.cpp"
+	"EditorWindows/DeletePopups.h"
+	"EditorWindows/EditPopups.cpp"
+	"EditorWindows/EditPopups.h"
+	"EditorWindows/GyzmosSettingsWindow.h"
+	"EditorWindows/GyzmosSettingsWindow.cpp"
+	"EditorWindows/CombineChannelsToTexturePopUp.cpp"
+	"EditorWindows/CombineChannelsToTexturePopUp.h"
+	"EditorWindows/ProjectWasModifiedPopUp.cpp"
+	"EditorWindows/ProjectWasModifiedPopUp.h"
+	"EditorWindows/RenamePopups.cpp"
+	"EditorWindows/RenamePopups.h"
+	"EditorWindows/SelectPopups.cpp"
+	"EditorWindows/SelectPopups.h"
+	"EditorWindows/ShaderEditorWindow.cpp"
+	"EditorWindows/ShaderEditorWindow.h"
+	"EditorWindows/ResizeTexturePopup.cpp"
+	"EditorWindows/ResizeTexturePopup.h"
+	"EditorWindows/PrefabEditorManager.cpp"
+	"EditorWindows/PrefabEditorManager.h"
+	"EditorWindows/DebugTextureViewWindow.cpp"
+	"EditorWindows/DebugTextureViewWindow.h"
+	"EditorWindows/SceneGraphWindow.cpp"
+	"EditorWindows/SceneGraphWindow.h"
+	"EditorWindows/InspectorWindow.cpp"
+	"EditorWindows/InspectorWindow.h"
+	"EditorWindows/ContentBrowserWindow.cpp"
+	"EditorWindows/ContentBrowserWindow.h"
+	"EditorWindows/LogWindow.cpp"
 )
 
 file(GLOB Editor_Materials_SRC
@@ -127,29 +209,40 @@ link_directories(${GLFW_LIB_DIR})
 
 # add the executable
 add_executable(FocalEngineEditor WIN32
-								 ${Editor_SRC}
+								 ${EDITOR_SOURCE_FILES}
 								 ${FEDearImguiWrapper_SRC}
-								 ${FEEditorSubWindows_SRC}
+								 ${EditorWindows_BaseWindowClasses_SRC}
+								 ${EditorWindows_SRC}
 								 ${Editor_Materials_SRC}
 								 ${VisualNodeSystem_CustomNodes_SRC}
 								 # *************** SUB_SYSTEM ***************
-
+								 ${ProjectManagment_SRC}
 								 # *************** THIRD_PARTY ***************
 								 ${textEditor_SRC}
 )
 
-target_link_libraries(FocalEngineEditor PRIVATE VisualNodeSystem)
-target_link_libraries(FocalEngineEditor PRIVATE FocalEngine)
+target_link_libraries(FocalEngineEditor
+    PRIVATE
+        FEBasicApplication
+		VisualNodeSystem
+        FocalEngine
+        ${GLFW_LIBRARY}
+        ${GLEW_LIBRARY}
+        opengl32.lib
+)
 
-source_group("Source Files" FILES ${Application_SRC})
 # *************** EDITOR ***************
-source_group("Source Files/" FILES ${Editor_SRC})
+source_group("Source Files/" FILES ${EDITOR_SOURCE_FILES})
+if(USE_STATIC_RUNTIME)
+	source_group("Source Files/FocalEngine/2B7956623302254F620A675F" FILES ${Unpacked_NativeScript_2B7956623302254F620A675F_SRC})
+endif()
 source_group("Source Files/FEDearImguiWrapper" FILES ${FEDearImguiWrapper_SRC})
-source_group("Source Files/FEEditorSubWindows" FILES ${FEEditorSubWindows_SRC})
+source_group("Source Files/EditorWindows/BaseWindowClasses" FILES ${EditorWindows_BaseWindowClasses_SRC})
+source_group("Source Files/EditorWindows" FILES ${EditorWindows_SRC})
 source_group("Source Files/Materials" FILES ${Editor_Materials_SRC})
 source_group("Source Files/NodeSystem/CustomNodes" FILES ${VisualNodeSystem_CustomNodes_SRC})
 # *************** SUB_SYSTEM ***************
-
+source_group("Source Files/ProjectManagment" FILES ${ProjectManagment_SRC})
 # *************** THIRD_PARTY ***************
 source_group("Source Files/ThirdParty/textEditor" FILES ${textEditor_SRC})
 
@@ -161,6 +254,36 @@ include_directories(
 	${BASICAPP_THIRDPARTY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/SubSystems/FocalEngine/SubSystems/FEBasicApplication/ThirdParty/imgui
 	${BASICAPP_DIR}
-	${FOCAL_ENGINE_THIRD_PARTY_DIR}
+	${FOCAL_ENGINE_INCLUDES}
 	${VISUAL_NODE_SYSTEM_DIR}
-)
+)
+
+# If building as DLL, copy necessary DLLs to output directory
+if(BUILD_SHARED_LIBS)
+    add_custom_command(TARGET FocalEngineEditor POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "$<TARGET_FILE_DIR:FocalEngine>/glfw3.dll"
+            "$<TARGET_FILE_DIR:FocalEngineEditor>"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "$<TARGET_FILE_DIR:FocalEngine>/FEBasicApplication.dll"
+            "$<TARGET_FILE_DIR:FocalEngineEditor>"
+		COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "$<TARGET_FILE_DIR:VisualNodeSystem>/VisualNodeSystem.dll"
+            "$<TARGET_FILE_DIR:FocalEngineEditor>"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "$<TARGET_FILE_DIR:FocalEngine>/FocalEngine.dll"
+            "$<TARGET_FILE_DIR:FocalEngineEditor>"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            ${OpenXRLoader_DLL}
+            "$<TARGET_FILE_DIR:FocalEngineEditor>"
+    )
+endif()
+
+# If using dynamic runtime, copy necessary DLLs to output directory
+if(NOT USE_STATIC_RUNTIME)
+    add_custom_command(TARGET FocalEngineEditor POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${GLEW_LIB_DIR}/glew32.dll"
+            "$<TARGET_FILE_DIR:FocalEngineEditor>"
+    )
+endif()

FEEditorSubWindows/combineChannelsToTexturePopUp.cpp → EditorWindows/CombineChannelsToTexturePopUp.cpp

@@ -1,7 +1,6 @@
-#include "combineChannelsToTexturePopUp.h"
+#include "CombineChannelsToTexturePopUp.h"
 using namespace VisNodeSys;
 
-CombineChannelsToTexturePopUp* CombineChannelsToTexturePopUp::Instance = nullptr;
 ImVec2 CombineChannelsToTexturePopUp::NodeGridRelativePosition = ImVec2(5, 30);
 ImVec2 CombineChannelsToTexturePopUp::WindowPosition = ImVec2(0, 0);
 ImVec2 CombineChannelsToTexturePopUp::MousePositionWhenContextMenuWasOpened = ImVec2(0, 0);
@@ -23,7 +22,7 @@ CombineChannelsToTexturePopUp::~CombineChannelsToTexturePopUp()
 void CombineChannelsToTexturePopUp::Show()
 {
 	Size = ImVec2(800, 800);
-	Position = ImVec2(FEngine::getInstance().GetWindowWidth() / 2 - Size.x / 2, FEngine::getInstance().GetWindowHeight() / 2 - Size.y / 2);
+	Position = ImVec2(APPLICATION.GetMainWindow()->GetWidth() / 2 - Size.x / 2, APPLICATION.GetMainWindow()->GetHeight() / 2 - Size.y / 2);
 
 	Flags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoCollapse;
 
@@ -123,7 +122,7 @@ void CombineChannelsToTexturePopUp::NodeSystemMainContextMenu()
 		if (ImGui::MenuItem("Texture node"))
 		{
 			TextureForNewNode = RESOURCE_MANAGER.NoTexture;
-			SelectFeObjectPopUp::getInstance().Show(FE_TEXTURE, TextureNodeCreationCallback);
+			SELECT_FEOBJECT_POPUP.Show(FE_TEXTURE, TextureNodeCreationCallback);
 		}
 
 		if (ImGui::MenuItem("Float node"))

FEEditorSubWindows/combineChannelsToTexturePopUp.h → EditorWindows/CombineChannelsToTexturePopUp.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "gyzmosSettingsWindow.h"
+#include "GyzmosSettingsWindow.h"
 
 class CombineChannelsToTexturePopUp : public FEImGuiWindow
 {