Feat: Misc Update

.github/workflows/build.yml

@@ -1,6 +1,14 @@
 name: Build
 
-on: [pull_request, workflow_dispatch]
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      debug:
+        type: boolean
+        description: 'Enable TMate Debug'
+        required: false
+        default: false
 
 env:
   BUILD_TYPE: Release
@@ -16,6 +24,16 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Setup TMate Session
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug }}
+        with:
+          detached: true
+
+      - name: Set XCode Version
+        run: sudo xcode-select -s /Library/Developer/CommandLineTools
+        if: runner.os == 'macOS'
+
       - name: Checkout Repo
         uses: actions/checkout@v2
 

CMake/Target.cmake

@@ -245,9 +245,11 @@ function(AddMirrorInfoSourceGenerationTarget)
     foreach (SEARCH_DIR ${PARAMS_SEARCH_DIR})
         file(GLOB_RECURSE INPUT_HEADER_FILES "${SEARCH_DIR}/*.h")
         foreach (INPUT_HEADER_FILE ${INPUT_HEADER_FILES})
-            get_filename_component(FILENAME ${INPUT_HEADER_FILE} NAME_WE)
+            string(REPLACE "${CMAKE_SOURCE_DIR}/" "" TEMP ${INPUT_HEADER_FILE})
+            get_filename_component(DIR ${TEMP} DIRECTORY)
+            get_filename_component(FILENAME ${TEMP} NAME_WE)
 
-            set(OUTPUT_SOURCE "${CMAKE_BINARY_DIR}/Generated/MirrorInfoSource/${PARAMS_NAME}/${FILENAME}.generated.cpp")
+            set(OUTPUT_SOURCE "${CMAKE_BINARY_DIR}/Generated/MirrorInfoSource/${DIR}/${FILENAME}.generated.cpp")
             list(APPEND OUTPUT_SOURCES ${OUTPUT_SOURCE})
 
             add_custom_command(
@@ -289,10 +291,10 @@ function(AddExecutable)
         )
     endif()
 
