From 3ba604a91047c45f1136ce410631bfcf85612816 Mon Sep 17 00:00:00 2001 From: ouczbs Date: Fri, 24 May 2024 14:01:40 +0800 Subject: [PATCH] launcher add reflect register --- ...Window_DisplayComponentInnerSpecializations.cpp | 4 ++-- src/engine/vkn/VknRenderTargetFactory.cpp | 14 ++++++++------ src/test/test/TestMeta.cpp | 11 ++++------- src/xmake.lua | 1 + 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp b/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp index 03dcd53..92a000a 100644 --- a/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp +++ b/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp @@ -176,11 +176,11 @@ namespace idk ImGui::TextDisabled("Values driven by Canvas."); return; } - if (c_rt->GetGameObject()->HasComponent()) + /*if (c_rt->GetGameObject()->HasComponent()) { ImGui::TextDisabled("Values driven by AspectRatioFitter."); return; - } + }*/ const float region_width = ImGui::GetWindowContentRegionWidth(); diff --git a/src/engine/vkn/VknRenderTargetFactory.cpp b/src/engine/vkn/VknRenderTargetFactory.cpp index 28d3064..7a0b94a 100644 --- a/src/engine/vkn/VknRenderTargetFactory.cpp +++ b/src/engine/vkn/VknRenderTargetFactory.cpp @@ -36,12 +36,14 @@ namespace idk::vkn auto result = RenderTargetFactory::GenerateDefaultResource(); - auto& m = *RscHandle{}; - - m.size = uvec2{ Core::GetSystem().GetScreenSize() }; - if (m.ColorGradingLut == RscHandle{}) - m.ColorGradingLut = RscHandle{GetDefaultColorGradeGuid()}; - m.Name("Default RenderTarget"); + auto pm = RscHandle{}; + if (pm) { + auto& m = *pm; + m.size = uvec2{ Core::GetSystem().GetScreenSize() }; + if (m.ColorGradingLut == RscHandle{}) + m.ColorGradingLut = RscHandle{ GetDefaultColorGradeGuid() }; + m.Name("Default RenderTarget"); + } return result; } diff --git a/src/test/test/TestMeta.cpp b/src/test/test/TestMeta.cpp index 5226031..ca60feb 100644 --- a/src/test/test/TestMeta.cpp +++ b/src/test/test/TestMeta.cpp @@ -2,15 +2,12 @@ #include "ReflectReg_Components.inl" #include #include +#include +#include int main(int argc, char** argv) { - /* - vk::UniqueDevice m_device; - vk::GraphicsPipelineCreateInfo pipelineInfo; - auto dispatch = vk::DispatchLoaderDynamic{}; - vk::UniqueHandle pipeline1 = m_device->createGraphicsPipelineUnique({}, pipelineInfo, nullptr, dispatch).value; - vk::UniquePipeline pipeline2 = m_device->createGraphicsPipelineUnique({}, pipelineInfo, nullptr, {}).value; - */ + idk::MetaBundle m; + serialize_text(m); testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/src/xmake.lua b/src/xmake.lua index cbbea2d..ff0553d 100644 --- a/src/xmake.lua +++ b/src/xmake.lua @@ -53,6 +53,7 @@ target("launcher") add_defines([[TEST_BIN_DIR=R"($(OutDir))"]]) add_includedirs("engine", "engine/launcher", {public = true}) add_files("engine/launcher/*.cpp") + add_files("engine/game/*.cpp|editor_main.cpp|AddSystems.cpp") add_headerfiles("engine/launcher/*.h") target("opengl")