Relative root path

engine/CMakeLists.txt

@@ -3,6 +3,9 @@ set(ENGINE_ROOT_DIR "${PILOT_ROOT_DIR}/engine")
 set(THIRD_PARTY_DIR "${ENGINE_ROOT_DIR}/3rdparty")
 set(ENGINE_ASSET_DIR "/asset")
 
+set(DEPLOY_CONFIG_DIR "configs/deployment")
+set(DEVELOP_CONFIG_DIR "configs/development")
+
 option(ENABLE_PHYSICS_DEBUG_RENDERER "Enable Physics Debug Renderer" OFF)
 
 # only support physics debug render at windows platform

engine/PilotEditor.ini → engine/configs/deployment/PilotEditor.ini

@@ -1,3 +1,4 @@
+BinaryRootFolder=.
 AssetFolder=asset
 SchemaFolder=schema
 BigIconFile=resource/PilotEditorBigIcon.png

engine/configs/development/PilotEditor.ini

@@ -0,0 +1,9 @@
+BinaryRootFolder=../../../../../bin
+AssetFolder=asset
+SchemaFolder=schema
+BigIconFile=resource/PilotEditorBigIcon.png
+SmallIconFile=resource/PilotEditorSmallIcon.png
+FontFile=resource/PilotEditorFont.TTF
+DefaultWorld=asset/world/hello.world.json
+GlobalRenderingRes=asset/global/rendering.global.json
+JoltAssetFolder=jolt-asset

engine/source/editor/CMakeLists.txt

