refactor a bit

This commit is contained in:
MihailRis
2025-07-14 00:02:29 +03:00
parent 5fdff1f8f6
commit 29021d1178
6 changed files with 14 additions and 6 deletions
+1
View File
@@ -128,6 +128,7 @@ void Block::cloneTo(Block& dst) {
for (int i = 0; i < 6; i++) {
dst.defaults = defaults;
}
dst.defaults = defaults;
if (variants) {
dst.variants = std::make_unique<Variants>(*variants);
}
+2 -1
View File
@@ -161,6 +161,7 @@ struct Variant {
};
struct Variants {
/// First variant is copy of Block::defaults
util::stack_vector<Variant, BLOCK_MAX_VARIANTS> variants {};
};
@@ -294,7 +295,7 @@ public:
constexpr const Variant& getVariant(uint8_t bits) const {
if (bits == 0 || variants == nullptr)
return defaults;
return variants->variants[(bits - 1) % BLOCK_MAX_VARIANTS];
return variants->variants[bits % BLOCK_MAX_VARIANTS];
}
constexpr const BlockModel& getModel(uint8_t bits) const {