some classes in sprite assembler is now internal

(because it really works :p)

src/net/torvald/spriteassembler/ADProperties.kt

@@ -7,11 +7,11 @@ import java.util.*
 import kotlin.collections.HashMap
 import kotlin.collections.HashSet
 
-data class Joint(val name: String, val position: ADPropertyObject.Vector2i) {
+internal data class Joint(val name: String, val position: ADPropertyObject.Vector2i) {
     override fun toString() = "$name $position"
 }
 
-data class Skeleton(val name: String, val joints: List<Joint>) {
+internal data class Skeleton(val name: String, val joints: List<Joint>) {
     override fun toString() = "$name=$joints"
 }
 
@@ -22,12 +22,12 @@ data class Skeleton(val name: String, val joints: List<Joint>) {
  * @param frames number of frames this animation has
  * @param skeleton list of joints to be transformed
  */
-data class Animation(val name: String, val delay: Float, val row: Int, val frames: Int, val skeleton: Skeleton) {
+internal data class Animation(val name: String, val delay: Float, val row: Int, val frames: Int, val skeleton: Skeleton) {
     override fun toString() = "$name delay: $delay, row: $row, frames: $frames, skeleton: ${skeleton.name}"
 }
 
 /** Later the 'translate' can be changed so that it represents affine transformation (Matrix2d) */
-data class Transform(val joint: Joint, val translate: ADPropertyObject.Vector2i) {
+internal data class Transform(val joint: Joint, val translate: ADPropertyObject.Vector2i) {
     override fun toString() = "$joint transform: $translate"
 }
 
@@ -41,11 +41,11 @@ class ADProperties {
     lateinit var bodyparts: List<String>; private set
     lateinit var bodypartFiles: List<String>; private set
     /** properties that are being used as skeletons (SKELETON_STAND) */
-    lateinit var skeletons: HashMap<String, Skeleton>; private set
+    internal lateinit var skeletons: HashMap<String, Skeleton>; private set
     /** properties that are recognised as animations (ANIM_RUN, ANIM)IDLE) */
-    lateinit var animations: HashMap<String, Animation>; private set
+    internal lateinit var animations: HashMap<String, Animation>; private set
     /** an "animation frame" property (ANIM_RUN_1, ANIM_RUN_2) */
-    lateinit var transforms: HashMap<String, List<Transform>>; private set
+    internal lateinit var transforms: HashMap<String, List<Transform>>; private set
 
     private val reservedProps = listOf("SPRITESHEET", "EXTENSION")
     private val animMustContain = listOf("DELAY", "ROW", "SKELETON")
@@ -56,7 +56,7 @@ class ADProperties {
     var frameHeight: Int = -1; private set
     var originX: Int = -1; private set
     var originY: Int = -1; private set
-    val origin: ADPropertyObject.Vector2i
+    internal val origin: ADPropertyObject.Vector2i
         get() = ADPropertyObject.Vector2i(originX, originY)
 
     private val animFrameSuffixRegex = Regex("""_[0-9]+""")
@@ -209,11 +209,11 @@ class ADProperties {
     fun toFilename(partName: String) =
             "${this.baseFilename}${partName.toLowerCase()}${this.extension}"
 
-    fun getAnimByFrameName(frameName: String) = animations[getAnimNameFromFrame(frameName)]!!
-    fun getFrameNumberFromName(frameName: String) = frameName.substring(frameName.lastIndexOf('_') + 1 until frameName.length).toInt()
+    internal fun getAnimByFrameName(frameName: String) = animations[getAnimNameFromFrame(frameName)]!!
+    internal fun getFrameNumberFromName(frameName: String) = frameName.substring(frameName.lastIndexOf('_') + 1 until frameName.length).toInt()
 
-    fun getSkeleton(name: String) = skeletons[name]!!
-    fun getTransform(name: String) = transforms[name]!!
+    internal fun getSkeleton(name: String) = skeletons[name]!!
+    internal fun getTransform(name: String) = transforms[name]!!
 
     private fun getAnimNameFromFrame(s: String) = s.substring(0 until s.lastIndexOf('_'))
 
@@ -271,7 +271,7 @@ class ADPropertyObject(propertyRaw: String) {
         }
     }
 
-    companion object {
+    internal companion object {
         private val floatRegex = Regex("""-?[0-9]+(\.[0-9]*)?""")
         private val ivec2Regex = Regex("""-?[0-9]+,-?[0-9]+""")
         private val variableInputSepRegex = Regex(""" +""")
@@ -292,7 +292,7 @@ class ADPropertyObject(propertyRaw: String) {
         fun isADstring(property: String) = !isADvariable(property)
     }
 
-    data class Vector2i(var x: Int, var y: Int) {
+    internal data class Vector2i(var x: Int, var y: Int) {
         override fun toString() = "($x, $y)"
 
         operator fun plus(other: Vector2i) = Vector2i(this.x + other.x, this.y + other.y)

src/net/torvald/spriteassembler/AssembleFrameGdx.kt

@@ -89,7 +89,7 @@ object AssembleSheetPixmap {
 
 }
 
-object AssembleFrameBase {
+internal object AssembleFrameBase {
     /**
      * Returns joints list with tranform applied.
      * @param skeleton list of joints

src/net/torvald/terrarum/AppLoader.java

@@ -207,6 +207,8 @@ public class AppLoader implements ApplicationListener {
         Gdx.gl20.glViewport(0, 0, width, height);
     }
 
+    public static final double UPDATE_RATE = 1.0 / 61.0; // TODO set it like 1/100, because apparent framerate is limited by update rate
+
     private float loadTimer = 0f;
     private final float showupTime = 100f / 1000f;
 
@@ -235,7 +237,7 @@ public class AppLoader implements ApplicationListener {
         updateFullscreenQuad(appConfig.width, appConfig.height);
     }
 
-    private static double _kalman_xhat_k = 1.0 / 60.0;
+    private static double _kalman_xhat_k = UPDATE_RATE;
     private static double _kalman_return_value = _kalman_xhat_k;
     private static double _kalman_p_k = 1.0;
     private static final double _kalman_R = 0.2; // 0.2: empirical value
@@ -254,7 +256,7 @@ public class AppLoader implements ApplicationListener {
     }
 
     public static void resetDeltaSmoothingHistory() {
-        _kalman_xhat_k = 1.0 / 60.0;
+        _kalman_xhat_k = UPDATE_RATE;
         _kalman_p_k = 1.0;
     }
 
@@ -365,7 +367,7 @@ public class AppLoader implements ApplicationListener {
         }
         // draw the screen
         else {
-            screen.render(((float) getSmoothDelta()));
+            screen.render((float) UPDATE_RATE);
         }
 
         // nested FBOs are just not a thing in GL!

src/net/torvald/terrarum/Terrarum.kt

@@ -74,22 +74,12 @@ object Terrarum : Screen {
         get() = HEIGHT.ushr(1)
 
     /**
-     * To be used with physics simulator
+     * To be used with physics simulator. This is a magic number.
      */
     val PHYS_TIME_FRAME: Double = 26.0 + (2.0 / 3.0)
-    val PHYS_CONST_MULT: Double = 60.0 / (26.0 + (2.0 / 3.0))
-    val PHYS_REF_FPS: Double = 60.0
     // 26.0 + (2.0 / 3.0) // lower value == faster gravity response (IT WON'T HOTSWAP!!)
     // protip: using METER, game unit and SI unit will have same number
 
-    /**
-     * To be used with render, to achieve smooth frame drawing
-     * TARGET_INTERNAL_FPS > PHYS_TIME_FRAME for smooth frame drawing
-     */
-    val TARGET_INTERNAL_FPS: Double = 60.0
-
-
-
 
 
     var previousScreen: Screen? = null // to be used with temporary states like StateMonitorCheck
@@ -483,13 +473,9 @@ object Terrarum : Screen {
         get() = Gdx.input.x
     inline val mouseScreenY: Int
         get() = Gdx.input.y
-    /** Bigger than 1.0 */
+    /** Delta converted as it it was a FPS */
     inline val updateRate: Double
         get() = 1.0 / AppLoader.getSmoothDelta()
-    /** Smaller than 1.0 */
-    val renderRate = 1.0 / TARGET_INTERNAL_FPS
-    val renderRateStr = TARGET_INTERNAL_FPS.toString()
-
     /**
      * Usage:
      *

src/net/torvald/terrarum/TitleScreen.kt

@@ -199,23 +199,11 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
     private val introUncoverTime: Second = 0.3f
     private var introUncoverDeltaCounter = 0f
     private var updateDeltaCounter = 0.0
-    protected val renderRate = Terrarum.renderRate
 
     override fun render(delta: Float) {
-        // async update
-        updateDeltaCounter += delta
-        if (delta < 1f / 10f) { // discard async if measured FPS <= 10
-            var updateTries = 0
-            while (updateDeltaCounter >= renderRate && updateTries < 6) {
-                updateScreen(delta)
-                updateDeltaCounter -= renderRate
-                updateTries++
-            }
-        }
-        else {
-            updateScreen(delta)
-        }
+        // TODO async update
 
+        updateScreen(delta)
         // render? just do it anyway
         renderScreen()
     }

src/net/torvald/terrarum/gameactors/ActorWBMovable.kt

@@ -95,7 +95,7 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
         )
 
     /**
-     * TODO Pixels per 1/60 seconds.
+     * Unit: Pixels per 1/60 (or AppLoader.UPDATE_RATE) seconds.
      *
      * When the engine resolves this value, the framerate must be accounted for. E.g.:
      *  3.0 is resolved as 3.0 if FPS is 60, but the same value should be resolved as 6.0 if FPS is 30.
@@ -109,15 +109,21 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
      * Acceleration: used in code like:
      *     veloY += 3.0
      * +3.0 is acceleration. You __accumulate__ acceleration to the velocity.
+     *
+     * V for Velocity!
      */
-    internal val externalForce = Vector2(0.0, 0.0)
+    internal val externalV = Vector2(0.0, 0.0)
 
     @Transient private val VELO_HARD_LIMIT = 100.0
 
     /**
+     * Unit: Pixels per 1/60 (or AppLoader.UPDATE_RATE) seconds.
+     *
      * for "Controllable" actors
+     *
+     * V for Velocity!
      */
-    var controllerMoveDelta: Vector2? = if (this is Controllable) Vector2() else null
+    var controllerV: Vector2? = if (this is Controllable) Vector2() else null
 
     // not sure we need this...
     //var jumpable = true // this is kind of like "semaphore"
@@ -348,23 +354,17 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
      * @param acc : Acceleration in Vector2
      */
     fun applyForce(acc: Vector2) {
-        externalForce += acc * speedMultByTile
+        externalV += acc * speedMultByTile
     }
 
     private val bounceDampenVelThreshold = 0.5
 
-    override fun update(fdelta: Float) {
+    override fun update(delta: Float) {
         if (isUpdate && !flagDespawn) {
-
-            //val delta = Gdx.graphics.rawDeltaTime.toDouble()
-            val delta = AppLoader.getSmoothDelta()
-            //println("${Gdx.graphics.rawDeltaTime.toDouble()}\t${AppLoader.getSmoothDelta()}")
-
-
             if (!assertPrinted) assertInit()
 
-            if (sprite != null) sprite!!.update(fdelta)
-            if (spriteGlow != null) spriteGlow!!.update(fdelta)
+            if (sprite != null) sprite!!.update(delta)
+            if (spriteGlow != null) spriteGlow!!.update(delta)
 
             // make NoClip work for player
             if (true) {//this == Terrarum.ingame!!.actorNowPlaying) {
@@ -381,7 +381,7 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
 
 
             ////////////////////////////////////////////////////////////////
-            // Codes that modifies velocity (moveDelta and externalForce) //
+            // Codes that modifies velocity (moveDelta and externalV) //
             ////////////////////////////////////////////////////////////////
 
             // --> Apply more forces <-- //
@@ -396,8 +396,8 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
             }
 
             // hard limit velocity
-            externalForce.x = externalForce.x.bipolarClamp(VELO_HARD_LIMIT) // displaceHitbox SHOULD use moveDelta
-            externalForce.y = externalForce.y.bipolarClamp(VELO_HARD_LIMIT)
+            externalV.x = externalV.x.bipolarClamp(VELO_HARD_LIMIT) // displaceHitbox SHOULD use moveDelta
+            externalV.y = externalV.y.bipolarClamp(VELO_HARD_LIMIT)
 
             if (!isChronostasis) {
                 ///////////////////////////////////////////////////
@@ -410,11 +410,11 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
                  *     This body is NON-STATIC and the other body is STATIC
                  */
                 if (!isNoCollideWorld) {
-                    displaceHitbox(delta)
+                    displaceHitbox(delta.toDouble())
                 }
                 else {
-                    val vecSum = externalForce + (controllerMoveDelta ?: Vector2(0.0, 0.0))
-                    hitbox.translate(vecSum * (Terrarum.PHYS_REF_FPS * delta))
+                    val vecSum = externalV + (controllerV ?: Vector2(0.0, 0.0))
+                    hitbox.translate(vecSum)
                 }
 
                 //////////////////////////////////////////////////////////////
@@ -428,7 +428,7 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
                 // TODO less friction for non-animating objects (make items glide far more on ice)
 
                 // FIXME asymmetry on friction
-                setHorizontalFriction(delta) // friction SHOULD use and alter externalForce
+                setHorizontalFriction(delta) // friction SHOULD use and alter externalV
                 //if (isNoClip) { // TODO also hanging on the rope, etc.
                 setVerticalFriction(delta)
                 //}
@@ -470,33 +470,33 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
             if (!(isWalled(hitbox, COLLIDING_LEFT) && walkX < 0)
                 || !(isWalled(hitbox, COLLIDING_RIGHT) && walkX > 0)
                     ) {
-                moveDelta.x = externalForce.x + walkX
+                moveDelta.x = externalV.x + walkX
             }
 
             // decide whether to ignore walkY
             if (!(isWalled(hitbox, COLLIDING_TOP) && walkY < 0)
                 || !(isWalled(hitbox, COLLIDING_BOTTOM) && walkY > 0)
                     ) {
-                moveDelta.y = externalForce.y + walkY
+                moveDelta.y = externalV.y + walkY
             }
         }
         else {
             if (!isWalled(hitbox, COLLIDING_LEFT)
                 || !isWalled(hitbox, COLLIDING_RIGHT)
                     ) {
-                moveDelta.x = externalForce.x
+                moveDelta.x = externalV.x
             }
 
             // decide whether to ignore walkY
             if (!isWalled(hitbox, COLLIDING_TOP)
                 || !isWalled(hitbox, COLLIDING_BOTTOM)
                     ) {
-                moveDelta.y = externalForce.y
+                moveDelta.y = externalV.y
             }
         }
     }*/
 
-    fun getDrag(delta: Double, externalForce: Vector2): Vector2 {
+    fun getDrag(delta: Float, externalForce: Vector2): Vector2 {
         /**
          * weight; gravitational force in action
          * W = mass * G (9.8 [m/s^2])
@@ -514,7 +514,7 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
 
         val V: Vector2 = (W - D) / Terrarum.PHYS_TIME_FRAME * SI_TO_GAME_ACC
 
-        return V * (Terrarum.PHYS_REF_FPS * delta).sqrt()
+        return V
 
         // FIXME v * const, where const = 1.0 for FPS=60, sqrt(2.0) for FPS=30, etc.
         //       this is "close enough" solution and not perfect.
@@ -535,11 +535,11 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
      *
      * Apply only if not grounded; normal force is precessed separately.
      */
-    private fun applyGravitation(delta: Double) {
+    private fun applyGravitation(delta: Float) {
 
         if (!isNoSubjectToGrav && !(gravitation.y > 0 && walledBottom || gravitation.y < 0 && walledTop)) {
             //if (!isWalled(hitbox, COLLIDING_BOTTOM)) {
-            applyForce(getDrag(delta, externalForce))
+            applyForce(getDrag(delta, externalV))
             //}
         }
     }
@@ -587,7 +587,7 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
         //          if not touching:
         //              do nothing
         //      [Friction]:
-        //          deform vector "externalForce"
+        //          deform vector "externalV"
         //          if isControllable:
         //              also alter walkX/Y
         // translate ((nextHitbox)) hitbox by moveDelta (forces), this consumes force
@@ -637,7 +637,7 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
             fun Double.modTileDelta() = this - this.modTile()
 
 
-            val vectorSum = (externalForce + controllerMoveDelta) * (Terrarum.PHYS_REF_FPS * delta)
+            val vectorSum = (externalV + controllerV)
             val ccdSteps = minOf(16, (vectorSum.magnitudeSquared / TILE_SIZE.sqr()).floorInt() + 1) // adaptive
 
 
@@ -838,20 +838,20 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
 
                 // bounce X/Y
                 if (bounceX) {
-                    externalForce.x *= elasticity
-                    controllerMoveDelta?.let { controllerMoveDelta!!.x *= elasticity }
+                    externalV.x *= elasticity
+                    controllerV?.let { controllerV!!.x *= elasticity }
                 }
                 if (bounceY) {
-                    externalForce.y *= elasticity
-                    controllerMoveDelta?.let { controllerMoveDelta!!.y *= elasticity }
+                    externalV.y *= elasticity
+                    controllerV?.let { controllerV!!.y *= elasticity }
                 }
                 if (zeroX) {
-                    externalForce.x = 0.0
-                    controllerMoveDelta?.let { controllerMoveDelta!!.x = 0.0 }
+                    externalV.x = 0.0
+                    controllerV?.let { controllerV!!.x = 0.0 }
                 }
                 if (zeroY) {
-                    externalForce.y = 0.0
-                    controllerMoveDelta?.let { controllerMoveDelta!!.y = 0.0 }
+                    externalV.y = 0.0
+                    controllerV?.let { controllerV!!.y = 0.0 }
                 }
 
 
@@ -1012,11 +1012,11 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
             (BlockCodex[tile].isSolid) ||
             // platforms, moving downward AND not "going down"
             (this is ActorHumanoid && BlockCodex[tile].isPlatform &&
-             externalForce.y + (controllerMoveDelta?.y ?: 0.0) >= 0.0 &&
+             externalV.y + (controllerV?.y ?: 0.0) >= 0.0 &&
              !this.isDownDown && this.axisY <= 0f) ||
             // platforms, moving downward
             (this !is ActorHumanoid && BlockCodex[tile].isPlatform &&
-             externalForce.y + (controllerMoveDelta?.y ?: 0.0) >= 0.0)
+             externalV.y + (controllerV?.y ?: 0.0) >= 0.0)
     // TODO: as for the platform, only apply it when it's a feet tile
 
 
@@ -1071,7 +1071,7 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
 
     /** about stopping
      * for about get moving, see updateMovementControl */
-    private fun setHorizontalFriction(delta: Double) {
+    private fun setHorizontalFriction(delta: Float) {
         val friction = if (isNoClip)
             BASE_FRICTION * BlockCodex[Block.STONE].friction.frictionToMult()
         else {
@@ -1079,50 +1079,50 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
             BASE_FRICTION * if (grounded) feetFriction else bodyFriction
         }
 
-        if (externalForce.x < 0) {
-            externalForce.x += friction
-            if (externalForce.x > 0) externalForce.x = 0.0 // compensate overshoot
+        if (externalV.x < 0) {
+            externalV.x += friction
+            if (externalV.x > 0) externalV.x = 0.0 // compensate overshoot
         }
-        else if (externalForce.x > 0) {
-            externalForce.x -= friction
-            if (externalForce.x < 0) externalForce.x = 0.0 // compensate overshoot
+        else if (externalV.x > 0) {
+            externalV.x -= friction
+            if (externalV.x < 0) externalV.x = 0.0 // compensate overshoot
         }
 
         if (this is Controllable) {
-            if (controllerMoveDelta!!.x < 0) {
-                controllerMoveDelta!!.x += friction
-                if (controllerMoveDelta!!.x > 0) controllerMoveDelta!!.x = 0.0
+            if (controllerV!!.x < 0) {
+                controllerV!!.x += friction
+                if (controllerV!!.x > 0) controllerV!!.x = 0.0
             }
-            else if (controllerMoveDelta!!.x > 0) {
-                controllerMoveDelta!!.x -= friction
-                if (controllerMoveDelta!!.x < 0) controllerMoveDelta!!.x = 0.0
+            else if (controllerV!!.x > 0) {
+                controllerV!!.x -= friction
+                if (controllerV!!.x < 0) controllerV!!.x = 0.0
             }
         }
     }
 
-    private fun setVerticalFriction(delta: Double) {
+    private fun setVerticalFriction(delta: Float) {
         val friction = if (isNoClip)
             BASE_FRICTION * BlockCodex[Block.STONE].friction.frictionToMult()
         else
             BASE_FRICTION * bodyFriction
 
-        if (externalForce.y < 0) {
-            externalForce.y += friction
-            if (externalForce.y > 0) externalForce.y = 0.0 // compensate overshoot
+        if (externalV.y < 0) {
+            externalV.y += friction
+            if (externalV.y > 0) externalV.y = 0.0 // compensate overshoot
         }
-        else if (externalForce.y > 0) {
-            externalForce.y -= friction
-            if (externalForce.y < 0) externalForce.y = 0.0 // compensate overshoot
+        else if (externalV.y > 0) {
+            externalV.y -= friction
+            if (externalV.y < 0) externalV.y = 0.0 // compensate overshoot
         }
 
         if (this is Controllable) {
-            if (controllerMoveDelta!!.y < 0) {
-                controllerMoveDelta!!.y += friction
-                if (controllerMoveDelta!!.y > 0) controllerMoveDelta!!.y = 0.0
+            if (controllerV!!.y < 0) {
+                controllerV!!.y += friction
+                if (controllerV!!.y > 0) controllerV!!.y = 0.0
             }
-            else if (controllerMoveDelta!!.y > 0) {
-                controllerMoveDelta!!.y -= friction
-                if (controllerMoveDelta!!.y < 0) controllerMoveDelta!!.y = 0.0
+            else if (controllerV!!.y > 0) {
+                controllerV!!.y -= friction
+                if (controllerV!!.y < 0) controllerV!!.y = 0.0
             }
         }
     }
@@ -1443,8 +1443,8 @@ open class ActorWBMovable(renderOrder: RenderOrder, val immobileBody: Boolean =
             field = value
 
             if (value) {
-                externalForce.zero()
-                controllerMoveDelta?.zero()
+                externalV.zero()
+                controllerV?.zero()
             }
         }
 

src/net/torvald/terrarum/gameactors/ai/AILuaAPI.kt

@@ -46,7 +46,7 @@ import org.luaj.vm2.*
          */
         fun composeActorObject(actor: ActorWBMovable): LuaTable {
             val t: LuaTable = LuaTable()
-            val moveDelta = actor.externalForce + actor.controllerMoveDelta
+            val moveDelta = actor.externalV + actor.controllerV
 
             t["name"] = actor.actorValue.getAsString(AVKey.NAME).toLua()
             t["startX"] = actor.hitbox.centeredX.toLua()

src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt

@@ -120,9 +120,6 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {
         }
     }
 
-    protected var updateDeltaCounter = 0.0
-    protected val updateRate = 1.0 / Terrarum.TARGET_INTERNAL_FPS
-
     private val actorsRenderOverlay = ArrayList<ActorWithBody>()
 
     init {
@@ -161,19 +158,8 @@ class BuildingMaker(batch: SpriteBatch) : IngameInstance(batch) {
         // ASYNCHRONOUS UPDATE AND RENDER //
 
 
-        // async update
-        updateDeltaCounter += delta
-        if (delta < 1f / 10f) { // discard async if measured FPS <= 10
-            var updateTries = 0
-            while (updateDeltaCounter >= updateRate) {
-                updateGame(delta)
-                updateDeltaCounter -= updateRate
-                updateTries++
-            }
-        }
-        else {
-            updateGame(delta)
-        }
+        // TODO async update
+        updateGame(delta)
 
         // render? just do it anyway
         renderGame()

src/net/torvald/terrarum/modulebasegame/Ingame.kt

@@ -66,6 +66,11 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
     private val actorsRenderFront  = ArrayList<ActorWithBody>(ACTORCONTAINER_INITIAL_SIZE)
     private val actorsRenderOverlay= ArrayList<ActorWithBody>(ACTORCONTAINER_INITIAL_SIZE)
 
+    private var visibleActorsRenderBehind: List<ActorWithBody> = ArrayList(1)
+    private var visibleActorsRenderMiddle: List<ActorWithBody> = ArrayList(1)
+    private var visibleActorsRenderMidTop: List<ActorWithBody> = ArrayList(1)
+    private var visibleActorsRenderFront: List<ActorWithBody> = ArrayList(1)
+    private var visibleActorsRenderOverlay: List<ActorWithBody> = ArrayList(1)
 
     //var screenZoom = 1.0f   // definition moved to IngameInstance
     //val ZOOM_MAXIMUM = 4.0f // definition moved to IngameInstance
@@ -82,7 +87,7 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
         fun getCanonicalTitle() = AppLoader.GAME_NAME +
                                   " — F: ${Gdx.graphics.framesPerSecond}" +
                                   if (AppLoader.IS_DEVELOPMENT_BUILD)
-                                      " (Δt${Terrarum.updateRateStr} / RT${Terrarum.renderRateStr})" +
+                                      " (ΔF${Terrarum.updateRateStr})" +
                                       " — M: J${Terrarum.memJavaHeap}M / N${Terrarum.memNativeHeap}M / X${Terrarum.memXmx}M"
                                   else
                                       ""
@@ -379,6 +384,7 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
         LightmapRenderer.fireRecalculateEvent()
 
 
+        AppLoader.debugTimers["Ingame.updateCounter"] = 0
 
 
 
@@ -408,8 +414,6 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
         itemOnGrip?.endSecondaryUse(delta)
     }
 
-    protected val renderRate = Terrarum.renderRate
-
     private var firstTimeRun = true
 
     ///////////////
@@ -422,6 +426,7 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
     }
 
     private var countdownToDeltaReset = 15 // number of frames
+    private var updateAkku = 0.0
 
     override fun render(delta: Float) {
         // Q&D solution for LoadScreen and Ingame, where while LoadScreen is working, Ingame now no longer has GL Context
@@ -443,7 +448,7 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
         }
 
 
-        if (countdownToDeltaReset >= 0) {3
+        if (countdownToDeltaReset >= 0) {
             if (countdownToDeltaReset == 0) {
                 AppLoader.resetDeltaSmoothingHistory()
             }
@@ -453,23 +458,18 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
 
         // ASYNCHRONOUS UPDATE AND RENDER //
 
-
         /** UPDATE CODE GOES HERE */
+        val dt = AppLoader.getSmoothDelta()
+        updateAkku += dt
 
-
-
-        if (false && AppLoader.getConfigBoolean("multithread")) { // NO MULTITHREADING: camera don't like concurrent modification (jittery actor movements)
-            if (firstTimeRun || updateThreadWrapper.state == Thread.State.TERMINATED) {
-                updateThreadWrapper = Thread(ingameUpdateThread, "Terrarum UpdateThread")
-                updateThreadWrapper.start()
-
-                if (firstTimeRun) firstTimeRun = false
-            }
-            // else, NOP;
-        }
-        else {
+        var i = 0L
+        while (updateAkku >= delta) {
             AppLoader.debugTimers["Ingame.update"] = measureNanoTime { updateGame(delta) }
+            updateAkku -= delta
+            i += 1
         }
+        AppLoader.debugTimers["Ingame.updateCounter"] = i
+
 
 
         /** RENDER CODE GOES HERE */
@@ -522,6 +522,13 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
             particlesContainer.forEach { if (!it.flagDespawn) particlesActive++; it.update(delta) }
             // TODO thread pool(?)
             CollisionSolver.process()
+
+
+            visibleActorsRenderBehind = actorsRenderBehind.filter { it.inScreen() }
+            visibleActorsRenderMiddle = actorsRenderMiddle.filter { it.inScreen() }
+            visibleActorsRenderMidTop = actorsRenderMidTop.filter { it.inScreen() }
+            visibleActorsRenderFront  =  actorsRenderFront.filter { it.inScreen() }
+            visibleActorsRenderOverlay=actorsRenderOverlay.filter { it.inScreen() }
         }
 
 
@@ -545,11 +552,11 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
 
         IngameRenderer.invoke(
                 world as GameWorldExtension,
-                actorsRenderBehind,
-                actorsRenderMiddle,
-                actorsRenderMidTop,
-                actorsRenderFront,
-                actorsRenderOverlay,
+                visibleActorsRenderBehind,
+                visibleActorsRenderMiddle,
+                visibleActorsRenderMidTop,
+                visibleActorsRenderFront,
+                visibleActorsRenderOverlay,
                 particlesContainer,
                 actorNowPlaying,
                 uiContainer
@@ -962,4 +969,5 @@ open class Ingame(batch: SpriteBatch) : IngameInstance(batch) {
             printdbg(this, "->   $it")
         }
     }
+
 }

src/net/torvald/terrarum/modulebasegame/gameactors/ActorHumanoid.kt

@@ -406,9 +406,9 @@ open class ActorHumanoid(
                     avAcceleration * applyVelo(walkCounterX) * (if (left) -1f else 1f) * absAxisVal
 
         if (absAxisVal != AXIS_KEYBOARD)
-            controllerMoveDelta?.x?.let { controllerMoveDelta!!.x = controllerMoveDelta!!.x.plus(readonly_totalX).bipolarClamp(avSpeedCap * absAxisVal) }
+            controllerV?.x?.let { controllerV!!.x = controllerV!!.x.plus(readonly_totalX).bipolarClamp(avSpeedCap * absAxisVal) }
         else
-            controllerMoveDelta?.x?.let { controllerMoveDelta!!.x = controllerMoveDelta!!.x.plus(readonly_totalX).bipolarClamp(avSpeedCap) }
+            controllerV?.x?.let { controllerV!!.x = controllerV!!.x.plus(readonly_totalX).bipolarClamp(avSpeedCap) }
 
         if (walkCounterX < 1000000) {
           walkCounterX += 1
@@ -444,9 +444,9 @@ open class ActorHumanoid(
                     avAcceleration * applyVelo(walkCounterY) * (if (up) -1f else 1f) * absAxisVal
 
         if (absAxisVal != AXIS_KEYBOARD)
-            controllerMoveDelta?.y?.let { controllerMoveDelta!!.y = controllerMoveDelta!!.y.plus(readonly_totalY).bipolarClamp(avSpeedCap * absAxisVal) }
+            controllerV?.y?.let { controllerV!!.y = controllerV!!.y.plus(readonly_totalY).bipolarClamp(avSpeedCap * absAxisVal) }
         else
-            controllerMoveDelta?.y?.let { controllerMoveDelta!!.y = controllerMoveDelta!!.y.plus(readonly_totalY).bipolarClamp(avSpeedCap) }
+            controllerV?.y?.let { controllerV!!.y = controllerV!!.y.plus(readonly_totalY).bipolarClamp(avSpeedCap) }
 
         if (walkCounterY < 1000000) {
             walkCounterY += 1
@@ -489,6 +489,7 @@ open class ActorHumanoid(
     private var oldJUMPPOWERBUFF = -1.0 // init
     private var oldScale = -1.0
     private var oldDragCoefficient = -1.0
+    // used by some AIs
     var jumpAirTime: Double = -1.0
         get() {
             // compare all the affecting variables
@@ -519,7 +520,7 @@ open class ActorHumanoid(
 
                     val timedJumpCharge = jumpFunc(MAX_JUMP_LENGTH, jmpCtr)
                     forceVec.y -= getJumpAcc(jumpPower, timedJumpCharge)
-                    forceVec.y += getDrag(1.0 / Terrarum.PHYS_REF_FPS, forceVec).y
+                    forceVec.y += getDrag(AppLoader.UPDATE_RATE.toFloat(), forceVec).y
 
                     simYPos += forceVec.y // ignoring all the fluid drag OTHER THAN THE AIR
 
@@ -564,7 +565,7 @@ open class ActorHumanoid(
 
             jumpAcc = getJumpAcc(jumpPower, timedJumpCharge)
 
-            controllerMoveDelta?.y?.let { controllerMoveDelta!!.y -= jumpAcc } // feed negative value to the vector
+            controllerV?.y?.let { controllerV!!.y -= jumpAcc } // feed negative value to the vector
             // do not think of resetting this to zero when counter hit the ceiling; that's HOW NOT
             // newtonian physics work, stupid myself :(
 
@@ -609,7 +610,7 @@ open class ActorHumanoid(
         sprite?.update(delta)
         spriteGlow?.update(delta)
 
-        if (walledBottom && controllerMoveDelta?.x != 0.0) {
+        if (walledBottom && controllerV?.x != 0.0) {
             //switch row
             sprite?.switchRow(SPRITE_ROW_WALK)
             spriteGlow?.switchRow(SPRITE_ROW_WALK)
@@ -617,8 +618,8 @@ open class ActorHumanoid(
             // set anim frame delay
             // 4f of the divider is a magic number, empirically decided
             if (this is HasAssembledSprite) {
-                sprite?.delays?.set(SPRITE_ROW_WALK, scale.sqrt().toFloat() / (4f * (controllerMoveDelta?.x ?: 0.0001).abs().toFloat())) // FIXME empirical value
-                spriteGlow?.delays?.set(SPRITE_ROW_WALK, scale.sqrt().toFloat() / (4f * (controllerMoveDelta?.x ?: 0.0001).abs().toFloat())) // FIXME empirical value
+                sprite?.delays?.set(SPRITE_ROW_WALK, scale.sqrt().toFloat() / (4f * (controllerV?.x ?: 0.0001).abs().toFloat())) // FIXME empirical value
+                spriteGlow?.delays?.set(SPRITE_ROW_WALK, scale.sqrt().toFloat() / (4f * (controllerV?.x ?: 0.0001).abs().toFloat())) // FIXME empirical value
 
             }
 

src/net/torvald/terrarum/modulebasegame/gameactors/PhysTestLuarLander.kt

@@ -10,7 +10,6 @@ import net.torvald.terrarum.gameactors.AVKey
 import net.torvald.terrarum.gameactors.ActorWBMovable
 import net.torvald.terrarum.gameactors.Controllable
 import net.torvald.terrarum.gameactors.Hitbox
-import net.torvald.terrarum.gameworld.GameWorld
 
 /**
  * Created by minjaesong on 2018-01-17.
@@ -37,7 +36,7 @@ class PhysTestLuarLander : ActorWBMovable(RenderOrder.MIDTOP), Controllable {
         super.update(delta)
 
         if (Gdx.input.isKeyPressed(Input.Keys.UP)) {
-            controllerMoveDelta!!.y = avSpeedCap
+            controllerV!!.y = avSpeedCap
         }
     }
 

src/net/torvald/terrarum/modulebasegame/gameactors/ProjectileSimple.kt

@@ -9,7 +9,6 @@ import net.torvald.terrarum.blockproperties.BlockCodex
 import net.torvald.terrarum.gameactors.ActorWBMovable
 import net.torvald.terrarum.gameactors.Hitbox
 import net.torvald.terrarum.gameactors.Luminous
-import net.torvald.terrarum.gameworld.GameWorld
 import org.dyn4j.geometry.Vector2
 import java.util.*
 
@@ -54,7 +53,7 @@ open class ProjectileSimple(
         posPre = Point2d(fromPoint.x, fromPoint.y)
         // lightbox sized 8x8 centered to the bullet
         lightBoxList.add(Hitbox(-4.0, -4.0, 8.0, 8.0))
-        //this.externalForce.set(velocity)
+        //this.externalV.set(velocity)
 
         damage = bulletDatabase[type][OFFSET_DAMAGE] as Int
         displayColour = bulletDatabase[type][OFFSET_COL] as Color
@@ -64,7 +63,7 @@ open class ProjectileSimple(
         setHitboxDimension(2, 2, 0, 0) // should be following sprite's properties if there IS one
 
 
-        externalForce.set((fromPoint to toPoint).setMagnitude(speed.toDouble()))
+        externalV.set((fromPoint to toPoint).setMagnitude(speed.toDouble()))
 
 
 

src/net/torvald/terrarum/modulebasegame/gameactors/physicssolver/CollisionSolver.kt

@@ -150,8 +150,8 @@ object CollisionSolver {
 
             // if they actually makes collision (e.g. player vs ball), solve it
             if (a makesCollisionWith b) {
-                val a_moveDelta = a.externalForce + a.controllerMoveDelta
-                val b_moveDelta = b.externalForce + b.controllerMoveDelta
+                val a_moveDelta = a.externalV + a.controllerV
+                val b_moveDelta = b.externalV + b.controllerV
 
                 val ux_1 = a_moveDelta.x
                 val ux_2 = b_moveDelta.x

src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt

@@ -108,11 +108,11 @@ class BasicDebugInfoWindow : UICanvas() {
                                          + ccG
                                          + "${WorldCamera.y}")
 
-            printLine(batch, 3, "veloX reported $ccG${player.externalForce.x}")
-            printLine(batch, 4, "veloY reported $ccG${player.externalForce.y}")
+            printLine(batch, 3, "veloX reported $ccG${player.externalV.x}")
+            printLine(batch, 4, "veloY reported $ccG${player.externalV.y}")
 
-            printLine(batch, 5, "p_WalkX $ccG${player.controllerMoveDelta?.x}")
-            printLine(batch, 6, "p_WalkY $ccG${player.controllerMoveDelta?.y}")
+            printLine(batch, 5, "p_WalkX $ccG${player.controllerV?.x}")
+            printLine(batch, 6, "p_WalkY $ccG${player.controllerV?.y}")
 
             printLineColumn(batch, 2, 3, "veloX measured $ccG${xdelta}")
             printLineColumn(batch, 2, 4, "veloY measured $ccG${ydelta}")