@@ -22,24 +22,23 @@ target_compile_options(${TARGET_NAME} PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:
 
 target_link_libraries(${TARGET_NAME} PilotRuntime)
 
-if(NOT ENABLE_PHYSICS_DEBUG_RENDERER)
-  add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${BINARY_ROOT_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy "${ENGINE_ROOT_DIR}/${TARGET_NAME}.ini" "${BINARY_ROOT_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/resource" "${BINARY_ROOT_DIR}/resource"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "$<TARGET_FILE_DIR:${TARGET_NAME}>/" "${BINARY_ROOT_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E remove_directory "${BINARY_ROOT_DIR}/${ENGINE_ASSET_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${ENGINE_ROOT_DIR}/${ENGINE_ASSET_DIR}" "${BINARY_ROOT_DIR}/${ENGINE_ASSET_DIR}"
+set(POST_BUILD_COMMANDS
+  COMMAND ${CMAKE_COMMAND} -E make_directory "${BINARY_ROOT_DIR}"
+  COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/resource" "${BINARY_ROOT_DIR}/resource"
+  COMMAND ${CMAKE_COMMAND} -E copy_directory "$<TARGET_FILE_DIR:${TARGET_NAME}>/" "${BINARY_ROOT_DIR}"
+  COMMAND ${CMAKE_COMMAND} -E copy "${ENGINE_ROOT_DIR}/${DEPLOY_CONFIG_DIR}/${TARGET_NAME}.ini" "${BINARY_ROOT_DIR}"
+  COMMAND ${CMAKE_COMMAND} -E copy "${ENGINE_ROOT_DIR}/${DEVELOP_CONFIG_DIR}/${TARGET_NAME}.ini" "$<TARGET_FILE_DIR:${TARGET_NAME}>/"
+  COMMAND ${CMAKE_COMMAND} -E remove_directory "${BINARY_ROOT_DIR}/${ENGINE_ASSET_DIR}"
+  COMMAND ${CMAKE_COMMAND} -E copy_directory "${ENGINE_ROOT_DIR}/${ENGINE_ASSET_DIR}" "${BINARY_ROOT_DIR}/${ENGINE_ASSET_DIR}"
 )
-else()
-  add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${BINARY_ROOT_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy "${ENGINE_ROOT_DIR}/${TARGET_NAME}.ini" "${BINARY_ROOT_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/resource" "${BINARY_ROOT_DIR}/resource"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "$<TARGET_FILE_DIR:${TARGET_NAME}>/" "${BINARY_ROOT_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E remove_directory "${BINARY_ROOT_DIR}/${ENGINE_ASSET_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${ENGINE_ROOT_DIR}/${ENGINE_ASSET_DIR}" "${BINARY_ROOT_DIR}/${ENGINE_ASSET_DIR}"
+
+
+
+if(ENABLE_PHYSICS_DEBUG_RENDERER)
+  set(POST_BUILD_COMMANDS ${POST_BUILD_COMMANDS}
     COMMAND ${CMAKE_COMMAND} -E remove_directory "${BINARY_ROOT_DIR}/${JOLT_ASSET_DIR}"
     COMMAND ${CMAKE_COMMAND} -E copy_directory "${ENGINE_ROOT_DIR}/${JOLT_ASSET_DIR}" "${BINARY_ROOT_DIR}/${JOLT_ASSET_DIR}"
 )
 endif()
+
+add_custom_command(TARGET ${TARGET_NAME} ${POST_BUILD_COMMANDS})

engine/source/editor/source/main.cpp

@@ -1,3 +1,4 @@
+#include <filesystem>
 #include <iostream>
 #include <string>
 #include <thread>
@@ -13,15 +14,12 @@
 
 int main(int argc, char** argv)
 {
-    std::filesystem::path pilot_root_folder = std::filesystem::path(PILOT_XSTR(PILOT_ROOT_DIR));
-
-    Pilot::EngineInitParams params;
-    params.m_root_folder      = pilot_root_folder;
-    params.m_config_file_path = pilot_root_folder / "PilotEditor.ini";
+    std::filesystem::path executable_path(argv[0]);
+    std::filesystem::path config_file_path = executable_path.parent_path() / "PilotEditor.ini";
 
     Pilot::PilotEngine* engine = new Pilot::PilotEngine();
 
-    engine->startEngine(params);
+    engine->startEngine(config_file_path.generic_string());
     engine->initialize();
 
     Pilot::PilotEditor* editor = new Pilot::PilotEditor();

engine/source/runtime/engine.cpp

@@ -15,13 +15,11 @@ namespace Pilot
     bool                            g_is_editor_mode {false};
     std::unordered_set<std::string> g_editor_tick_component_types {};
 
-    void PilotEngine::startEngine(const EngineInitParams& param)
+    void PilotEngine::startEngine(const std::string& config_file_path)
     {
-        m_init_params = param;
-
         Reflection::TypeMetaRegister::Register();
 
-        g_runtime_global_context.startSystems(param);
+        g_runtime_global_context.startSystems(config_file_path);
 
         LOG_INFO("engine start");
     }

engine/source/runtime/engine.h

@@ -3,27 +3,22 @@
 #include <atomic>
 #include <chrono>
 #include <filesystem>
+#include <string>
 #include <unordered_set>
 
 namespace Pilot
 {
     extern bool                            g_is_editor_mode;
     extern std::unordered_set<std::string> g_editor_tick_component_types;
 
-    struct EngineInitParams
-    {
-        std::filesystem::path m_root_folder;
-        std::filesystem::path m_config_file_path;
-    };
-
     class PilotEngine
     {
         friend class PilotEditor;
 
         static const float k_fps_alpha;
 
     public:
-        void startEngine(const EngineInitParams& param);
+        void startEngine(const std::string& config_file_path);
         void shutdownEngine();
 
         void initialize();
@@ -47,8 +42,6 @@ namespace Pilot
         float calculateDeltaTime();
 
     protected:
-        EngineInitParams m_init_params;
-
         bool m_is_quit {false};
 
         std::chrono::steady_clock::time_point m_last_tick_time_point {std::chrono::steady_clock::now()};

engine/source/runtime/function/global/global_context.cpp

@@ -21,10 +21,10 @@ namespace Pilot
 {
     RuntimeGlobalContext g_runtime_global_context;
 
-    void RuntimeGlobalContext::startSystems(const EngineInitParams& init_params)
+    void RuntimeGlobalContext::startSystems(const std::string& config_file_path)
     {
         m_config_manager = std::make_shared<ConfigManager>();
-        m_config_manager->initialize(init_params);
+        m_config_manager->initialize(config_file_path);
 
         m_file_system = std::make_shared<FileSystem>();
 

engine/source/runtime/function/global/global_context.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <memory>
+#include <string>
 
 namespace Pilot
 {
@@ -22,7 +23,7 @@ namespace Pilot
     {
     public:
         // create all global systems and initialize these systems
-        void startSystems(const EngineInitParams& init_params);
+        void startSystems(const std::string& config_file_path);
         // destroy all global systems
         void shutdownSystems();
 

engine/source/runtime/resource/asset_manager/asset_manager.cpp

@@ -4,10 +4,12 @@
 
 #include "runtime/function/global/global_context.h"
 
+#include <filesystem>
+
 namespace Pilot
 {
     std::filesystem::path AssetManager::getFullPath(const std::string& relative_path) const
     {
-        return g_runtime_global_context.m_config_manager->getRootFolder() / relative_path;
+        return std::filesystem::absolute(g_runtime_global_context.m_config_manager->getRootFolder() / relative_path);
     }
 } // namespace Pilot

engine/source/runtime/resource/asset_manager/asset_manager.h

@@ -20,10 +20,11 @@ namespace Pilot
         bool loadAsset(const std::string& asset_url, AssetType& out_asset) const
         {
             // read json file to string
-            std::ifstream asset_json_file(getFullPath(asset_url));
+            std::filesystem::path asset_path = getFullPath(asset_url);
+            std::ifstream asset_json_file(asset_path);
             if (!asset_json_file)
             {
-                LOG_ERROR("open file: {} failed!", asset_url);
+                LOG_ERROR("open file: {} failed!", asset_path.generic_string());
                 return false;
             }
 

engine/source/runtime/resource/config_manager/config_manager.cpp

@@ -2,16 +2,16 @@
 
 #include "runtime/engine.h"
 
+#include <filesystem>
 #include <fstream>
 #include <string>
 
 namespace Pilot
 {
-    void ConfigManager::initialize(const EngineInitParams& init_param)
+    void ConfigManager::initialize(const std::filesystem::path& config_file_path)
     {
-        m_root_folder = init_param.m_root_folder;
         // read configs
-        std::ifstream config_file(init_param.m_config_file_path);
+        std::ifstream config_file(config_file_path);
         std::string   config_line;
         while (std::getline(config_file, config_line))
         {
@@ -20,7 +20,11 @@ namespace Pilot
             {
                 std::string name  = config_line.substr(0, seperate_pos);
                 std::string value = config_line.substr(seperate_pos + 1, config_line.length() - seperate_pos - 1);
-                if (name == "AssetFolder")
+                if (name == "BinaryRootFolder")
+                {
+                    m_root_folder = config_file_path.parent_path() / value;
+                }
+                else if (name == "AssetFolder")
                 {
                     m_asset_folder = m_root_folder / value;
                 }

engine/source/runtime/resource/config_manager/config_manager.h

@@ -9,7 +9,7 @@ namespace Pilot
     class ConfigManager
     {
     public:
-        void initialize(const EngineInitParams& init_param);
+        void initialize(const std::filesystem::path& config_file_path);
 
         const std::filesystem::path& getRootFolder() const;
         const std::filesystem::path& getAssetFolder() const;