voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-13 15:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cleanup

Browse source
This commit is contained in:
MihailRis 2026-03-11 22:13:41 +03:00
parent 4b4f2439c0
commit 38b478bc8d
3 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/physics/Hitbox.cpp
View file

@ -1,7 +1,5 @@
#include "Hitbox.hpp" #include "Hitbox.hpp"
#include <stdexcept>
Hitbox::Hitbox( Hitbox::Hitbox(
entityid_t entity, BodyType type, glm::vec3 position, glm::vec3 halfsize entityid_t entity, BodyType type, glm::vec3 position, glm::vec3 halfsize
) )

31
src/physics/PhysicsSolver.cpp
View file

@ -392,9 +392,8 @@ void PhysicsSolver::step(
for (auto hitbox : hitboxes) { for (auto hitbox : hitboxes) {
float linearDamping = hitbox->linearDamping * hitbox->friction; float linearDamping = hitbox->linearDamping * hitbox->friction;
glm::vec3& pos = hitbox->position;
glm::vec3& vel = hitbox->velocity;
glm::vec3& vel = hitbox->velocity;
vel.x /= 1.0f + delta * linearDamping; vel.x /= 1.0f + delta * linearDamping;
vel.z /= 1.0f + delta * linearDamping; vel.z /= 1.0f + delta * linearDamping;
if (hitbox->verticalDamping > 0.0f) { if (hitbox->verticalDamping > 0.0f) {
@ -406,12 +405,20 @@ void PhysicsSolver::step(
hitbox->groundVelocity = {}; hitbox->groundVelocity = {};
} }
AABB aabb; updateSensors(*hitbox);
aabb.a = pos - hitbox->getHalfSize(); hitbox->friction = glm::abs(hitbox->gravityScale <= 1e-7f)
aabb.b = pos + hitbox->getHalfSize(); ? 8.0f
: (!hitbox->prevGrounded ? 2.0f : 10.0f);
}
}
void PhysicsSolver::updateSensors(Hitbox& hitbox) {
auto aabb = hitbox.getAABB();
for (size_t i = 0; i < sensors.size(); i++) { for (size_t i = 0; i < sensors.size(); i++) {
auto& sensor = *sensors[i]; auto& sensor = *sensors[i];
if (sensor.entity == hitbox->entity) { if (sensor.entity == hitbox.entity) {
continue; continue;
} }
bool triggered = false; bool triggered = false;
@ -421,21 +428,17 @@ void PhysicsSolver::step(
break; break;
case SensorType::RADIUS: case SensorType::RADIUS:
triggered = glm::distance2( triggered = glm::distance2(
pos, glm::vec3(sensor.calculated.radial)) hitbox.position, glm::vec3(sensor.calculated.radial))
< sensor.calculated.radial.w; < sensor.calculated.radial.w;
break; break;
} }
if (!triggered) { if (!triggered) {
continue; continue;
} }
if (sensor.prevEntered.find(hitbox->entity) == sensor.prevEntered.end()) { if (sensor.prevEntered.find(hitbox.entity) == sensor.prevEntered.end()) {
sensor.enterCallback(sensor.entity, sensor.index, hitbox->entity); sensor.enterCallback(sensor.entity, sensor.index, hitbox.entity);
} }
sensor.nextEntered.insert(hitbox->entity); sensor.nextEntered.insert(hitbox.entity);
}
hitbox->friction = glm::abs(hitbox->gravityScale <= 1e-7f)
? 8.0f
: (!hitbox->prevGrounded ? 2.0f : 10.0f);
} }
} }

2
src/physics/PhysicsSolver.hpp
View file

@ -58,4 +58,6 @@ private:
float dt, float dt,
int substeps int substeps
); );
void updateSensors(Hitbox& hitbox);
}; };