voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 04:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'main' into heightmaps

Browse source
This commit is contained in:
MihailRis 2024-08-23 00:01:57 +03:00
commit f2395dede8
9 changed files with 256 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/content/ContentLoader.hpp
View file

@ -46,13 +46,13 @@ class ContentLoader {
static void loadCustomBlockModel(Block& def, dynamic::Map* primitives);
static void loadBlockMaterial(BlockMaterial& def, const fs::path& file);
static void loadBlock(
void loadBlock(
Block& def, const std::string& name, const fs::path& file
);
static void loadItem(
void loadItem(
ItemDef& def, const std::string& name, const fs::path& file
);
static void loadEntity(
void loadEntity(
EntityDef& def, const std::string& name, const fs::path& file
);
void loadResources(ResourceType type, dynamic::List* list);