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

feat: horizontal solid entities collision & increase code duplication

Browse source
This commit is contained in:
MihailRis 2026-02-24 18:45:31 +03:00
parent ad5089f383
commit 6aa7739c42
1 changed files with 69 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/physics/PhysicsSolver.cpp
View file

@ -52,6 +52,37 @@ static void calc_collision_pos(
bool (&collided)[3] bool (&collided)[3]
) { ) {
glm::vec3 offset(0.0f, stepHeight + E, 0.0f); glm::vec3 offset(0.0f, stepHeight + E, 0.0f);
for (auto box : solidHitboxes) {
if (glm::distance2(box->position, pos) < E) {
continue;
}
auto boxhalf = box->getHalfSize();
auto boxAABB = AABB(pos - half, pos + half);
glm::vec3 scale(1.0f);
scale[nz] = 1.0f - E * 2.0f;
scale[ny] = 1.0f - E * 2.0f;
boxAABB.scale(scale);
boxAABB = boxAABB + offset;
boxAABB.b.y -= stepHeight + E * 2;
if (box->getAABB().intersects(boxAABB)) {
float newnegx = box->position[nx] - boxhalf[nx] - half[nx] - E;
float newposx = box->position[nx] + boxhalf[nx] + half[nx] + E;
float newx;
if (glm::abs(newnegx - pos[nx]) < glm::abs(newposx - pos[nx])) {
newx = newnegx;
} else {
continue;
}
if (pos[nx] > newx) {
if (vel[nx] > 0.0f) {
vel[nx] = 0.0f;
}
pos[nx] = newx;
collided[nx] = true;
}
}
}
if (vel[nx] <= 0.0f) { if (vel[nx] <= 0.0f) {
return; return;
} }
@ -93,6 +124,37 @@ static bool calc_collision_neg(
bool (&collided)[3] bool (&collided)[3]
) { ) {
glm::vec3 offset(0.0f, stepHeight + E, 0.0f); glm::vec3 offset(0.0f, stepHeight + E, 0.0f);
for (auto box : solidHitboxes) {
if (glm::distance2(box->position, pos) < E) {
continue;
}
auto boxhalf = box->getHalfSize();
auto boxAABB = AABB(pos - half, pos + half);
glm::vec3 scale(1.0f);
scale[nz] = 1.0f - E * 2.0f;
scale[ny] = 1.0f - E * 2.0f;
boxAABB.scale(scale);
boxAABB = boxAABB + offset;
boxAABB.b.y -= stepHeight + E * 2;
if (box->getAABB().intersects(boxAABB)) {
float newnegx = box->position[nx] - boxhalf[nx] - half[nx] - E;
float newposx = box->position[nx] + boxhalf[nx] + half[nx] + E;
float newx;
if (glm::abs(newnegx - pos[nx]) > glm::abs(newposx - pos[nx])) {
newx = newposx;
} else {
continue;
}
if (pos[nx] < newx) {
if (vel[nx] < 0.0f) {
vel[nx] = 0.0f;
}
pos[nx] = newx;
collided[nx] = true;
}
}
}
if (vel[nx] >= 0.0f) { if (vel[nx] >= 0.0f) {
return false; return false;
} }
@ -136,8 +198,14 @@ static bool calc_collision_neg_y(
if (glm::distance2(box->position, pos) < E) { if (glm::distance2(box->position, pos) < E) {
continue; continue;
} }
auto boxAABB = AABB(pos - half, pos + half);
glm::vec3 scale(1.0f);
scale.x = 1.0f - E * 4.0f;
scale.z = 1.0f - E * 4.0f;
boxAABB.scale(scale);
auto boxhalf = box->getHalfSize(); auto boxhalf = box->getHalfSize();
if (box->getAABB().intersects(AABB(pos - half, pos + half))) { if (box->getAABB().intersects(boxAABB)) {
float newy = box->position.y + boxhalf.y + half.y; float newy = box->position.y + boxhalf.y + half.y;
if (pos.y < newy) { if (pos.y < newy) {
pos.y = newy; pos.y = newy;