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

more conveyor aesthetics

Browse Source
This commit is contained in:
minjaesong
2025-03-17 20:58:34 +09:00
parent b19b7c7e79
commit bbe28903d8
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/net/torvald/terrarum/modulebasegame/gameactors/ActorConveyors.kt
View File

@@ -53,7 +53,7 @@ class ActorConveyors : ActorWithBody {
private val s: Double // belt length (total) private val s: Double // belt length (total)
private val l: Double // belt length (single straight part) private val l: Double // belt length (single straight part)
private val c: Int // segment counts private val c: Int // total segment counts
private val di: Double // inclination deg private val di: Double // inclination deg
private val dd: Double // declination deg private val dd: Double // declination deg
@@ -133,6 +133,12 @@ class ActorConveyors : ActorWithBody {
private fun calcBeltLengthStraightPart(x1: Int, y1: Int, x2: Int, y2: Int) = private fun calcBeltLengthStraightPart(x1: Int, y1: Int, x2: Int, y2: Int) =
hypot((x2 - x1) * TILE_SIZED, (y2 - y1) * TILE_SIZED) hypot((x2 - x1) * TILE_SIZED, (y2 - y1) * TILE_SIZED)
override fun updateImpl(delta: Float) {
super.updateImpl(delta)
turn += delta * 2
while (turn >= 1f) turn -= 1f
}
override fun drawBody(frameDelta: Float, batch: SpriteBatch) { override fun drawBody(frameDelta: Float, batch: SpriteBatch) {
batch.end() batch.end()
@@ -160,11 +166,23 @@ class ActorConveyors : ActorWithBody {
val x2 = btx1 + r * sin(di - HALF_PI) * (i - turn + 0.25) * segmentLen val x2 = btx1 + r * sin(di - HALF_PI) * (i - turn + 0.25) * segmentLen
val y2 = bty1 + r * cos(di - HALF_PI) * (i - turn + 0.25) * segmentLen val y2 = bty1 + r * cos(di - HALF_PI) * (i - turn + 0.25) * segmentLen
if (x1 < btx2) { if (x1 in btx1 - 4..btx2 + 4) {
if (y2 > y1) if (bty2 > bty1)
drawLineOnWorld(x1, y1, minOf(x2, btx2), minOf(y2, bty2), 2f) drawLineOnWorld(
x1.coerceIn(btx1..btx2),
y1.coerceIn(bty1..bty2),
x2.coerceIn(btx1..btx2),
y2.coerceIn(bty1..bty2),
2f
)
else else
drawLineOnWorld(x1, y1, minOf(x2, btx2), maxOf(y2, bty2), 2f) drawLineOnWorld(
x1.coerceIn(btx1..btx2),
y1.coerceIn(bty2..bty1),
x2.coerceIn(btx1..btx2),
y2.coerceIn(bty2..bty1),
2f
)
} }
} }