From bd33ce408a016d56473ef01e12d7491ba2d0f2c1 Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Wed, 7 Jul 2021 23:23:27 +0530 Subject: [PATCH] Reduce physics timestep to fix internal edge collision lmao --- marblegame.hl | Bin 1776057 -> 1776099 bytes src/Marble.hx | 8 ++++---- src/MarbleWorld.hx | 3 ++- src/collision/CollisionEntity.hx | 2 +- src/gui/EndGameGui.hx | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/marblegame.hl b/marblegame.hl index 5e723a9f3ae452c7ada369a9809c2ea5ab8b9496..879be063df14250ff121a3bd56c93aa9d78449df 100644 GIT binary patch delta 15491 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 0) { var f1 = this.velocity.sub(contacts[k].velocity).add(dir.multiply(soFar)).dot(contacts[k].normal); var f2 = timeToSeparate * f1; @@ -808,21 +808,21 @@ class Marble extends GameObject { if (timeRemaining <= 0) break; - var timeStep = 0.008; + var timeStep = 0.002; if (timeRemaining < timeStep) timeStep = timeRemaining; if (this.controllable) { for (interior in pathedInteriors) { interior.pushTickState(); - interior.recomputeVelocity(piTime + timeStep * 2, timeStep * 2); + interior.recomputeVelocity(piTime + timeStep * 4, timeStep * 4); } } var intersectT = this.getIntersectionTime(timeStep, velocity); if (intersectT < timeStep && intersectT >= 0.001) { - // intersectT *= 0.8; // We uh tick the shit to not actually at the contact time cause bruh + intersectT *= 0.8; // We uh tick the shit to not actually at the contact time cause bruh // intersectT /= 2; var diff = timeStep - intersectT; // this.velocity = this.velocity.sub(A.multiply(diff)); diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index daa29a05..f8ff7880 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -998,7 +998,8 @@ class MarbleWorld extends Scheduler { return q; } - var quatChange = getRotQuat(oldUp, vec); + var quatChange = new Quat(); + quatChange.initMoveTo(oldUp, vec); // Instead of calculating the new quat from nothing, calculate it from the last one to guarantee the shortest possible rotation. // quatChange.initMoveTo(oldUp, vec); quatChange.multiply(quatChange, currentQuat); diff --git a/src/collision/CollisionEntity.hx b/src/collision/CollisionEntity.hx index ecd977b1..137e0bb0 100644 --- a/src/collision/CollisionEntity.hx +++ b/src/collision/CollisionEntity.hx @@ -136,7 +136,7 @@ class CollisionEntity implements IOctreeObject { var supportVec = surface.support(normal, tform); if (!(supportVec.equals(v0) || supportVec.equals(v) || supportVec.equals(v2))) { - normal = surfacenormal; + // normal = surfacenormal; } // We find the normal that is closest to the surface normal, sort of fixes weird edge cases of when colliding with diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx index 1d70bc17..d14eec53 100644 --- a/src/gui/EndGameGui.hx +++ b/src/gui/EndGameGui.hx @@ -122,7 +122,7 @@ class EndGameGui extends GuiControl { leftColumn.extent = new Vector(208, 50); pg.addChild(leftColumn); - var elapsedTime = Math.max(timeState.currentAttemptTime - 5.5, 0); + var elapsedTime = Math.max(timeState.currentAttemptTime - 3.5, 0); var bonusTime = Math.max(0, elapsedTime - timeState.gameplayClock); var rightColumn = new GuiMLText(domcasual32, mlFontLoader);