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

cleanup

Browse source
This commit is contained in:
MihailRis 2026-03-11 23:11:23 +03:00
parent 38b478bc8d
commit b7cd116e62
3 changed files with 16 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/physics/PhysicsSolver.cpp
View file

@ -17,7 +17,7 @@ inline constexpr float MAX_FIX = 0.15f;
static debug::Logger logger("physics-solver");
PhysicsSolver::PhysicsSolver(glm::vec3 gravity) : gravity(std::move(gravity)) {}
PhysicsSolver::PhysicsSolver(const GlobalChunks& chunks, glm::vec3 gravity) : chunks(chunks), gravity(std::move(gravity)) {}
static float calc_step_height(
const GlobalChunks& chunks,
@ -116,12 +116,7 @@ static void calc_collision(
}
}
static bool calc_collision_neg_y(
Hitbox& hitbox,
const GlobalChunks& chunks,
const std::vector<Hitbox*>& solidHitboxes,
const glm::vec3& half
) {
bool PhysicsSolver::calcCollisionNegY(Hitbox& hitbox, const glm::vec3& half) {
auto& pos = hitbox.position;
auto& vel = hitbox.velocity;
@ -183,10 +178,9 @@ static bool calc_collision_neg_y(
}
void PhysicsSolver::calcCollisions(
const GlobalChunks& chunks,
Hitbox& hitbox,
glm::vec3& vel,
glm::vec3& pos,
Hitbox& hitbox,
glm::vec3& vel,
glm::vec3& pos,
const glm::vec3& half,
float stepHeight
) {
@ -205,7 +199,7 @@ void PhysicsSolver::calcCollisions(
calc_collision<2, 1, 0, 1>(hitbox, chunks, solidHitboxes, half, stepHeight);
pos.x = xpos;
if (calc_collision_neg_y(hitbox, chunks, solidHitboxes, half)) {
if (calcCollisionNegY(hitbox, half)) {
hitbox.grounded = true;
}
@ -290,7 +284,6 @@ void PhysicsSolver::calcCollisions(
}
void PhysicsSolver::calcSubstep(
const GlobalChunks& chunks,
Hitbox& hitbox,
glm::vec3& vel,
glm::vec3& pos,
@ -311,7 +304,6 @@ void PhysicsSolver::calcSubstep(
if (hitbox.type == BodyType::DYNAMIC) {
calcCollisions(
chunks,
hitbox,
vel,
pos,
@ -369,9 +361,7 @@ void PhysicsSolver::calcSubstep(
}
void PhysicsSolver::step(
const GlobalChunks& chunks,
float delta,
uint substeps
const GlobalChunks& chunks, float delta, uint substeps
) {
for (auto hitbox : hitboxes) {
hitbox->groundMaterial.clear();
@ -386,7 +376,7 @@ void PhysicsSolver::step(
glm::vec3& pos = hitbox->position;
glm::vec3& vel = hitbox->velocity;
hitbox->prevPosition = hitbox->position;
calcSubstep(chunks, *hitbox, vel, pos, dt, substeps);
calcSubstep(*hitbox, vel, pos, dt, substeps);
}
}
@ -412,7 +402,6 @@ void PhysicsSolver::step(
}
}
void PhysicsSolver::updateSensors(Hitbox& hitbox) {
auto aabb = hitbox.getAABB();