From f8435711ddac96c500ee108f0ecb6d3e15b15ee1 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Mon, 1 May 2017 08:00:07 +0900 Subject: [PATCH] no message --- .../torvald/terrarum/gameactors/ActorWithPhysics.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt b/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt index b63b93058..8b8ec4a77 100644 --- a/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt +++ b/src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt @@ -534,7 +534,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean /** * nextHitbox must NOT be altered before this method is called! */ - private fun displaceByCCD() { + @Deprecated("It's stupid anyway.") private fun displaceByCCD() { ccdCollided = false if (!isNoCollideWorld) { @@ -561,6 +561,17 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean } } + /** + * nextHitbox must NOT be altered before this method is called! + */ + private fun resolveWorldCollision() { + // First of all: Rules + // 1. If two sides are touching each other (they share exactly same coord along one axis), + // they are not colliding (just touching) + // 2. If two sides are embedded into each other, they are colliding. + } + + private fun hitAndReflectX() { // when it sticks, externalForce.x goes back and forth /*