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

bugfix

Browse Source
This commit is contained in:
ouczbs 2024-05-31 00:36:23 +08:00
parent 3b5ae0c3a1
commit 02f0e58631
3 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/idk/script/ManagedType.cpp
View File

@ -70,7 +70,7 @@ namespace idk::mono
auto klass = Raw(); auto klass = Raw();
auto end_klass = envi.Type("Object")->Raw(); auto end_klass = envi.Type("Object")->Raw();
while (klass != end_klass) while (klass && klass != end_klass)
{ {
for (void* itr = nullptr; auto method = mono_class_get_methods(klass, &itr);) for (void* itr = nullptr; auto method = mono_class_get_methods(klass, &itr);)
{ {

10
src/engine/launcher/game_main.cpp
View File

@ -185,9 +185,9 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
Core::GetSystem<LogSystem>().SetLogDir(idk_app_data.string()); Core::GetSystem<LogSystem>().SetLogDir(idk_app_data.string());
c->Init(); c->Init();
auto exedir = Core::GetSystem<FileSystem>().GetExeDir();
auto project_dir = string{ Core::GetSystem<FileSystem>().GetExeDir() } +"/project/hydeandseek.idk"; auto project_dir = string{ exedir } + "/testproj/testproj.idk";
auto data_dir = string{ Core::GetSystem<FileSystem>().GetExeDir() }; auto data_dir = string{ exedir };
auto arg_proj = GetArgValue(L"--project", command_lines, num_args); auto arg_proj = GetArgValue(L"--project", command_lines, num_args);
auto arg_data = GetArgValue(L"--engine", command_lines, num_args); auto arg_data = GetArgValue(L"--engine", command_lines, num_args);
if (arg_proj) if (arg_proj)
@ -209,7 +209,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
data_dir = derp; data_dir = derp;
} }
auto& filesys = Core::GetSystem<FileSystem>(); auto& filesys = Core::GetSystem<FileSystem>();
filesys.Mount(string{ data_dir } + "/engine_data", "/engine_data", false); filesys.Mount(string{ data_dir } + "/engine/engine_data", "/engine_data", false);
Core::GetSystem<ProjectManager>().LoadProject(project_dir); Core::GetSystem<ProjectManager>().LoadProject(project_dir);
@ -248,7 +248,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
Core::GetResourceManager().RegisterLoader<GraphLoader>(shadergraph::Graph::ext); Core::GetResourceManager().RegisterLoader<GraphLoader>(shadergraph::Graph::ext);
Core::GetResourceManager().RegisterFactory<GraphFactory>(); Core::GetResourceManager().RegisterFactory<GraphFactory>();
filesys.Mount(string{ data_dir } +"/editor_data", "/editor_data", false); filesys.Mount(string{ exedir } + "/engine/editor_data", "/editor_data", false);
if (shadergraph::NodeTemplate::GetTable().empty()) if (shadergraph::NodeTemplate::GetTable().empty())
shadergraph::NodeTemplate::LoadTable("/editor_data/nodes"); shadergraph::NodeTemplate::LoadTable("/editor_data/nodes");

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());
} }
}; };*/
} }