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

multiple amb tracks

Browse Source
This commit is contained in:
minjaesong
2024-01-21 17:01:45 +09:00
parent c00dd4e0bf
commit 6334cac3ba
4 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -913,7 +913,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
App.audioMixer.convolveBusCave.volume = 0.0
}
val openness = (TileSurvey.getRatio("basegame.Ingame.openness") ?: 0.0).times(1.74).coerceIn(0.0, 1.0)
(App.audioMixer.ambientTrack.filters[3] as Gain).gain = openness.pow(2.0 / 3.0).toFloat()
(App.audioMixer.ambSumBus.filters[1] as Gain).gain = openness.pow(2.0 / 3.0).toFloat()

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

@@ -15,6 +15,7 @@ import net.torvald.reflection.forceInvoke
import net.torvald.terrarum.*
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.audio.AudioMixer
import net.torvald.terrarum.audio.TerrarumAudioMixerTrack
import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RATE
import java.io.File
import java.io.FileInputStream
@@ -371,8 +372,8 @@ class TerrarumMusicGovernor : MusicGovernor() {
}
private fun stopAmbient() {
if (::currentAmbientTrack.isInitialized)
App.audioMixer.ambientTrack.nextTrack = currentAmbientTrack
// if (::currentAmbientTrack.isInitialized)
// App.audioMixer.ambientTrack.nextTrack = currentAmbientTrack
}
private fun startAmbient(song: MusicContainer) {

2
src/net/torvald/terrarum/modulebasegame/TitleScreen.kt
View File

@@ -266,7 +266,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
App.bogoflops = maxOf(App.bogoflops, bogoflops)
App.audioMixer.ambientTrack.let {
listOf(App.audioMixer.ambientTrack1, App.audioMixer.ambientTrack2).forEach {
it.stop()
it.currentTrack = null
it.nextTrack = null