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

refactor a bit

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
src/content/ContentBuilder.cpp
View file

@ -29,13 +29,15 @@ std::unique_ptr<Content> ContentBuilder::build() {
def.rt.id = blockDefsIndices.size();
def.rt.emissive = *reinterpret_cast<uint32_t*>(def.emission);
// TODO: refactor
def.defaults.rt.solid = def.defaults.model.type == BlockModelType::BLOCK;
if (def.variants) {
for (auto& variant : def.variants->variants) {
variant.rt.solid = variant.model.type == BlockModelType::BLOCK;
}
def.defaults = def.variants->variants.at(0);
} else {
def.defaults.rt.solid = def.defaults.model.type == BlockModelType::BLOCK;
}
const float EPSILON = 0.01f;
def.rt.solid = glm::i8vec3(def.hitboxes[0].size() + EPSILON) == def.size;
def.rt.extended = def.size.x > 1 || def.size.y > 1 || def.size.z > 1;

4
src/content/loading/BlockLoader.cpp
View file

@ -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;