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

Fixed 'onground' && turning-off flight mode if onground

Browse Source
This commit is contained in:
MihailRis 2022-03-06 02:38:20 +03:00 committed by GitHub
parent 30c2d9889e
commit 07e2fe8b3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/physics/PhysicsSolver.cpp
View File

@ -11,6 +11,7 @@ PhysicsSolver::PhysicsSolver(vec3 gravity) : gravity(gravity) {
} }
void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting, float gravityScale) { void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned substeps, bool shifting, float gravityScale) {
hitbox->grounded = false;
for (unsigned i = 0; i < substeps; i++){ for (unsigned i = 0; i < substeps; i++){
float dt = delta / (float)substeps; float dt = delta / (float)substeps;
float linear_damping = hitbox->linear_damping; float linear_damping = hitbox->linear_damping;
@ -75,7 +76,6 @@ void PhysicsSolver::step(Chunks* chunks, Hitbox* hitbox, float delta, unsigned s
} }
} }
hitbox->grounded = false;
if (vel.y < 0.0){ if (vel.y < 0.0){
for (int x = floor(pos.x-half.x+E); x <= floor(pos.x+half.x-E); x++){ for (int x = floor(pos.x-half.x+E); x <= floor(pos.x+half.x-E); x++){
bool broken = false; bool broken = false;

6
src/voxel_engine.cpp
View File

@ -117,6 +117,8 @@ void update_controls(PhysicsSolver* physics,
camera->position.y = hitbox->position.y + 0.5f; camera->position.y = hitbox->position.y + 0.5f;
camera->position.z = hitbox->position.z; camera->position.z = hitbox->position.z;
if (player->flight && hitbox->grounded)
player->flight = false;
// Camera shaking // Camera shaking
player->interpVel = player->interpVel * (1.0f - delta * 5) + hitbox->velocity * delta * 0.1f; player->interpVel = player->interpVel * (1.0f - delta * 5) + hitbox->velocity * delta * 0.1f;
if (hitbox->grounded && player->interpVel.y < 0.0f){ if (hitbox->grounded && player->interpVel.y < 0.0f){
@ -132,6 +134,10 @@ void update_controls(PhysicsSolver* physics,
if (Events::jpressed(GLFW_KEY_F)){ if (Events::jpressed(GLFW_KEY_F)){
player->flight = !player->flight; player->flight = !player->flight;
if (player->flight){
hitbox->velocity.y += 1;
hitbox->grounded = false;
}
} }
// Field of view manipulations // Field of view manipulations