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

update engine data

Browse Source
This commit is contained in:
ouczbs 2024-05-12 23:42:12 +08:00
parent 7ed1d342c3
commit f1add7af93
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -16,3 +16,5 @@ x64/
src/engine/idk/phys/PhysicsSystemNoMT.cpp src/engine/idk/phys/PhysicsSystemNoMT.cpp
*.log *.log
src/testproj/ src/testproj/
src/engine/editor_data/
src/engine/engine_data/

4
src/engine/idk/res/ResourceManager.cpp
View File

@ -172,10 +172,6 @@ namespace idk
instance = this; instance = this;
_resource_table = detail::ResourceHelper::GenResourceTables(); _resource_table = detail::ResourceHelper::GenResourceTables();
auto& fs = Core::GetSystem<FileSystem>();
auto exe_dir = string{ fs.GetExeDir() };
fs.Mount(exe_dir + "/engine_data", "/engine_data");
} }
void ResourceManager::LateInit() void ResourceManager::LateInit()

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

@ -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<char>(wch); }); std::transform(data_path.begin(), data_path.end(), derp.begin(), [](auto wch) {return static_cast<char>(wch); });
data_dir = derp; data_dir = derp;
} }
auto& filesys = Core::GetSystem<FileSystem>();
filesys.Mount(string{ data_dir } + "/engine_data", "/engine_data", false);
Core::GetSystem<ProjectManager>().LoadProject(project_dir); Core::GetSystem<ProjectManager>().LoadProject(project_dir);
@ -246,7 +248,6 @@ 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>();
auto& filesys = Core::GetSystem<FileSystem>();
filesys.Mount(string{ data_dir } +"/editor_data", "/editor_data", false); filesys.Mount(string{ data_dir } +"/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/VulkanState.cpp
View File

@ -310,7 +310,7 @@ namespace idk::vkn
{ {
result.present_family = static_cast<uint32_t>(i); result.present_family = static_cast<uint32_t>(i);
} }
if (family.queueFlags & vk::QueueFlagBits::eGraphics && family.queueCount>2) if (family.queueFlags & vk::QueueFlagBits::eGraphics)
{ {
result.graphics_family = static_cast<uint32_t>(i); result.graphics_family = static_cast<uint32_t>(i);
} }
@ -406,7 +406,7 @@ namespace idk::vkn
{ {
QueueFamilyIndices indices = findQueueFamilies(pdevice); QueueFamilyIndices indices = findQueueFamilies(pdevice);
m_queue_family = indices; 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] = {}; float queuePriority[num_queues] = {};
int num = 1; int num = 1;
for (auto& queuePri : queuePriority) for (auto& queuePri : queuePriority)

2
src/xmake.lua
View File

@ -46,7 +46,7 @@ target("game")
target("launcher") target("launcher")
set_kind("binary") 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_deps("editor", "win32")
add_syslinks("Xinput") add_syslinks("Xinput")
add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]]) add_defines([[TEST_DATA_PATH=R"($(ProjectDir)test_data)"]])