PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix Entities.hasBlockingInside

Browse Source
This commit is contained in:
MihailRis 2024-07-10 06:40:10 +03:00
parent 93565d19ad
commit 5874abff98
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/objects/Entities.cpp
View File

@ -405,9 +405,9 @@ void Entities::render(Assets* assets, ModelBatch& batch, const Frustum& frustum,
} }
bool Entities::hasBlockingInside(AABB aabb) { bool Entities::hasBlockingInside(AABB aabb) {
auto view = registry.view<EntityId, Transform>(); auto view = registry.view<EntityId, Transform, Rigidbody>();
for (auto [entity, eid, transform] : view.each()) { for (auto [entity, eid, transform, body] : view.each()) {
if (eid.def.blocking && aabb.contains(transform.pos)) { if (eid.def.blocking && aabb.intersect(body.hitbox.getAABB())) {
return true; return true;
} }
} }

4
src/physics/Hitbox.hpp
View File

@ -57,6 +57,10 @@ struct Hitbox {
bool crouching = false; bool crouching = false;
Hitbox(BodyType type, glm::vec3 position, glm::vec3 halfsize); Hitbox(BodyType type, glm::vec3 position, glm::vec3 halfsize);
AABB getAABB() const {
return AABB(position-halfsize, position+halfsize);
}
}; };
#endif // PHYSICS_HITBOX_HPP_ #endif // PHYSICS_HITBOX_HPP_