vanishing particle test

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

@@ -19,7 +19,7 @@ import net.torvald.terrarum.gameactors.ActorWithBody
 import net.torvald.terrarum.gamecontroller.KeyToggler
 import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.gameworld.fmod
-import net.torvald.terrarum.modulebasegame.gameactors.ParticleBase
+import net.torvald.terrarum.gameparticles.ParticleBase
 import net.torvald.terrarum.weather.WeatherMixer
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.worlddrawer.*

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

@@ -24,6 +24,7 @@ import net.torvald.terrarum.gameitem.GameItem
 import net.torvald.terrarum.itemproperties.ItemCodex
 import net.torvald.terrarum.console.AVTracker
 import net.torvald.terrarum.console.ActorsList
+import net.torvald.terrarum.gameparticles.ParticleBase
 import net.torvald.terrarum.gameactors.WireActor
 import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.modulebasegame.gameactors.*
@@ -38,7 +39,6 @@ import net.torvald.terrarum.modulebasegame.worldgenerator.WorldgenParams
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.worlddrawer.BlocksDrawer
 import net.torvald.terrarum.worlddrawer.FeaturesDrawer
-import net.torvald.terrarum.worlddrawer.LightmapRenderer
 import net.torvald.terrarum.worlddrawer.WorldCamera
 import net.torvald.util.CircularArray
 import net.torvald.util.SortedArrayList

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

@@ -1,21 +1,29 @@
 package net.torvald.terrarum.modulebasegame.gameactors
 
+import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.gdx.graphics.Cvec
 import net.torvald.random.HQRNG
+import net.torvald.terrarum.AppLoader
+import net.torvald.terrarum.IngameInstance
 import net.torvald.terrarum.ModMgr
+import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.blockproperties.Block
 import net.torvald.terrarum.blockproperties.BlockCodex
 import net.torvald.terrarum.gameactors.AVKey
 import net.torvald.terrarum.gameactors.Hitbox
 import net.torvald.terrarum.gameactors.Luminous
