curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-16 00:26:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

audio routing optimisations

Browse Source
This commit is contained in:
minjaesong
2024-01-21 20:48:32 +09:00
parent 612f4b830f
commit eebfa5c9de
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/torvald/terrarum/audio/AudioMixer.kt
View File

@@ -201,7 +201,7 @@ class AudioMixer(val bufferSize: Int): Disposable {
init { init {
// initialise audio paths // // initialise audio paths //
listOf(musicTrack, ambientTrack1, ambientTrack2, sfxSumBus, guiTrack).forEach { listOf(musicTrack, ambientTrack1, ambientTrack2).forEach {
it.filters[0] = Gain(1f) it.filters[0] = Gain(1f)
} }
@@ -212,16 +212,15 @@ class AudioMixer(val bufferSize: Int): Disposable {
musicTrack.filters[1] = Vecto() musicTrack.filters[1] = Vecto()
musicTrack.filters[2] = Spectro() musicTrack.filters[2] = Spectro()
ambientTrack1.filters[1] = Vecto(decibelsToFullscale(32.0).toFloat()) ambientTrack1.filters[1] = Vecto(decibelsToFullscale(24.0).toFloat())
ambientTrack1.filters[2] = Spectro() ambientTrack1.filters[2] = Spectro()
ambientTrack2.filters[1] = Vecto(decibelsToFullscale(32.0).toFloat()) ambientTrack2.filters[1] = Vecto(decibelsToFullscale(24.0).toFloat())
ambientTrack2.filters[2] = Spectro() ambientTrack2.filters[2] = Spectro()
sfxSumBus.filters[1] = Vecto(0.7071f) sfxSumBus.filters[1] = Vecto(0.7071f)
sfxSumBus.filters[2] = Spectro() sfxSumBus.filters[2] = Spectro()
ambSumBus.addSidechainInput(ambientTrack1, 1.0) ambSumBus.addSidechainInput(ambientTrack1, 1.0)
ambSumBus.addSidechainInput(ambientTrack2, 1.0) ambSumBus.addSidechainInput(ambientTrack2, 1.0)
ambSumBus.filters[0] = Gain(1f) // controlled by the ambient volume config
ambSumBus.filters[1] = Gain(1f) // controlled by the "openness" controller ambSumBus.filters[1] = Gain(1f) // controlled by the "openness" controller
listOf(sumBus, convolveBusOpen, convolveBusCave).forEach { listOf(sumBus, convolveBusOpen, convolveBusCave).forEach {
@@ -347,9 +346,10 @@ class AudioMixer(val bufferSize: Int): Disposable {
(Gdx.audio as? Lwjgl3Audio)?.update() (Gdx.audio as? Lwjgl3Audio)?.update()
masterTrack.volume = masterVolume masterTrack.volume = masterVolume
musicTrack.getFilter<Gain>().gain = musicVolume.toFloat() * 0.5f musicTrack.getFilter<Gain>().gain = musicVolume.toFloat() * 0.5f
ambSumBus.getFilter<Gain>().gain = ambientVolume.toFloat() * 2 ambientTrack1.getFilter<Gain>().gain = ambientVolume.toFloat() * 2
sfxSumBus.getFilter<Gain>().gain = sfxVolume.toFloat() ambientTrack2.getFilter<Gain>().gain = ambientVolume.toFloat() * 2
guiTrack.getFilter<Gain>().gain = guiVolume.toFloat() sfxSumBus.volume = sfxVolume
guiTrack.volume = guiVolume
// process fades // process fades

2
src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
View File

@@ -463,7 +463,7 @@ class BasicDebugInfoWindow : UICanvas() {
private val stripGap = 1 private val stripGap = 1
private val stripFilterHeight = 16 private val stripFilterHeight = 16
private val stripFaderHeight = meterHeight + 20 private val stripFaderHeight = meterHeight + 20
private val numberOfFilters = 16 private val numberOfFilters = 14
private val stripH = stripFaderHeight + stripFilterHeight * numberOfFilters + 16 private val stripH = stripFaderHeight + stripFilterHeight * numberOfFilters + 16
private val trackBack = listOf(COL_WELL, COL_WELL2) private val trackBack = listOf(COL_WELL, COL_WELL2)