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

cleaning up code, adaptive CCD displacement tick

Browse Source 
Former-commit-id: dff86e81e174f3cb12a3b5fde54d67104f84f146
Former-commit-id: 349213aafe52ddbd52ed7b58d42a81237a84ee3d
This commit is contained in:
Song Minjae
2016-12-17 11:38:43 +09:00
parent 3ab4c167c8
commit a3f226444f
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/net/torvald/terrarum/gameactors/ActorWithBody.kt
View File

@@ -324,12 +324,6 @@ open class ActorWithBody : Actor() {
override fun update(gc: GameContainer, delta: Int) { override fun update(gc: GameContainer, delta: Int) {
if (isUpdate && !flagDespawn) { if (isUpdate && !flagDespawn) {
/**
* Temporary variables to reset
*/
ccdCollided = false
/******************************/
if (!assertPrinted) assertInit() if (!assertPrinted) assertInit()
// make NoClip work for player // make NoClip work for player
@@ -507,8 +501,11 @@ open class ActorWithBody : Actor() {
// do some CCD between hitbox and nextHitbox // do some CCD between hitbox and nextHitbox
val ccdDelta = (nextHitbox.toVector() - hitbox.toVector()) val ccdDelta = (nextHitbox.toVector() - hitbox.toVector())
if (ccdDelta.x != 0.0 || ccdDelta.y != 0.0) if (ccdDelta.x != 0.0 || ccdDelta.y != 0.0) {
ccdDelta.set(ccdDelta.setMagnitude(CCD_TICK)) //ccdDelta.set(ccdDelta.setMagnitude(CCD_TICK)) // fixed tick
val displacement = Math.min(1.0.div(velocity.magnitude * 2), 0.5) // adaptive tick
ccdDelta.set(ccdDelta.setMagnitude(displacement))
}
//println("deltaMax: $deltaMax") //println("deltaMax: $deltaMax")
//println("ccdDelta: $ccdDelta") //println("ccdDelta: $ccdDelta")
@@ -560,9 +557,9 @@ open class ActorWithBody : Actor() {
if (isNoCollideWorld) return false if (isNoCollideWorld) return false
// offsets will stretch and shrink detection box according to the argument // offsets will stretch and shrink detection box according to the argument
val x1: Double; val x1: Double
val x2: Double; val x2: Double
val y1: Double; val y1: Double
val y2: Double val y2: Double
if (option == COLLIDING_LR || option == COLLIDING_UD) { if (option == COLLIDING_LR || option == COLLIDING_UD) {
val offsetX = if (option == COLLIDING_LR) A_PIXEL else 0.0 val offsetX = if (option == COLLIDING_LR) A_PIXEL else 0.0
@@ -615,9 +612,9 @@ open class ActorWithBody : Actor() {
} }
private fun isTouchingSide(hitbox: Hitbox, option: Int): Boolean { private fun isTouchingSide(hitbox: Hitbox, option: Int): Boolean {
val x1: Double; val x1: Double
val x2: Double; val x2: Double
val y1: Double; val y1: Double
val y2: Double val y2: Double
if (option == COLLIDING_TOP) { if (option == COLLIDING_TOP) {
x1 = hitbox.posX x1 = hitbox.posX
@@ -655,9 +652,9 @@ open class ActorWithBody : Actor() {
private fun isCollidingSide(hitbox: Hitbox, option: Int): Boolean { private fun isCollidingSide(hitbox: Hitbox, option: Int): Boolean {
val x1: Double; val x1: Double
val x2: Double; val x2: Double
val y1: Double; val y1: Double
val y2: Double val y2: Double
if (option == COLLIDING_TOP) { if (option == COLLIDING_TOP) {
x1 = hitbox.posX x1 = hitbox.posX