PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update ContentType naming

Browse Source
This commit is contained in:
MihailRis
2024-08-14 00:47:57 +03:00
parent 7da8e133a5
commit cae314bc36
7 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/content/ContentBuilder.hpp
+7 -7
View File
@@ -12,8 +12,8 @@
template <class T>
class ContentUnitBuilder {
std::unordered_map<std::string, contenttype>& allNames;
contenttype type;
std::unordered_map<std::string, ContentType>& allNames;
ContentType type;
void checkIdentifier(const std::string& id) {
const auto& found = allNames.find(id);
@@ -28,7 +28,7 @@ public:
std::vector<std::string> names;
ContentUnitBuilder(
std::unordered_map<std::string, contenttype>& allNames, contenttype type
std::unordered_map<std::string, ContentType>& allNames, ContentType type
)
: allNames(allNames), type(type) {
}
@@ -54,11 +54,11 @@ class ContentBuilder {
UptrsMap<std::string, BlockMaterial> blockMaterials;
UptrsMap<std::string, rigging::SkeletonConfig> skeletons;
UptrsMap<std::string, ContentPackRuntime> packs;
std::unordered_map<std::string, contenttype> allNames;
std::unordered_map<std::string, ContentType> allNames;
public:
ContentUnitBuilder<Block> blocks {allNames, contenttype::block};
ContentUnitBuilder<ItemDef> items {allNames, contenttype::item};
ContentUnitBuilder<EntityDef> entities {allNames, contenttype::entity};
ContentUnitBuilder<Block> blocks {allNames, ContentType::BLOCK};
ContentUnitBuilder<ItemDef> items {allNames, ContentType::ITEM};
ContentUnitBuilder<EntityDef> entities {allNames, ContentType::ENTITY};
ResourceIndicesSet resourceIndices {};
~ContentBuilder();