+import net.torvald.terrarum.gameparticles.ParticleVanishingText
+import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 import java.util.*
+import kotlin.math.roundToInt
 
 /**
  * Created by minjaesong on 2016-06-17.
  */
 internal class FixtureTikiTorch(nameFun: () -> String) : FixtureBase(BlockBox(BlockBox.NO_COLLISION, 1, 2), nameFun = nameFun), Luminous {
 
+    private val rng = HQRNG()
     private val rndHash1: Int
     private val rndHash2: Int
 
@@ -40,11 +48,31 @@ internal class FixtureTikiTorch(nameFun: () -> String) : FixtureBase(BlockBox(Bl
 
         actorValue[AVKey.BASEMASS] = MASS
 
-        val rng = HQRNG()
         rndHash1 = rng.nextInt()
         rndHash2 = rng.nextInt()
     }
 
+    private var nextDelay = 0.4f
+    private var spawnTimer = 0f
+
+    override fun update(delta: Float) {
+        super.update(delta)
+
+        if (spawnTimer >= nextDelay) {
+            val s = rng.nextInt(1, 1000).toString()
+            (Terrarum.ingame as TerrarumIngame).addParticle(ParticleVanishingText(s, hitbox.centeredX, hitbox.startY + 10))
+
+            spawnTimer -= nextDelay
+            nextDelay = rng.nextFloat() * 0.4f + 0.4f
+        }
+
+        spawnTimer += delta
+    }
+
+    override fun drawBody(batch: SpriteBatch) {
+        super.drawBody(batch)
+    }
+
     companion object {
         const val MASS = 1.0
     }

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

@@ -1,81 +0,0 @@
-package net.torvald.terrarum.modulebasegame.gameactors
-
-import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import com.badlogic.gdx.graphics.g2d.TextureRegion
-import net.torvald.terrarum.*
-import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
-import net.torvald.terrarum.blockproperties.Block
-import net.torvald.terrarum.blockproperties.BlockCodex
-import net.torvald.terrarum.gameactors.Actor
-import net.torvald.terrarum.gameactors.Hitbox
-import org.dyn4j.geometry.Vector2
-
-/**
- * Actors with static sprites and very simple physics
- *
- * Created by minjaesong on 2017-01-20.
- */
-open class ParticleBase(renderOrder: Actor.RenderOrder, val despawnUponCollision: Boolean, maxLifeTime: Second? = null) : Runnable {
-
-    /** Will NOT actually delete from the CircularArray */
-    @Volatile var flagDespawn = false
-
-    override fun run() = update(AppLoader.UPDATE_RATE)
-
-    var isNoSubjectToGrav = false
-    var dragCoefficient = 3.0
-
-    private val lifetimeMax = maxLifeTime ?: 5f
-    private var lifetimeCounter = 0f
-
-    val velocity = Vector2(0.0, 0.0)
-    val hitbox = Hitbox(0.0, 0.0, 0.0, 0.0)
-
-    open lateinit var body: TextureRegion // you might want to use SpriteAnimation
-    open var glow: TextureRegion? = null
-
-    init {
-
-    }
-
-    fun update(delta: Float) {
-        if (!flagDespawn) {
-            lifetimeCounter += delta
-            if (despawnUponCollision) {
-                if (velocity.isZero ||
-                    // simple stuck check
-                    BlockCodex[(Terrarum.ingame!!.world).getTileFromTerrain(
-                            hitbox.canonicalX.div(TILE_SIZE).floorInt(),
-                            hitbox.canonicalY.div(TILE_SIZE).floorInt()
-                    ) ?: Block.STONE].isSolid) {
-                    flagDespawn = true
-                }
-            }
-
-            if (lifetimeCounter >= lifetimeMax) {
-                flagDespawn = true
-            }
-
-            // gravity, winds, etc. (external forces)
-            if (!isNoSubjectToGrav) {
-                velocity.plusAssign((Terrarum.ingame!!.world).gravitation / dragCoefficient)
-            }
-
-
-            // combine external forces
-            hitbox.translate(velocity)
-        }
-    }
-
-    fun drawBody(batch: SpriteBatch) {
-        if (!flagDespawn) {
-            batch.draw(body, hitbox.startX.toFloat(), hitbox.startY.toFloat(), hitbox.width.toFloat(), hitbox.height.toFloat())
-        }
-    }
-
-    fun drawGlow(batch: SpriteBatch) {
-        if (!flagDespawn && glow != null) {
-            batch.draw(glow, hitbox.startX.toFloat(), hitbox.startY.toFloat(), hitbox.width.toFloat(), hitbox.height.toFloat())
-        }
-    }
-}

src/net/torvald/terrarum/modulebasegame/gameparticles/ParticleMegaRain.kt

@@ -7,6 +7,7 @@ import net.torvald.random.HQRNG
 import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.Second
 import net.torvald.terrarum.gameactors.Actor
+import net.torvald.terrarum.gameparticles.ParticleBase
 
 /**
  * Created by minjaesong on 2017-12-18.

src/net/torvald/terrarum/modulebasegame/gameparticles/ParticleTestRain.kt

@@ -1,9 +1,10 @@
-package net.torvald.terrarum.modulebasegame.gameactors
+package net.torvald.terrarum.modulebasegame.gameparticles
 
 import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.TextureRegion
 import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.gameactors.Actor
+import net.torvald.terrarum.gameparticles.ParticleBase
 
 /**
  * Created by minjaesong on 2017-01-20.

src/net/torvald/terrarum/modulebasegame/ui/UITooltip.kt

@@ -25,7 +25,7 @@ class UITooltip : UICanvas() {
             msgBuffer.clear()
 
             msgBuffer.addAll(value.split('\n'))
-            msgWidth = msgBuffer.fold(0) { acc, s -> font.getWidth(s).let { if (it > acc) it else acc } }
+            msgWidth = msgBuffer.maxOf { font.getWidth(it) }
         }
 
     private val font = AppLoader.fontGame