mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-03-07 12:21:52 +09:00
musicplayer: anim changes
This commit is contained in:
@@ -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 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 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) {
|
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)
|
val (alpha, reverse) = if (mode < MODE_SHOW_LIST && modeNext == MODE_SHOW_LIST)
|
||||||
@@ -781,7 +781,7 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() {
|
|||||||
else
|
else
|
||||||
0f to false
|
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 =
|
val buttonFadePerc =
|
||||||
if (modeNext == MODE_SHOW_LIST)
|
if (modeNext == MODE_SHOW_LIST)
|
||||||
p
|
p
|
||||||
|
|||||||
Reference in New Issue
Block a user