From d2be8d1e5e00edcd1a95f1aa22e606c6cd5125d4 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 4 Jan 2024 18:01:43 +0900 Subject: [PATCH] musicplayer: anim changes --- .../src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt index c3584185d..c699bfbdf 100644 --- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt +++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt @@ -585,7 +585,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { private val PLAYLIST_LINES = App.getConfigInt("musicplayer:playlistlines").let { if (it < 4) 4 else it } private val playListAnimAkku = FloatArray(PLAYLIST_LINES) // how many control buttons? - private val playListAnimLength = 0.2f + private val playListAnimLength = 0.16f private fun drawList(camera: OrthographicCamera, delta: Float, batch: SpriteBatch, x: Float, y: Float) { val (alpha, reverse) = if (mode < MODE_SHOW_LIST && modeNext == MODE_SHOW_LIST) @@ -781,7 +781,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { else 0f to false - val p = transitionAkku / TRANSITION_LENGTH + val p = organicOvershoot((transitionAkku / TRANSITION_LENGTH.toDouble()).coerceIn(0.0, 1.0)).coerceIn(0.0, 1.0).toFloat() val buttonFadePerc = if (modeNext == MODE_SHOW_LIST) p