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

fix: non-local players hitboxes incorrect behaviour

Browse Source
This commit is contained in:
MihailRis 2025-04-02 18:54:27 +03:00
parent 149d095e6d
commit 21ff042aa3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/objects/Player.cpp
View File

@ -82,6 +82,17 @@ void Player::updateEntity() {
"will be respawned"; "will be respawned";
eid = ENTITY_AUTO; eid = ENTITY_AUTO;
} }
auto hitbox = getHitbox();
if (hitbox == nullptr) {
return;
}
hitbox->linearDamping = PLAYER_GROUND_DAMPING;
hitbox->verticalDamping = flight;
hitbox->gravityScale = flight ? 0.0f : 1.0f;
if (flight || !hitbox->grounded) {
hitbox->linearDamping = PLAYER_AIR_DAMPING;
}
hitbox->type = noclip ? BodyType::KINEMATIC : BodyType::DYNAMIC;
} }
Hitbox* Player::getHitbox() { Hitbox* Player::getHitbox() {
@ -129,12 +140,7 @@ void Player::updateInput(PlayerInput& input, float delta) {
dir = glm::normalize(dir); dir = glm::normalize(dir);
hitbox->velocity += dir * speed * delta * 9.0f; hitbox->velocity += dir * speed * delta * 9.0f;
} }
hitbox->linearDamping = PLAYER_GROUND_DAMPING;
hitbox->verticalDamping = flight;
hitbox->gravityScale = flight ? 0.0f : 1.0f;
if (flight) { if (flight) {
hitbox->linearDamping = PLAYER_AIR_DAMPING;
if (input.jump) { if (input.jump) {
hitbox->velocity.y += speed * delta * 9; hitbox->velocity.y += speed * delta * 9;
} }
@ -142,15 +148,9 @@ void Player::updateInput(PlayerInput& input, float delta) {
hitbox->velocity.y -= speed * delta * 9; hitbox->velocity.y -= speed * delta * 9;
} }
} }
if (!hitbox->grounded) {
hitbox->linearDamping = PLAYER_AIR_DAMPING;
}
if (input.jump && hitbox->grounded) { if (input.jump && hitbox->grounded) {
hitbox->velocity.y = JUMP_FORCE; hitbox->velocity.y = JUMP_FORCE;
} }
hitbox->type = noclip ? BodyType::KINEMATIC : BodyType::DYNAMIC;
} }
void Player::updateSelectedEntity() { void Player::updateSelectedEntity() {