Core : Add a launcher GUI for project managment

infiniteHQ · Apr 30, 2024 · 990f2c9 · 990f2c9
1 parent 146ab4c
commit 990f2c9
Show file tree

Hide file tree

Showing 16 changed files with 428 additions and 183 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,11 +6,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 # Liste des fichiers sources pour la bibliothèque partagée
 file(GLOB_RECURSE VORTEX_SHARED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main/src/*.cpp")
 file(GLOB_RECURSE VORTEXEDITOR_SHARED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tools/editor/*.cpp")
+file(GLOB_RECURSE VORTEXLAUNCHER_SHARED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tools/launcher/*.cpp")
 
 # Création de la bibliothèque partagée
 add_library(vortex_shared SHARED 
 ${VORTEX_SHARED_SOURCES}
 ${VORTEXEDITOR_SHARED_SOURCES}
+${VORTEXLAUNCHER_SHARED_SOURCES}
 ${VORTEXCORE_SHARED_SOURCES}
 ${VORTEXPROJECT_SHARED_SOURCES}
 ${VORTEXUTILS_SHARED_SOURCES}
@@ -22,6 +24,7 @@ target_include_directories(vortex_shared PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/main/include
     ${CMAKE_CURRENT_SOURCE_DIR}/main/src
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/editor
+    ${CMAKE_CURRENT_SOURCE_DIR}/tools/launcher
 )
 
 # Liste des fichiers sources pour l'exécutable principal
@@ -31,6 +34,9 @@ file(GLOB_RECURSE VORTEX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main/src/*.cpp")
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/editor editor_build)
 target_link_libraries(vortex_shared PUBLIC editor)
 
+# Add launcher
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/launcher launcher_build)
+target_link_libraries(vortex_shared PUBLIC launcher)
 
 # Création de l'exécutable principal
 add_executable(vortex ${VORTEX_SOURCES} main.cpp)
@@ -66,6 +72,14 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tools/editor/app/
         PATTERN "*.inl"
 )
 
+# Installation des fichiers d'en-tête de /tools/launcher/app/include
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tools/launcher/app/
+        DESTINATION ${INSTALL_INCLUDE_DIR}/tools/launcher/app/
+        PATTERN "*.h"
+        PATTERN "*.hpp"
+        PATTERN "*.inl"
+)
+
 # Installation des fichiers d'en-tête de /lib
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
         DESTINATION ${INSTALL_INCLUDE_DIR}/lib

diff --git a/build/bin/vortex b/build/bin/vortex
diff --git a/lib/spdlog b/lib/spdlog
diff --git a/lib/uikit b/lib/uikit
diff --git a/main.cpp b/main.cpp
diff --git a/main/src/modules/load.cpp b/main/src/modules/load.cpp
@@ -39,8 +39,6 @@ namespace VortexMaker
                 // Iterate through each found SO file
                 for (const auto &so_file : so_files)
                 {
-
-                        std::cout << "File " << file << "So " << so_file << std::endl;
                     // Load the shared object
                     void *handle = dlopen(so_file.c_str(), RTLD_LAZY | RTLD_GLOBAL);
                     if (!handle)

diff --git a/tools/editor/.gitmodules b/tools/editor/.gitmodules
diff --git a/tools/editor/CMakeLists.txt b/tools/editor/CMakeLists.txt
@@ -7,8 +7,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-
-
 add_library(editor
     # API
     ${CMAKE_CURRENT_SOURCE_DIR}/../../main/src/vortex.cpp
@@ -29,9 +27,10 @@ add_library(editor
     ${CMAKE_CURRENT_SOURCE_DIR}/app/instances/Utils/ModuleDetails/ModuleDetails.cpp
 )
 
-
 target_include_directories(editor PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../)
 
+
+if (NOT TARGET launcher)
 # editor requirements
 find_package(Vulkan REQUIRED)
 option(SPDLOG_INSTALL "Enable installation of spdlog" ON)
@@ -47,5 +46,6 @@ target_link_libraries(editor PUBLIC glm)
 target_link_libraries(editor PUBLIC stbimage)
 target_link_libraries(editor PUBLIC spdlog)
 
+endif()
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/uikit/platform/GUI/editor/icon.png DESTINATION /usr/include/vortex)
diff --git a/tools/editor/app/include/editor.h b/tools/editor/app/include/editor.h
@@ -1,36 +1,19 @@
-
-
 #include "../instances/instance.h"
 #include "../core/ContentBrowser.hpp"
 #include "../core/ProjectViewer.hpp"
 #include "../core/ModuleManager.hpp"
 
 #include "./instanceFactory.h"
+
+#include "../../../../lib/uikit/src/EntryPoint.h"
+
 using namespace VortexMaker;
 
 #ifndef EDITOR_H
 #define EDITOR_H
 
 static std::vector<std::shared_ptr<ModuleDetails>> moduleDetailsInstances;
 
-static void PushStyle()
-{
-  ImGuiStyle &style = ImGui::GetStyle();
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 5.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, 11.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_ScrollbarSize, 11.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(10.0f, 10.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(15.0f, 6.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(9.0f, 3.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_TabRounding, 7.0f);
-}
-
-static void PopStyle()
-{
-  ImGui::PopStyleVar(8);
-}
-
 class Instance : public InstanceFactory
 {
 public:
@@ -48,12 +31,12 @@ class Instance : public InstanceFactory
   };
 };
 
-class ApplicationLayer : public UIKit::Layer
+class EditorLayer : public UIKit::Layer
 {
 public:
-  ApplicationLayer(){};
+  EditorLayer(){};
 
-  void menubar(const std::shared_ptr<ApplicationLayer>& applayer, UIKit::Application* app);
+  void menubar(const std::shared_ptr<EditorLayer> &applayer, UIKit::Application *app);
   void OnUIRender() override
   {
     PushStyle();
@@ -111,7 +94,23 @@ class ApplicationLayer : public UIKit::Layer
 
     PopStyle();
   }
+  void PushStyle()
+  {
+    ImGuiStyle &style = ImGui::GetStyle();
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 5.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, 11.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_ScrollbarSize, 11.0f);
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(10.0f, 10.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(15.0f, 6.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(9.0f, 3.0f));
+    ImGui::PushStyleVar(ImGuiStyleVar_TabRounding, 7.0f);
+  }
 
+  void PopStyle()
+  {
+    ImGui::PopStyleVar(8);
+  }
   VxContext *m_ctx;
 
   // Global TaskProcessor instance
@@ -129,11 +128,11 @@ class ApplicationLayer : public UIKit::Layer
   std::vector<std::string> instanciedWindowsNames;
 };
 
-static UIKit::Application *UIKit::CreateApplication(int argc, char **argv)
+UIKit::Application *CreateEditor(int argc, char **argv)
 {
   int port = atoi(argv[1]);
 
-  std::shared_ptr<ApplicationLayer> applayer = std::make_shared<ApplicationLayer>();
+  std::shared_ptr<EditorLayer> applayer = std::make_shared<EditorLayer>();
   applayer->m_ctx = VortexMaker::GetCurrentContext();
 
   UIKit::ApplicationSpecification spec;
@@ -145,9 +144,47 @@ static UIKit::Application *UIKit::CreateApplication(int argc, char **argv)
   UIKit::Application *app = new UIKit::Application(spec);
 
   app->PushLayer(applayer);
-  app->SetMenubarCallback([app, applayer]() {applayer->menubar(applayer, app);});
+  app->SetMenubarCallback([app, applayer]()
+                          { applayer->menubar(applayer, app); });
 
   return app;
 }
 
+namespace VortexMaker
+{
+  static int VortexEditor(int argc, char **argv)
+  {
+    return UIKit::ThirdMain(argc, argv, CreateEditor);
+  }
+
+  // Old call
+  /*static int VortexEditor(int argc, char **argv)
+  {
+    return UIKit::Main(argc, argv);
+  }*/
+}
+
+// Old creation function
+/*static UIKit::Application *UIKit::CreateApplication(int argc, char **argv)
+{
+  int port = atoi(argv[1]);
+
+  std::shared_ptr<EditorLayer> applayer = std::make_shared<EditorLayer>();
+  applayer->m_ctx = VortexMaker::GetCurrentContext();
+
+  UIKit::ApplicationSpecification spec;
+  std::string name = applayer->m_ctx->name + " - Vortex Editor";
+  spec.Name = name;
+  spec.CustomTitlebar = true;
+  spec.IconPath = "icon.png";
+
+  UIKit::Application *app = new UIKit::Application(spec);
+
+  app->PushLayer(applayer);
+  app->SetMenubarCallback([app, applayer]()
+                          { applayer->menubar(applayer, app); });
+
+  return app;
+}*/
+
 #endif