-    add_executable(
+    add_executable(${PARAMS_NAME})
+    target_sources(
         ${PARAMS_NAME}
-        ${PARAMS_SRC}
-        ${GENERATED_SRC}
+        PRIVATE ${PARAMS_SRC} ${GENERATED_SRC}
     )
     target_include_directories(
         ${PARAMS_NAME}
@@ -351,8 +353,10 @@ function(AddLibrary)
     add_library(
         ${PARAMS_NAME}
         ${PARAMS_TYPE}
-        ${PARAMS_SRC}
-        ${GENERATED_SRC}
+    )
+    target_sources(
+        ${PARAMS_NAME}
+        PRIVATE ${PARAMS_SRC} ${GENERATED_SRC}
     )
     target_include_directories(
         ${PARAMS_NAME}
@@ -414,10 +418,10 @@ function(AddTest)
         )
     endif()
 
-    add_executable(
+    add_executable(${PARAMS_NAME})
+    target_sources(
         ${PARAMS_NAME}
-        ${PARAMS_SRC}
-        ${GENERATED_SRC}
+        PRIVATE ${PARAMS_SRC} ${GENERATED_SRC}
     )
     target_include_directories(
         ${PARAMS_NAME}

CMake/ThirdParty.cmake

@@ -66,7 +66,7 @@ function(Get3rdPlatformValue)
     cmake_parse_arguments(PARAMS "ARCH" "OUTPUT" "INPUT" ${ARGN})
 
     if (${PARAMS_ARCH})
-        set(PLATFORM_KEYWORDS "Windows-AMD64;Darwin-arm64;Darwin-x86_64")
+        set(PLATFORM_KEYWORDS "Windows-AMD64;Darwin-arm64")
         set(CURRENT_KEYWORDS "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
     else()
         set(PLATFORM_KEYWORDS "Windows;Darwin;Linux")
@@ -331,7 +331,7 @@ function(Add3rdCMakeProject)
         SOURCE_DIR ${SOURCE_DIR}
         BINARY_DIR ${BINARY_DIR}
         CMAKE_ARGS ${CMAKE_BUILD_TYPE_ARGS} -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} ${PARAMS_CMAKE_ARG}
-        BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG>
+        BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> -j 16
         INSTALL_COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR> --config $<CONFIG>
     )
     set_target_properties(

Editor/Source/CMakeLists.txt

@@ -9,7 +9,7 @@ AddExecutable(
     NAME Editor
     SRC ${SOURCES}
     INC Include
-    LIB Qt Core RHI Rendering Runtime
+    LIB Qt Core RHI Runtime
     RES ${FINAL_RESOURCES}
 )
 

Editor/Source/Include/Editor/Core.h

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <Runtime/Engine.h>
-#include <Rendering/RenderingModule.h>
+#include <Render/RenderModule.h>
 
 namespace Editor {
     class Core {
@@ -17,17 +17,14 @@ namespace Editor {
         void Initialize(int argc, char** argv);
         void Cleanup();
         bool ProjectHasSet() const;
-        Rendering::RenderingModule* GetRenderingModule() const;
         Runtime::Engine* GetEngine() const;
 
     private:
         Core();
 
         void ParseCommandLineArgs(int argc, char** argv) const;
         void InitializeRuntime();
-        void InitializeRendering();
 
-        Rendering::RenderingModule* renderingModule;
         Runtime::Engine* engine;
     };
 }

Editor/Source/Src/Core.cpp

@@ -21,8 +21,7 @@ namespace Editor {
     }
 
     Core::Core()
-        : renderingModule(nullptr)
-        , engine(nullptr)
+        : engine(nullptr)
     {
     }
 
@@ -32,13 +31,11 @@ namespace Editor {
     {
         ParseCommandLineArgs(argc, argv);
         InitializeRuntime();
-        InitializeRendering();
     }
 
     void Core::Cleanup() // NOLINT
     {
         ::Core::ModuleManager::Get().Unload("Runtime");
-        ::Core::ModuleManager::Get().Unload("Rendering");
     }
 
     Runtime::Engine* Core::GetEngine() const
@@ -51,11 +48,6 @@ namespace Editor {
         return !caProjectFile.GetValue().empty();
     }
 
-    Rendering::RenderingModule* Core::GetRenderingModule() const
-    {
-        return renderingModule;
-    }
-
     void Core::ParseCommandLineArgs(int argc, char** argv) const // NOLINT
     {
         ::Core::Cli::Get().Parse(argc, argv);
@@ -65,17 +57,9 @@ namespace Editor {
     {
         Runtime::EngineInitParams params {};
         params.projectFile = caProjectFile.GetValue();
+        params.rhiType = caRhiType.GetValue();
+
         Runtime::EngineHolder::Load("Editor", params);
         engine = &Runtime::EngineHolder::Get();
     }
-
-    void Core::InitializeRendering()
-    {
-        renderingModule = ::Core::ModuleManager::Get().FindOrLoadTyped<Rendering::RenderingModule>("Rendering");
-        Assert(renderingModule != nullptr);
-
-        Rendering::RenderingModuleInitParams initParams;
-        initParams.rhiType = RHI::RHIAbbrStringToRHIType(caRhiType.GetValue());
-        renderingModule->Initialize(initParams);
-    }
 }

Engine/Source/CMakeLists.txt

@@ -8,7 +8,6 @@ add_subdirectory(Mirror)
 add_subdirectory(Core)
 add_subdirectory(Render)
 add_subdirectory(Runtime)
-add_subdirectory(Rendering)
 
 add_subdirectory(RHI-Dummy)
 add_subdirectory(RHI-Vulkan)

Engine/Source/Common/CMakeLists.txt

@@ -4,7 +4,7 @@ AddLibrary(
     TYPE STATIC
     SRC ${SOURCES}
     PUBLIC_INC Include
-    LIB debugbreak cityhash taskflow fmt-lib rapidjson
+    LIB debugbreak cityhash taskflow rapidjson
 )
 
 file(GLOB TEST_SOURCES Test/*.cpp)