diff --git a/src/engine/editor/windows/IGE_ProjectWindow.cpp b/src/engine/editor/windows/IGE_ProjectWindow.cpp index 73b70c2..a8f76a2 100644 --- a/src/engine/editor/windows/IGE_ProjectWindow.cpp +++ b/src/engine/editor/windows/IGE_ProjectWindow.cpp @@ -672,8 +672,10 @@ namespace idk { current_dir = path; filter.Clear(); } - else - OnAssetDoubleClicked.Fire(Core::GetSystem().GetSelectedObjects().assets[0]); + else { + auto& ps = Core::GetSystem().GetSelectedObjects(); + OnAssetDoubleClicked.Fire(ps.assets[0]); + } } } diff --git a/src/engine/idk/script/ScriptSystem.cpp b/src/engine/idk/script/ScriptSystem.cpp index 1a73c96..0a00492 100644 --- a/src/engine/idk/script/ScriptSystem.cpp +++ b/src/engine/idk/script/ScriptSystem.cpp @@ -63,7 +63,8 @@ namespace idk::mono assert(monoPath); auto& filesys = Core::GetSystem(); filesys.Mount(monoPath, "/mono"); - mono_set_assemblies_path("mono/lib/mono/4.5"); + string sssemblies = filesys.GetFullPath("/mono/lib/mono/4.5"); + mono_set_assemblies_path(sssemblies.c_str()); mono_set_dirs(filesys.GetFullPath("/mono/lib/").data(), filesys.GetFullPath("/mono/etc/").data()); mono_trace_set_print_handler([](const char* string, [[maybe_unused]] mono_bool is_stdout) { LOG_TO(LogPool::MONO, string); diff --git a/src/engine/vkn/FrameGraphBuilder.cpp b/src/engine/vkn/FrameGraphBuilder.cpp index 4c2eda1..7e609ac 100644 --- a/src/engine/vkn/FrameGraphBuilder.cpp +++ b/src/engine/vkn/FrameGraphBuilder.cpp @@ -206,7 +206,7 @@ namespace idk::vkn origin_nodes.emplace(rsc.id, id); auto src_id = rsc_manager.GetPrevious(rsc.id); //If this is not earliest. - if (rsc_manager.GetPrevious(*src_id)) + if (src_id && rsc_manager.GetPrevious(*src_id)) { resource_layouts.emplace(rsc.id,resource_layouts.at(*src_id)); } diff --git a/src/engine/vkn/VulkanHashes.h b/src/engine/vkn/VulkanHashes.h index 0762ae3..a274b8d 100644 --- a/src/engine/vkn/VulkanHashes.h +++ b/src/engine/vkn/VulkanHashes.h @@ -4,7 +4,7 @@ namespace std { - /*template<> + template<> struct hash { size_t operator()(const vk::DescriptorSetLayout& dsl)const @@ -27,5 +27,5 @@ namespace std { return reinterpret_cast(s.operator VkSemaphore()); } - };*/ + }; } diff --git a/src/test/test/TestMeta.cpp b/src/test/test/TestMeta.cpp index ca60feb..2db4399 100644 --- a/src/test/test/TestMeta.cpp +++ b/src/test/test/TestMeta.cpp @@ -6,8 +6,8 @@ #include int main(int argc, char** argv) { - idk::MetaBundle m; - serialize_text(m); + idk::Guid m; + string res = serialize_text(m); testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); } diff --git a/xmake.lua b/xmake.lua index b660098..1d87a49 100644 --- a/xmake.lua +++ b/xmake.lua @@ -7,7 +7,7 @@ set_config("vs_toolset", "14.2") set_toolchains("msvc") set_runtimes("MDd") -- 添加 /bigobj 编译选项 -add_cxflags("/bigobj", "-MDd", {force = true}) +add_cxflags("/bigobj", {force = true}) includes("src/xmake.lua") --__std_find_trivial_1 msvc 版本不一致会有这个报错 --xmake project -k vsxmake2022 -a x64