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

working arbitrary track queueing

Browse Source
This commit is contained in:
minjaesong
2024-07-08 18:06:44 +09:00
parent 657c8051f8
commit 86c6f008f9
4 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayerControl.kt
View File

@@ -1051,6 +1051,8 @@ class MusicPlayerControl(private val ingame: TerrarumIngame) : UICanvas() {
private val playControlAnimAkku = FloatArray(5) // how many control buttons?
private val playControlAnimLength = 0.2f
private val colInactive = Color(0xaaaaaaff.toInt())
private fun drawControls(delta: Float, batch: SpriteBatch, posX: Float, posY: Float) {
val (alpha, reverse) = if (mode < MODE_MOUSE_UP && modeNext == MODE_MOUSE_UP)
(transitionAkku / TRANSITION_LENGTH).let { if (it.isNaN()) 0f else it } to false
@@ -1070,7 +1072,7 @@ class MusicPlayerControl(private val ingame: TerrarumIngame) : UICanvas() {
else
0f
val baseCol = if (MusicService.transactionLocked) Color.RED else Color.WHITE
val baseCol = if (MusicService.transactionLocked) colInactive else Color.WHITE
if (alpha > 0f) {
val alpha0 = alpha.coerceIn(0f, 1f).organicOvershoot().coerceAtMost(1f)