diff --git a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt index aa31d63a9..19d6c5630 100644 --- a/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt +++ b/MusicPlayer/src/net/torvald/terrarum/musicplayer/gui/MusicPlayer.kt @@ -1051,14 +1051,31 @@ class MusicPlayer(private val ingame: TerrarumIngame) : UICanvas() { fftBarHeights[i] = binHeights.slice(range).average().toFloat() } - batch.color = colourMeter2 mul Color(1f, 1f, 1f, alpha) - fftBarHeights.forEachIndexed { index, h -> - Toolkit.fillArea(batch, posX + index*4f, posY - h, 3f, 2*h + 1) - } - batch.color = colourMeter mul Color(1f, 1f, 1f, alpha) + fftBarHeights.forEachIndexed { index, h -> - Toolkit.fillArea(batch, posX + index*4f, posY - h, 2f, 2*h) + val hInt = h.toInt().toFloat() + val hFrac = h - hInt + + // top fraction part shade + batch.color = colourMeter2 mul Color(1f, 1f, 1f, alpha * hFrac) + Toolkit.fillArea(batch, posX + index*4f, posY - hInt - 1, 3f, 1f) + // integer part shade + batch.color = colourMeter2 mul Color(1f, 1f, 1f, alpha) + Toolkit.fillArea(batch, posX + index*4f, posY - hInt, 3f, 2*hInt) + // bottom fraction part shade + batch.color = colourMeter2 mul Color(1f, 1f, 1f, alpha * hFrac) + Toolkit.fillArea(batch, posX + index*4f, posY + hInt, 3f, 2f) + + // top fraction part + batch.color = colourMeter mul Color(1f, 1f, 1f, alpha * hFrac) + Toolkit.fillArea(batch, posX + index*4f, posY - hInt - 1, 2f, 1f) + // integer part + batch.color = colourMeter mul Color(1f, 1f, 1f, alpha) + Toolkit.fillArea(batch, posX + index*4f, posY - hInt, 2f, 2*hInt) + // bottom fraction part + batch.color = colourMeter mul Color(1f, 1f, 1f, alpha * hFrac) + Toolkit.fillArea(batch, posX + index*4f, posY + hInt, 2f, 1f) } } diff --git a/assets/mods/musicplayer/icon.png b/assets/mods/musicplayer/icon.png index 12d7bae12..2c9590fbf 100644 --- a/assets/mods/musicplayer/icon.png +++ b/assets/mods/musicplayer/icon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fa3e8dcfd44b52318cec384b48834c7ee84eadd4c662521c91ce2686861f3d5 -size 905 +oid sha256:0f7956fd260bf576b04fa912e0d9b17864069051611c7929ca09c3e289f64fdc +size 853