ouczbs/idk_me
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

竟然能跑起来了

Browse Source
This commit is contained in:
ouczbs 2024-08-07 17:11:47 +08:00
parent fceac0db7d
commit b773525efe
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/editor/windows/IGE_ProjectWindow.cpp
View File

@ -672,8 +672,10 @@ namespace idk {
current_dir = path; current_dir = path;
filter.Clear(); filter.Clear();
} }
else else {
OnAssetDoubleClicked.Fire(Core::GetSystem<IDE>().GetSelectedObjects().assets[0]); auto& ps = Core::GetSystem<IDE>().GetSelectedObjects();
OnAssetDoubleClicked.Fire(ps.assets[0]);
}
} }
} }

3
src/engine/idk/script/ScriptSystem.cpp
View File

@ -63,7 +63,8 @@ namespace idk::mono
assert(monoPath); assert(monoPath);
auto& filesys = Core::GetSystem<FileSystem>(); auto& filesys = Core::GetSystem<FileSystem>();
filesys.Mount(monoPath, "/mono"); 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_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) { mono_trace_set_print_handler([](const char* string, [[maybe_unused]] mono_bool is_stdout) {
LOG_TO(LogPool::MONO, string); LOG_TO(LogPool::MONO, string);

2
src/engine/vkn/FrameGraphBuilder.cpp
View File

@ -206,7 +206,7 @@ namespace idk::vkn
origin_nodes.emplace(rsc.id, id); origin_nodes.emplace(rsc.id, id);
auto src_id = rsc_manager.GetPrevious(rsc.id); auto src_id = rsc_manager.GetPrevious(rsc.id);
//If this is not earliest. //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)); resource_layouts.emplace(rsc.id,resource_layouts.at(*src_id));
} }

4
src/engine/vkn/VulkanHashes.h
View File

@ -4,7 +4,7 @@
namespace std namespace std
{ {
/*template<> template<>
struct hash<vk::DescriptorSetLayout> struct hash<vk::DescriptorSetLayout>
{ {
size_t operator()(const vk::DescriptorSetLayout& dsl)const size_t operator()(const vk::DescriptorSetLayout& dsl)const
@ -27,5 +27,5 @@ namespace std
{ {
return reinterpret_cast<intptr_t>(s.operator VkSemaphore()); return reinterpret_cast<intptr_t>(s.operator VkSemaphore());
} }
};*/ };
} }

4
src/test/test/TestMeta.cpp
View File

@ -6,8 +6,8 @@
#include <res/MetaBundle.h> #include <res/MetaBundle.h>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
idk::MetaBundle m; idk::Guid m;
serialize_text(m); string res = serialize_text(m);
testing::InitGoogleTest(&argc, argv); testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }

2
xmake.lua
View File

@ -7,7 +7,7 @@ set_config("vs_toolset", "14.2")
set_toolchains("msvc") set_toolchains("msvc")
set_runtimes("MDd") set_runtimes("MDd")
-- 添加 /bigobj 编译选项 -- 添加 /bigobj 编译选项
add_cxflags("/bigobj", "-MDd", {force = true}) add_cxflags("/bigobj", {force = true})
includes("src/xmake.lua") includes("src/xmake.lua")
--__std_find_trivial_1 msvc 版本不一致会有这个报错 --__std_find_trivial_1 msvc 版本不一致会有这个报错
--xmake project -k vsxmake2022 -a x64 --xmake project -k vsxmake2022 -a x64