mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-04 18:41:51 +00:00
restore player 0.28 controls
This commit is contained in:
parent
dde8c674b8
commit
5f2c0f69ce
3 changed files with 11 additions and 8 deletions
|
|
@ -180,7 +180,6 @@ bool PhysicsSolver::calcCollisionNegY(
|
|||
if (vel.y >= 0.0f) {
|
||||
return false;
|
||||
}
|
||||
hitbox.groundVelocity = {};
|
||||
for (int ix = 0; ix <= glm::ceil((half.x - E) * 2); ix++) {
|
||||
glm::vec3 coord;
|
||||
coord.x = (pos.x - half.x + E) + ix;
|
||||
|
|
@ -202,6 +201,7 @@ bool PhysicsSolver::calcCollisionNegY(
|
|||
vel.y = -hitbox.elasticity * vel.y;
|
||||
pos.y = newy;
|
||||
}
|
||||
hitbox.groundVelocity = {};
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -398,6 +398,10 @@ void PhysicsSolver::step(
|
|||
for (auto hitbox : hitboxes) {
|
||||
float linearDamping = hitbox->linearDamping;
|
||||
|
||||
if (hitbox->grounded) {
|
||||
linearDamping = 10.0f; // TODO: add friction to material
|
||||
}
|
||||
|
||||
glm::vec3& vel = hitbox->velocity;
|
||||
auto diff = hitbox->groundVelocity - vel;
|
||||
vel.x += diff.x * delta * linearDamping;
|
||||
|
|
@ -407,7 +411,7 @@ void PhysicsSolver::step(
|
|||
vel.y /= 1.0f + delta * linearDamping * hitbox->verticalDamping;
|
||||
}
|
||||
if (!hitbox->grounded) {
|
||||
hitbox->groundVelocity = {};
|
||||
hitbox->groundVelocity *= 1.0f - delta;
|
||||
}
|
||||
|
||||
updateSensors(*hitbox);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue