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

Merge branch 'main' into headless-mode

Browse source
This commit is contained in:
MihailRis 2024-12-21 09:03:30 +03:00
commit ba0610d857
22 changed files with 191 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/content/ContentLoader.cpp
View file

@ -239,10 +239,18 @@ void ContentLoader::loadBlock(
}
def.model = *model;
} else if (!modelTypeName.empty()) {
logger.error() << "unknown model " << modelTypeName;
logger.error() << "unknown model: " << modelTypeName;
def.model = BlockModel::none;
}
std::string cullingModeName = to_string(def.culling);
root.at("culling").get(cullingModeName);
if (auto mode = CullingMode_from(cullingModeName)) {
def.culling = *mode;
} else {
logger.error() << "unknown culling mode: " << cullingModeName;
}
root.at("material").get(def.material);
// rotation profile