mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-22 18:39:46 +00:00
fixes
This commit is contained in:
parent
bf8d9e827a
commit
103f3b2b05
1 changed files with 41 additions and 18 deletions
|
|
@ -44,6 +44,16 @@ static glm::vec3 calc_collsion_velocity_result(
|
||||||
return (mA * vA + mB * vB + a.elasticity * mB * (vB - vA)) / (mA + mB);
|
return (mA * vA + mB * vB + a.elasticity * mB * (vB - vA)) / (mA + mB);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void integrate(
|
||||||
|
Hitbox& box, const glm::vec3& gravity, float dt, uint substeps
|
||||||
|
) {
|
||||||
|
float n = static_cast<float>(substeps);
|
||||||
|
auto accel = gravity * box.gravityScale;
|
||||||
|
box.position += box.velocity * (dt * n) +
|
||||||
|
accel * (dt * dt * n * (n + 2.0f) * 0.5f);
|
||||||
|
box.velocity += accel * (dt * n);
|
||||||
|
}
|
||||||
|
|
||||||
static void push_body(Hitbox& box, int axis, float value, uint wakeSubstep) {
|
static void push_body(Hitbox& box, int axis, float value, uint wakeSubstep) {
|
||||||
if (box.velocity[axis] != value) {
|
if (box.velocity[axis] != value) {
|
||||||
box.velocity[axis] = value;
|
box.velocity[axis] = value;
|
||||||
|
|
@ -274,8 +284,9 @@ void PhysicsSolver::calcCollisions(
|
||||||
float z = (pos.z - half.z + E) + iz;
|
float z = (pos.z - half.z + E) + iz;
|
||||||
float y = (pos.y + half.y + E) - E;
|
float y = (pos.y + half.y + E) - E;
|
||||||
if (auto aabb = chunks.isObstacleAt(x, y, z, boxAABB)) {
|
if (auto aabb = chunks.isObstacleAt(x, y, z, boxAABB)) {
|
||||||
float newy = std::floor(y) - half.y + aabb->min().y - E;
|
float bottom = std::floor(y) + aabb->min().y;
|
||||||
if (pos.y >= newy) {
|
float newy = bottom - half.y - E;
|
||||||
|
if (pos.y >= newy && pos.y - half.y < bottom) {
|
||||||
vel.y = -hitbox.elasticity * vel.y;
|
vel.y = -hitbox.elasticity * vel.y;
|
||||||
pos.y = newy;
|
pos.y = newy;
|
||||||
}
|
}
|
||||||
|
|
@ -660,6 +671,9 @@ void PhysicsSolver::rebuildNearbySolids(size_t index, float time) {
|
||||||
static uint calc_substep_stride(
|
static uint calc_substep_stride(
|
||||||
const Hitbox& hitbox, const glm::vec3& gravity, float dt, uint left
|
const Hitbox& hitbox, const glm::vec3& gravity, float dt, uint left
|
||||||
) {
|
) {
|
||||||
|
if (hitbox.crouching) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
float speed = glm::length(hitbox.velocity);
|
float speed = glm::length(hitbox.velocity);
|
||||||
float accel = glm::length(gravity) * glm::abs(hitbox.gravityScale) * 1.5f;
|
float accel = glm::length(gravity) * glm::abs(hitbox.gravityScale) * 1.5f;
|
||||||
float time;
|
float time;
|
||||||
|
|
@ -719,25 +733,34 @@ void PhysicsSolver::step(
|
||||||
if (hitbox->nextSubstep > i) {
|
if (hitbox->nextSubstep > i) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
float substepTime =
|
|
||||||
dt * static_cast<float>(i + 1 - hitbox->doneSubsteps);
|
|
||||||
glm::vec3& pos = hitbox->position;
|
|
||||||
hitbox->prevPosition = hitbox->position;
|
hitbox->prevPosition = hitbox->position;
|
||||||
hitbox->substepTime = substepTime;
|
hitbox->substepTime =
|
||||||
calcSubstep(
|
dt * static_cast<float>(i + 1 - hitbox->doneSubsteps);
|
||||||
*hitbox,
|
while (hitbox->doneSubsteps <= i) {
|
||||||
hitbox->velocity,
|
uint left = i + 1 - hitbox->doneSubsteps;
|
||||||
pos,
|
uint skip = calc_substep_stride(*hitbox, gravity, dt, left) - 1;
|
||||||
substepTime,
|
if (skip > 0) {
|
||||||
nearbySolids[j]
|
integrate(*hitbox, gravity, dt, skip);
|
||||||
);
|
hitbox->doneSubsteps += skip;
|
||||||
scheduleSubstep(*hitbox, i + 1, substeps, dt);
|
}
|
||||||
|
calcSubstep(
|
||||||
|
*hitbox,
|
||||||
|
hitbox->velocity,
|
||||||
|
hitbox->position,
|
||||||
|
dt,
|
||||||
|
nearbySolids[j]
|
||||||
|
);
|
||||||
|
hitbox->doneSubsteps++;
|
||||||
|
|
||||||
auto moved = glm::abs(pos - nearbyOrigins[j]);
|
auto moved = glm::abs(hitbox->position - nearbyOrigins[j]);
|
||||||
if (glm::max(moved.x, glm::max(moved.y, moved.z)) >
|
if (glm::max(moved.x, glm::max(moved.y, moved.z)) >
|
||||||
nearbyBudgets[j]) {
|
nearbyBudgets[j]) {
|
||||||
rebuildNearbySolids(j, dt * static_cast<float>(substeps - i));
|
rebuildNearbySolids(
|
||||||
|
j, dt * static_cast<float>(substeps - i)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
scheduleSubstep(*hitbox, i + 1, substeps, dt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue