diff --git a/.gitignore b/.gitignore index 5ca5788..197e128 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ x64/ src/engine/idk/phys/PhysicsSystemNoMT.cpp *.log src/testproj/ +src/engine/editor_data/ +src/engine/engine_data/ diff --git a/src/engine/idk/res/ResourceManager.cpp b/src/engine/idk/res/ResourceManager.cpp index 8ab16dd..7a03621 100644 --- a/src/engine/idk/res/ResourceManager.cpp +++ b/src/engine/idk/res/ResourceManager.cpp @@ -172,10 +172,6 @@ namespace idk instance = this; _resource_table = detail::ResourceHelper::GenResourceTables(); - - auto& fs = Core::GetSystem(); - auto exe_dir = string{ fs.GetExeDir() }; - fs.Mount(exe_dir + "/engine_data", "/engine_data"); } void ResourceManager::LateInit() diff --git a/src/engine/launcher/game_main.cpp b/src/engine/launcher/game_main.cpp index 80d602d..06fb7a1 100644 --- a/src/engine/launcher/game_main.cpp +++ b/src/engine/launcher/game_main.cpp @@ -208,6 +208,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, std::transform(data_path.begin(), data_path.end(), derp.begin(), [](auto wch) {return static_cast(wch); }); data_dir = derp; } + auto& filesys = Core::GetSystem(); + filesys.Mount(string{ data_dir } + "/engine_data", "/engine_data", false); Core::GetSystem().LoadProject(project_dir); @@ -246,7 +248,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, Core::GetResourceManager().RegisterLoader(shadergraph::Graph::ext); Core::GetResourceManager().RegisterFactory(); - auto& filesys = Core::GetSystem(); filesys.Mount(string{ data_dir } +"/editor_data", "/editor_data", false); if (shadergraph::NodeTemplate::GetTable().empty()) shadergraph::NodeTemplate::LoadTable("/editor_data/nodes"); diff --git a/src/engine/vkn/VulkanState.cpp b/src/engine/vkn/VulkanState.cpp index 36fd0ca..76ed772 100644 --- a/src/engine/vkn/VulkanState.cpp +++ b/src/engine/vkn/VulkanState.cpp @@ -310,7 +310,7 @@ namespace idk::vkn { result.present_family = static_cast(i); } - if (family.queueFlags & vk::QueueFlagBits::eGraphics && family.queueCount>2) + if (family.queueFlags & vk::QueueFlagBits::eGraphics) { result.graphics_family = static_cast(i); } @@ -406,7 +406,7 @@ namespace idk::vkn { QueueFamilyIndices indices = findQueueFamilies(pdevice); m_queue_family = indices; - constexpr uint32_t num_queues = 2;//this be hack + constexpr uint32_t num_queues = 1;//this be hack float queuePriority[num_queues] = {}; int num = 1; for (auto& queuePri : queuePriority) diff --git a/src/xmake.lua b/src/xmake.lua index 979e488..b983437 100644 --- a/src/xmake.lua +++ b/src/xmake.lua @@ -46,7 +46,7 @@ target("game") target("launcher") set_kind("binary") - set_runargs("--project:$(curdir)/testproj/testproj.idk", "--engine:$(curdir)/engine") + set_runargs("--project:$(projectdir)\\src\\testproj\\testproj.idk", "--engine:$(projectdir)\\src\\engine") add_deps("editor", "win32") add_syslinks("Xinput") add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])