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

better particle emission on block break

Browse Source
This commit is contained in:
minjaesong
2023-10-12 14:28:39 +09:00
parent 3a3d789777
commit 93d33b793c
5 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/gameparticles/ParticleBase.kt
View File

@@ -22,7 +22,7 @@ open class ParticleBase(renderOrder: Actor.RenderOrder, var despawnUponCollision
override fun run() = update(App.UPDATE_RATE)
var isNoSubjectToGrav = false
var dragCoefficient = 36.0
var dragCoefficient = 40.0
val lifetimeMax = maxLifeTime ?: 5f
var lifetimeCounter = 0f
@@ -55,8 +55,8 @@ open class ParticleBase(renderOrder: Actor.RenderOrder, var despawnUponCollision
)].isSolid) {
if (despawnUponCollision) flagDespawn = true
if (!noCollision) velocity.y = 0.0
if (despawnUponCollision && lifetimeCounter >= 0.1f) flagDespawn = true
if (!noCollision && lifetimeCounter >= 0.1f) velocity.y = 0.0
}
if (lifetimeCounter >= lifetimeMax) {

23
src/net/torvald/terrarum/gameparticles/ParticleVanishingTexture.kt
View File

@@ -41,23 +41,12 @@ open class ParticleVanishingTexture(val tex: TextureRegion, x: Double, y: Double
}
// pickaxe sparks must use different create- function
fun createRandomBlockParticle(block: ItemID, position: Vector2, velocityMult: Double): ParticleBase {
fun createRandomBlockParticle(tileNum: Int, position: Vector2, velocityMult: Vector2, tx: Int, ty: Int, tw: Int, th: Int): ParticleBase {
val velocity = Vector2(
(Math.random() + Math.random()) * velocityMult,
0.0
(Math.random() + Math.random()) * velocityMult.x,
-velocityMult.y
) // triangular distribution with mean of 1.0 * velocityMult
val w = 3
val h = 3
val renderTag = App.tileMaker.getRenderTag(block)
val baseTilenum = renderTag.tileNumber
val representativeTilenum = when (renderTag.maskType) {
RenderTag.MASK_16 -> 15
RenderTag.MASK_47 -> 22
else -> 0
}
val tileNum = baseTilenum + representativeTilenum
val atlasX = tileNum % BlocksDrawer.weatherTerrains[1].horizontalCount
val atlasY = tileNum / BlocksDrawer.weatherTerrains[1].horizontalCount
// take base texture
@@ -65,10 +54,8 @@ fun createRandomBlockParticle(block: ItemID, position: Vector2, velocityMult: Do
val texGlow = BlocksDrawer.tilesGlow.get(atlasX, atlasY)
// take random square part
val ox = (Math.random() * (TILE_SIZE - w + 1)).toInt()
val oy = (Math.random() * (TILE_SIZE - h + 1)).toInt()
val texRegionBody = TextureRegion(texBody.texture, texBody.regionX + ox, texBody.regionY + oy, w, h)
val texRegionGlow = TextureRegion(texGlow.texture, texGlow.regionX + ox, texGlow.regionY + oy, w, h)
val texRegionBody = TextureRegion(texBody.texture, texBody.regionX + tx, texBody.regionY + ty, tw, th)
val texRegionGlow = TextureRegion(texGlow.texture, texGlow.regionX + tx, texGlow.regionY + ty, tw, th)
return ParticleVanishingTexture(texRegionBody, position.x, position.y).also {
it.glow = texRegionGlow