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

fix: crouching falling prevention does not reset velocity & fix small hitboxes horizontal collision

Browse source
This commit is contained in:
MihailRis 2026-02-13 03:51:46 +03:00
parent 0f63fd64ed
commit bfa8b7cf3d
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/physics/PhysicsSolver.cpp
View file

@ -65,6 +65,7 @@ void PhysicsSolver::step(
} }
if (!hitbox.grounded) { if (!hitbox.grounded) {
pos.z = pz; pos.z = pz;
vel.z = 0.0f;
} }
hitbox.grounded = false; hitbox.grounded = false;
for (int ix = 0; ix <= (half.x-E)*2/s; ix++) { for (int ix = 0; ix <= (half.x-E)*2/s; ix++) {
@ -79,6 +80,7 @@ void PhysicsSolver::step(
} }
if (!hitbox.grounded) { if (!hitbox.grounded) {
pos.x = px; pos.x = px;
vel.x = 0.0f;
} }
hitbox.grounded = true; hitbox.grounded = true;
} }
@ -152,17 +154,16 @@ static bool calc_collision_neg(
return false; return false;
} }
glm::vec3 offset(0.0f, stepHeight, 0.0f); glm::vec3 offset(0.0f, stepHeight, 0.0f);
for (int iy = 0; iy <= ((half-offset*0.5f)[ny]-E)*2/s; iy++) { for (int iy = 0; iy <= std::max<int>(1, ((half-offset*0.5f)[ny]-E)*2/s); iy++) {
glm::vec3 coord; glm::vec3 coord;
coord[ny] = ((pos+offset)[ny]-half[ny]+E) + iy * s; coord[ny] = ((pos+offset)[ny]-half[ny]+E) + iy * s;
for (int iz = 0; iz <= (half[nz]-E)*2/s; iz++){ for (int iz = 0; iz <= (half[nz]-E)*2/s; iz++){
coord[nz] = (pos[nz]-half[nz]+E) + iz * s; coord[nz] = (pos[nz]-half[nz]+E) + iz * s;
coord[nx] = (pos[nx]-half[nx]-E); coord[nx] = (pos[nx]-half[nx]-E);
if (const auto aabb = chunks.isObstacleAt(coord.x, coord.y, coord.z)) { if (const auto aabb = chunks.isObstacleAt(coord.x, coord.y, coord.z)) {
vel[nx] = 0.0f; vel[nx] = 0.0f;
float newx = std::floor(coord[nx]) + aabb->max()[nx] + half[nx] + E; float newx = std::floor(coord[nx]) + half[nx] + aabb->max()[nx] + E;
if (std::abs(newx-pos[nx]) <= MAX_FIX) { if (newx - pos[nx] <= E) {
pos[nx] = newx; pos[nx] = newx;
} }
return true; return true;
@ -185,7 +186,7 @@ static void calc_collision_pos(
return; return;
} }
glm::vec3 offset(0.0f, stepHeight, 0.0f); glm::vec3 offset(0.0f, stepHeight, 0.0f);
for (int iy = 0; iy <= ((half-offset*0.5f)[ny]-E)*2/s; iy++) { for (int iy = 0; iy <= std::max<int>(1, ((half-offset*0.5f)[ny]-E)*2/s); iy++) {
glm::vec3 coord; glm::vec3 coord;
coord[ny] = ((pos+offset)[ny]-half[ny]+E) + iy * s; coord[ny] = ((pos+offset)[ny]-half[ny]+E) + iy * s;
for (int iz = 0; iz <= (half[nz]-E)*2/s; iz++) { for (int iz = 0; iz <= (half[nz]-E)*2/s; iz++) {
@ -194,7 +195,7 @@ static void calc_collision_pos(
if (const auto aabb = chunks.isObstacleAt(coord.x, coord.y, coord.z)) { if (const auto aabb = chunks.isObstacleAt(coord.x, coord.y, coord.z)) {
vel[nx] = 0.0f; vel[nx] = 0.0f;
float newx = std::floor(coord[nx]) - half[nx] + aabb->min()[nx] - E; float newx = std::floor(coord[nx]) - half[nx] + aabb->min()[nx] - E;
if (std::abs(newx-pos[nx]) <= MAX_FIX) { if (newx - pos[nx] <= E) {
pos[nx] = newx; pos[nx] = newx;
} }
return; return;
@ -211,7 +212,7 @@ void PhysicsSolver::colisionCalc(
const glm::vec3 half, const glm::vec3 half,
float stepHeight float stepHeight
) { ) {
// step size (smaller - more accurate, but slower) // step size (smaller - more accurate, but slower) // TODO: GET RID OF THIS
float s = 2.0f/BLOCK_AABB_GRID; float s = 2.0f/BLOCK_AABB_GRID;
stepHeight = calc_step_height(chunks, pos, half, stepHeight, s); stepHeight = calc_step_height(chunks, pos, half, stepHeight, s);
@ -224,7 +225,7 @@ void PhysicsSolver::colisionCalc(
calc_collision_neg<2, 1, 0>(chunks, pos, vel, half, stepHeight, s); calc_collision_neg<2, 1, 0>(chunks, pos, vel, half, stepHeight, s);
calc_collision_pos<2, 1, 0>(chunks, pos, vel, half, stepHeight, s); calc_collision_pos<2, 1, 0>(chunks, pos, vel, half, stepHeight, s);
if (calc_collision_neg<1, 0, 2>(chunks, pos, vel, half, stepHeight, s)) { if (calc_collision_neg<1, 0, 2>(chunks, pos, vel, half, 0.0f, s)) {
hitbox.grounded = true; hitbox.grounded = true;
} }