voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 12:31:51 +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-09-19 15:16:14 +03:00
commit bf9f81a98c
74 changed files with 1885 additions and 1782 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/content/ContentLoader.hpp
View file

@ -5,6 +5,7 @@
#include <string>
#include "content_fwd.hpp"
#include "data/dv.hpp"
namespace fs = std::filesystem;
@ -19,11 +20,6 @@ class ContentBuilder;
class ContentPackRuntime;
struct ContentPackStats;
namespace dynamic {
class Map;
class List;
}
class ContentLoader {
const ContentPack* pack;
ContentPackRuntime* runtime;
@ -44,7 +40,7 @@ class ContentLoader {
GeneratorDef& def, const std::string& full, const std::string& name
);
static void loadCustomBlockModel(Block& def, dynamic::Map* primitives);
static void loadCustomBlockModel(Block& def, const dv::value& primitives);
static void loadBlockMaterial(BlockMaterial& def, const fs::path& file);
void loadBlock(
Block& def, const std::string& name, const fs::path& file
@ -55,13 +51,13 @@ class ContentLoader {
void loadEntity(
EntityDef& def, const std::string& name, const fs::path& file
);
void loadResources(ResourceType type, dynamic::List* list);
void loadResources(ResourceType type, const dv::value& list);
public:
ContentLoader(ContentPack* pack, ContentBuilder& builder);
bool fixPackIndices(
const fs::path& folder,
dynamic::Map* indicesRoot,
dv::value& indicesRoot,
const std::string& contentSection
);
void fixPackIndices();