diff --git a/tools/editor/app/src/editor.cpp b/tools/editor/app/src/editor.cpp
@@ -1,57 +1,57 @@
 #include "../include/editor.h"
 
-void handleExit(UIKit::Application *app)
+static void handleExit(UIKit::Application *app)
 {
     app->Close();
 }
 
-void handleProjectSettings()
+static void handleProjectSettings()
 {
 }
 
-void handleManagePlugins()
+static void handleManagePlugins()
 {
 }
 
-void handleManageModules(bool &showModulesManager)
+static void handleManageModules(bool &showModulesManager)
 {
 }
 
-void handleShowBottomToolbar()
+static void handleShowBottomToolbar()
 {
 }
 
-void handleShowSimplifiedHeader(UIKit::Application *app)
+static void handleShowSimplifiedHeader(UIKit::Application *app)
 {
     app->m_Specification.CustomTitlebar = !app->m_Specification.CustomTitlebar;
 }
 
-void handleContentBrowser(bool &showContentBrowser)
+static void handleContentBrowser(bool &showContentBrowser)
 {
 }
 
-void handleProjectViewer(bool &showProjectViewer)
+static void handleProjectViewer(bool &showProjectViewer)
 {
 }
 
-void handleNews()
+static void handleNews()
 {
 }
 
