mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-06-15 21:14:04 +09:00
audiocodex: no shared music instances
This commit is contained in:
@@ -1,10 +1,7 @@
|
||||
package net.torvald.terrarum.audio
|
||||
|
||||
import com.badlogic.gdx.Gdx
|
||||
import com.badlogic.gdx.audio.Music
|
||||
import com.badlogic.gdx.files.FileHandle
|
||||
import com.badlogic.gdx.utils.Disposable
|
||||
import net.torvald.terrarum.Terrarum
|
||||
import net.torvald.terrarum.modulebasegame.MusicContainer
|
||||
import net.torvald.terrarum.tryDispose
|
||||
|
||||
@@ -13,22 +10,25 @@ typealias MaterialID = String
|
||||
/**
|
||||
* Created by minjaesong on 2023-12-02.
|
||||
*/
|
||||
class AudioCodex: Disposable {
|
||||
class AudioCodex {
|
||||
|
||||
@Transient val footsteps = HashMap<MaterialID, HashSet<MusicContainer>>()
|
||||
@Transient val footsteps = HashMap<MaterialID, HashSet<FileHandle>>()
|
||||
|
||||
internal constructor()
|
||||
|
||||
fun addToFootstepPool(materialID: MaterialID, music: FileHandle) {
|
||||
if (footsteps[materialID] == null) footsteps[materialID] = HashSet()
|
||||
footsteps[materialID]!!.add(
|
||||
MusicContainer(music.nameWithoutExtension(), music.file(), Gdx.audio.newMusic(music)) {}
|
||||
)
|
||||
footsteps[materialID]!!.add(music)
|
||||
}
|
||||
|
||||
fun getRandomFootstep(materialID: MaterialID) = footsteps[materialID]?.random()
|
||||
|
||||
override fun dispose() {
|
||||
footsteps.values.forEach { it.forEach { it.gdxMusic.tryDispose() } }
|
||||
fun getRandomFootstep(materialID: MaterialID): MusicContainer? {
|
||||
val file = footsteps[materialID]?.random()
|
||||
return if (file != null) {
|
||||
MusicContainer(file.nameWithoutExtension(), file.file(), Gdx.audio.newMusic(file)) {
|
||||
it.tryDispose()
|
||||
}
|
||||
}
|
||||
else null
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user