Skip to content

Commit cc36bc7

Browse files
committed
Support safe beatmap background setting
1 parent 81d2d68 commit cc36bc7

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/com/osudroid/ui/v2/mainmenu/MainScene.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import com.reco1l.framework.*
2626
import com.reco1l.framework.math.*
2727
import org.anddev.andengine.engine.camera.*
2828
import ru.nsu.ccfit.zuev.osu.*
29+
import ru.nsu.ccfit.zuev.osu.Config
2930
import ru.nsu.ccfit.zuev.osu.helper.*
3031
import ru.nsu.ccfit.zuev.osu.menu.*
3132
import ru.nsu.ccfit.zuev.osu.online.*
@@ -61,6 +62,7 @@ object MainScene : UIScene() {
6162
width = Size.Full
6263
height = Size.Full
6364
scaleType = ScaleType.Crop
65+
textureRegion = ResourceManager.getInstance().getTexture("menu-background")
6466
}
6567

6668
+UIGradientBox().apply {
@@ -306,13 +308,11 @@ object MainScene : UIScene() {
306308
MusicManager.addOnBeatmapChangeListener(this) { beatmap ->
307309
val textureRegion = if (beatmap != null) ResourceManager.getInstance().loadBackground(beatmap.backgroundPath) else null
308310

309-
if (textureRegion != null) {
311+
if (textureRegion != null && !Config.isSafeBeatmapBg()) {
310312
background.textureRegion = textureRegion
311313
} else {
312314
background.textureRegion = ResourceManager.getInstance().getTexture("menu-background")
313315
}
314-
315-
musicButton.text = "${MusicManager.currentBeatmap?.titleText} - ${MusicManager.currentBeatmap?.artistText}"
316316
}
317317
}
318318

@@ -335,6 +335,7 @@ object MainScene : UIScene() {
335335

336336
val mightShowMusicButton = isMenuExpanded || System.currentTimeMillis() - lastMusicChange < 3000
337337

338+
musicButton.text = "${MusicManager.currentBeatmap?.titleText} - ${MusicManager.currentBeatmap?.artistText}"
338339
musicButton.translationX = Interpolation.floatAt(deltaTimeSec.coerceIn(0f, 0.05f), musicButton.translationX, if (mightShowMusicButton) 0f else 8f.srem, 0f, 0.05f)
339340
musicButton.alpha = Interpolation.floatAt(deltaTimeSec.coerceIn(0f, 0.05f), musicButton.alpha, if (mightShowMusicButton) 1f else 0f, 0f, 0.05f)
340341

0 commit comments

Comments
 (0)