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

feat: new linear damping behaviour

Browse source
This commit is contained in:
MihailRis 2026-03-13 02:53:43 +03:00
parent f4e55f9938
commit 06d03f889c
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/physics/PhysicsSolver.cpp
View file

@ -30,14 +30,15 @@ static float calc_step_height(
AABB aabb(-half, +half); AABB aabb(-half, +half);
aabb.scale(glm::vec3(1.0f - E * 2, 1.0f, 1.0f - E * 2)); aabb.scale(glm::vec3(1.0f - E * 2, 1.0f, 1.0f - E * 2));
aabb = aabb + pos + glm::vec3(0.0f, stepHeight, 0.0f); aabb = aabb + pos + glm::vec3(0.0f, stepHeight, 0.0f);
if (stepHeight > 0.0f) { if (stepHeight <= 0.0f) {
for (int ix = 0; ix <= glm::ceil((half.x - E) * 2); ix++) { return stepHeight;
float x = (pos.x - half.x) + ix; }
for (int iz = 0; iz <= glm::ceil((half.z - E) * 2); iz++) { for (int ix = 0; ix <= glm::ceil((half.x - E) * 2); ix++) {
float z = (pos.z - half.z) + iz; float x = (pos.x - half.x) + ix;
if (chunks.isObstacleAt(x, pos.y + half.y + stepHeight, z, aabb)) { for (int iz = 0; iz <= glm::ceil((half.z - E) * 2); iz++) {
return 0.0f; float z = (pos.z - half.z) + iz;
} if (chunks.isObstacleAt(x, pos.y + half.y + stepHeight, z, aabb)) {
return 0.0f;
} }
} }
} }
@ -293,11 +294,9 @@ void PhysicsSolver::calcSubstep(
int substeps int substeps
) { ) {
if (glm::length2(hitbox.groundVelocity) > 1e-6f) { if (glm::length2(hitbox.groundVelocity) > 1e-6f) {
pos.x += hitbox.groundVelocity.x;
if (hitbox.groundVelocity.y < 0.0f) { if (hitbox.groundVelocity.y < 0.0f) {
pos.y += hitbox.groundVelocity.y; pos.y += hitbox.groundVelocity.y;
} }
pos.z += hitbox.groundVelocity.z;
} }
auto initpos = pos; auto initpos = pos;
@ -386,8 +385,10 @@ void PhysicsSolver::step(
float linearDamping = hitbox->linearDamping * hitbox->friction; float linearDamping = hitbox->linearDamping * hitbox->friction;
glm::vec3& vel = hitbox->velocity; glm::vec3& vel = hitbox->velocity;
vel.x /= 1.0f + delta * linearDamping; auto diff = hitbox->groundVelocity / dt - vel;
vel.z /= 1.0f + delta * linearDamping; vel.x += diff.x * delta * linearDamping;
vel.z += diff.z * delta * linearDamping;
if (hitbox->verticalDamping > 0.0f) { if (hitbox->verticalDamping > 0.0f) {
vel.y /= 1.0f + delta * linearDamping * hitbox->verticalDamping; vel.y /= 1.0f + delta * linearDamping * hitbox->verticalDamping;
} }