mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-09 13:01:49 +00:00
fix custom models solidity detection
This commit is contained in:
parent
fdd8d865d2
commit
02dbd01e73
1 changed files with 6 additions and 4 deletions
|
|
@ -39,16 +39,18 @@ std::unique_ptr<Content> ContentBuilder::build() {
|
||||||
} else {
|
} else {
|
||||||
def.defaults.rt.solid = isSolid(def.defaults) || def.explictlySolid;
|
def.defaults.rt.solid = isSolid(def.defaults) || def.explictlySolid;
|
||||||
}
|
}
|
||||||
if (def.material.empty()) {
|
def.rt.solid = def.defaults.rt.solid;
|
||||||
defaults.at("block-material").get(def.material);
|
|
||||||
}
|
|
||||||
|
|
||||||
const float EPSILON = 0.01f;
|
const float EPSILON = 0.01f;
|
||||||
def.rt.solid =
|
def.rt.solid = def.rt.solid &&
|
||||||
def.obstacle &&
|
def.obstacle &&
|
||||||
(glm::i8vec3(def.hitboxes[0].size() + EPSILON) == def.size);
|
(glm::i8vec3(def.hitboxes[0].size() + EPSILON) == def.size);
|
||||||
def.rt.extended = def.size.x > 1 || def.size.y > 1 || def.size.z > 1;
|
def.rt.extended = def.size.x > 1 || def.size.y > 1 || def.size.z > 1;
|
||||||
|
|
||||||
|
if (def.material.empty()) {
|
||||||
|
defaults.at("block-material").get(def.material);
|
||||||
|
}
|
||||||
|
|
||||||
if (def.rotatable) {
|
if (def.rotatable) {
|
||||||
for (uint i = 0; i < BlockRotProfile::MAX_COUNT; i++) {
|
for (uint i = 0; i < BlockRotProfile::MAX_COUNT; i++) {
|
||||||
def.rt.hitboxes[i].reserve(def.hitboxes.size());
|
def.rt.hitboxes[i].reserve(def.hitboxes.size());
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue