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

improve floor collision physics (add mass)

Browse source
This commit is contained in:
MihailRis 2026-03-14 17:46:23 +03:00
parent fc57e98a96
commit 3bcb7f7e70
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/physics/Hitbox.hpp
View file

@ -64,6 +64,8 @@ struct Hitbox {
float gravityScale = 1.0f;
bool crouching = false;
float stepHeight = 0.5f;
float mass = 1.0f;
float elasticity = 0.0f;
std::string material;
std::string groundMaterial;
glm::vec3 groundVelocity {};

14
src/physics/PhysicsSolver.cpp
View file

@ -141,9 +141,18 @@ bool PhysicsSolver::calcCollisionNegY(
if (pos.y < newy && glm::abs(pos.y - newy) < boxhalf.y) {
pos.y = newy;
}
const auto& vA = hitbox.velocity;
const auto& vB = box->velocity;
const auto& mA = hitbox.mass;
const auto& mB = box->mass;
auto velA = (mA * vA + mB * vB + hitbox.elasticity * mB * (vB - vA)) / (mA + mB);
auto velB = (mA * vA + mB * vB + box->elasticity * mA * (vA - vB)) / (mA + mB);
hitbox.groundVelocity = box->position - box->prevPosition;
if (vel.y < hitbox.groundVelocity.y / dt) {
vel.y = hitbox.groundVelocity.y / dt * (1.0f - E);
vel.y = velA.y;
box->velocity.y = velB.y;
if (hitbox.groundMaterial.empty() && !box->material.empty()) {
hitbox.groundMaterial = box->material;
}
@ -171,8 +180,9 @@ bool PhysicsSolver::calcCollisionNegY(
if (const auto obstacle =
chunks.isObstacleAt(coord.x, coord.y, coord.z, aabb)) {
float newy = std::floor(coord.y) + half.y + obstacle->max().y;
if (newy >= pos.y) {
vel.y = 0.0f;
vel.y = -hitbox.elasticity * vel.y;
pos.y = newy;
}
return true;