mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-07 20:11:50 +00:00
refactor a bit
This commit is contained in:
parent
5fdff1f8f6
commit
29021d1178
6 changed files with 14 additions and 6 deletions
|
|
@ -122,6 +122,7 @@ template<> void ContentUnitLoader<Block>::loadUnit(
|
|||
if (stateBased.has("variants")) {
|
||||
const auto& variants = stateBased["variants"];
|
||||
def.variants = std::make_unique<Variants>();
|
||||
def.variants->variants.push_back(def.defaults);
|
||||
for (int i = 0; i < variants.size(); i++) {
|
||||
Variant variant = def.defaults;
|
||||
load_variant(variant, variants[i], name);
|
||||
|
|
@ -198,7 +199,8 @@ template<> void ContentUnitLoader<Block>::loadUnit(
|
|||
"block " + util::quote(def.name) + ": invalid block size"
|
||||
);
|
||||
}
|
||||
// FIXME
|
||||
|
||||
// should variant modify hitbox?
|
||||
if (def.defaults.model.type == BlockModelType::BLOCK &&
|
||||
(def.size.x != 1 || def.size.y != 1 || def.size.z != 1)) {
|
||||
def.defaults.model.type = BlockModelType::AABB;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue