curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Song Minjae
2017-05-01 08:00:07 +09:00
parent 4a6effff96
commit f8435711dd
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/torvald/terrarum/gameactors/ActorWithPhysics.kt
View File

@@ -534,7 +534,7 @@ open class ActorWithPhysics(renderOrder: RenderOrder, val immobileBody: Boolean
/** /**
* nextHitbox must NOT be altered before this method is called! * nextHitbox must NOT be altered before this method is called!
*/ */
private fun displaceByCCD() { @Deprecated("It's stupid anyway.") private fun displaceByCCD() {
ccdCollided = false ccdCollided = false
if (!isNoCollideWorld) { 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() { private fun hitAndReflectX() {
// when it sticks, externalForce.x goes back and forth // when it sticks, externalForce.x goes back and forth
/* /*