-void handleCommunity()
+static void handleCommunity()
 {
 }
 
-void handleTutorials()
+static void handleTutorials()
 {
 }
 
-void handleDocumentation()
+static void handleDocumentation()
 {
 }
 
 // Main menu function
-void ApplicationLayer::menubar(const std::shared_ptr<ApplicationLayer> &exampleLayer, UIKit::Application *app)
+void EditorLayer::menubar(const std::shared_ptr<EditorLayer> &exampleLayer, UIKit::Application *app)
 {
     if (ImGui::BeginMenu("File"))
     {

diff --git a/tools/editor/compile_commands.json b/tools/editor/compile_commands.json
diff --git a/tools/launcher/.gitignore b/tools/launcher/.gitignore
@@ -0,0 +1,21 @@
+# Directories
+.vs/
+bin/
+bin-int/
+
+# Files
+*.vcxproj
+*.vcxproj.user
+*.vcxproj.filters
+*.sln
+
+# Exclude
+!vendor/bin
+
+.cache
+build/
+vendor/glfw
+vendor/glm
+vendor/stb-image
+vendor/imgui/.github
+CMakeFiles
+15 −0		README.md
+15 −0		example/example.cpp
+1 −1		include/spdlog/common.h
+1 −1		include/spdlog/details/file_helper-inl.h
+9 −0		include/spdlog/details/os-inl.h
+1 −26		include/spdlog/details/registry-inl.h
+4 −11		include/spdlog/details/registry.h
+1 −3		include/spdlog/details/thread_pool.h
+1 −1		include/spdlog/fmt/fmt.h
+32 −22		include/spdlog/mdc.h
+2 −6		include/spdlog/pattern_formatter-inl.h
+0 −10		include/spdlog/spdlog-inl.h
+0 −8		include/spdlog/spdlog.h
+1 −1		include/spdlog/version.h
+2 −2		tests/test_async.cpp
+61 −0		tests/test_create_dir.cpp