MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-19 19:26:36 +02:00
Code Issues Projects Releases Wiki Activity

update to entt master (v3.6.0-pre)

Browse Source
This commit is contained in:
Green Sky
2020-11-25 21:41:36 +01:00
parent 840b663d5e
commit 7cf434d877
8 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/tilemap/src/mm/tilemap.cpp
View File

@ -210,6 +210,7 @@ bool Tilemap::parseTiled_Layers(MM::Engine& engine, MM::Scene& scene, nlohmann::
}
bool Tilemap::parseTiled_Tileset(MM::Engine& engine, std::string_view src_path, nlohmann::json& jts, uint32_t first_g_id) {
using namespace entt::literals;
auto& fs = engine.getService<MM::Services::FilesystemService>();
auto& rm_t = MM::ResourceManager<MM::OpenGL::Texture>::ref();