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

audiomanager wip

Browse Source
This commit is contained in:
minjaesong
2023-11-07 18:44:58 +09:00
parent 5d32e6da33
commit 797bad3014
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/net/torvald/terrarum/AudioManager.kt Normal file
View File

@@ -0,0 +1,20 @@
package net.torvald.terrarum
/**
* Created by minjaesong on 2023-11-07.
*/
object AudioManager {
/** Returns a companded master volume */
val masterVolume: Float
get() = App.getConfigDouble("mastervolume").toFloat()
/** Returns a (master volume * bgm volume) */
val musicVolume: Float
get() = (App.getConfigDouble("bgmvolume") * App.getConfigDouble("mastervolume")).toFloat()
/** Returns a (master volume * sfx volume */
val ambientVolume: Float
get() = (App.getConfigDouble("sfxvolume") * App.getConfigDouble("mastervolume")).toFloat()
}

12
src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
View File

@@ -43,12 +43,6 @@ class TerrarumMusicGovernor : MusicGovernor() {
private var warningPrinted = false
private val musicVolume: Float
get() = (App.getConfigDouble("bgmvolume") * App.getConfigDouble("mastervolume")).toFloat()
private val ambientVolume: Float
get() = (App.getConfigDouble("sfxvolume") * App.getConfigDouble("mastervolume")).toFloat()
private fun stopMusic() {
@@ -63,7 +57,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
}
private fun startMusic(song: MusicContainer) {
song.gdxMusic.volume = musicVolume
song.gdxMusic.volume = AudioManager.musicVolume
song.gdxMusic.play()
printdbg(this, "Now playing: $song")
@@ -102,7 +96,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
// process fadeout request
if (fadeoutFired) {
fadeoutAkku += delta
currentMusic?.gdxMusic?.volume = 1f - musicVolume * (fadeoutAkku / fadeoutLength)
currentMusic?.gdxMusic?.volume = 1f - AudioManager.musicVolume * (fadeoutAkku / fadeoutLength)
if (fadeoutAkku >= fadeoutLength) {
currentMusic?.gdxMusic?.pause()
@@ -114,7 +108,7 @@ class TerrarumMusicGovernor : MusicGovernor() {
currentMusic?.gdxMusic?.play()
}
fadeoutAkku += delta
currentMusic?.gdxMusic?.volume = musicVolume * (fadeoutAkku / fadeoutLength)
currentMusic?.gdxMusic?.volume = AudioManager.musicVolume * (fadeoutAkku / fadeoutLength)
}
}
else {