curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 04:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: continuous album now plays again

Browse Source
This commit is contained in:
minjaesong
2024-07-07 02:53:57 +09:00
parent c211f67e38
commit 63070a19d5
10 changed files with 75 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,7 @@ class AudioMixer : Disposable {
// initialise audio paths //
listOf(musicTrack, ambientTrack1, ambientTrack2, ambientTrack3, ambientTrack4, guiTrack).forEach {
it.filters[0] = Gain(1f)
it.filters[0] = PreGain(1f)
}
guiTracks.forEach {
@@ -285,11 +285,11 @@ class AudioMixer : Disposable {
}
convolveBusOpen.filters[1] = Convolv("basegame", "audio/convolution/EchoThief - PurgatoryChasm.bin", decibelsToFullscale(-6.0).toFloat())
convolveBusOpen.filters[2] = Gain(decibelsToFullscale(17.0).toFloat()) // don't make it too loud; it'll sound like a shit
convolveBusOpen.filters[2] = PreGain(decibelsToFullscale(17.0).toFloat()) // don't make it too loud; it'll sound like a shit
convolveBusOpen.volume = 0.5 // will be controlled by the other updater which surveys the world
convolveBusCave.filters[1] = Convolv("basegame", "audio/convolution/EchoThief - WaterplacePark-trimmed.bin", decibelsToFullscale(-3.0).toFloat())
convolveBusCave.filters[2] = Gain(decibelsToFullscale(16.0).toFloat())
convolveBusCave.filters[2] = PreGain(decibelsToFullscale(16.0).toFloat())
convolveBusCave.volume = 0.5 // will be controlled by the other updater which surveys the world
fadeBus.addSidechainInput(sumBus, 1.0 / 3.0)
@@ -392,12 +392,12 @@ class AudioMixer : Disposable {
// the real updates
(Gdx.audio as? Lwjgl3Audio)?.update()
masterTrack.volume = masterVolume
musicTrack.getFilter<Gain>().gain = musicVolume.toFloat() * 0.5f
musicTrack.getFilter<PreGain>().gain = musicVolume.toFloat() * 0.5f
ambientTracks.forEach {
it.getFilter<Gain>().gain = ambientVolume.toFloat()
it.getFilter<PreGain>().gain = ambientVolume.toFloat()
}
sfxSumBus.volume = sfxVolume
guiTrack.getFilter<Gain>().gain = guiVolume.toFloat()
guiTrack.getFilter<PreGain>().gain = guiVolume.toFloat()
// process fades

4
src/net/torvald/terrarum/audio/dsp/Gain.kt → src/net/torvald/terrarum/audio/dsp/PreGain.kt
View File

@@ -9,7 +9,7 @@ import kotlin.math.roundToInt
/**
* Created by minjaesong on 2023-11-25.
*/
class Gain(var gain: Float): TerrarumAudioFilter() {
class PreGain(var gain: Float): TerrarumAudioFilter() {
override fun thru(inbuf: List<FloatArray>, outbuf: List<FloatArray>) {
for (i in 0 until App.audioBufferSize) {
outbuf[0][i] = inbuf[0][i] * gain
@@ -25,7 +25,7 @@ class Gain(var gain: Float): TerrarumAudioFilter() {
override val debugViewHeight = 16
override fun copyParamsFrom(other: TerrarumAudioFilter) {
if (other is Gain) {
if (other is PreGain) {
this.gain = other.gain
}
}