From 87081b0a33aa7201afef94321ff5986841971e73 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 10 Feb 2024 16:14:10 +0900 Subject: [PATCH] removing modulebasegame imports from the audio engine --- src/net/torvald/terrarum/audio/AudioMixer.kt | 13 ++----------- src/net/torvald/terrarum/audio/AudioProcessBuf.kt | 1 - 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt index 8e75b09bf..1487ad97e 100644 --- a/src/net/torvald/terrarum/audio/AudioMixer.kt +++ b/src/net/torvald/terrarum/audio/AudioMixer.kt @@ -12,7 +12,6 @@ import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RAT import net.torvald.terrarum.audio.dsp.* import net.torvald.terrarum.concurrent.ThreadExecutor import net.torvald.terrarum.gameactors.ActorWithBody -import net.torvald.terrarum.modulebasegame.BuildingMaker import java.lang.Thread.MAX_PRIORITY import java.util.* import kotlin.math.* @@ -311,16 +310,8 @@ class AudioMixer : Disposable { private var muteLatched = false fun update(delta: Float) { - // test the panning - /*musicTrack.getFilter().let { - if (Gdx.input.isKeyPressed(Input.Keys.RIGHT)) { - it.pan = (it.pan + 0.001f).coerceIn(-1f, 1f) - } - else if (Gdx.input.isKeyPressed(Input.Keys.LEFT)) { - it.pan = (it.pan - 0.001f).coerceIn(-1f, 1f) - } - }*/ - if (Terrarum.ingame is BuildingMaker) { + // enable manual mixer on BuildingMaker + if (Terrarum.ingame?.javaClass?.canonicalName == "net.torvald.terrarum.modulebasegame.BuildingMaker") { val mixDelta = if (testAudioMixRatio >= 0.0) 0.001 else (0.001 * MaterialCodex["AIIR"].sondrefl).absoluteValue if (Gdx.input.isKeyPressed(Input.Keys.UP)) diff --git a/src/net/torvald/terrarum/audio/AudioProcessBuf.kt b/src/net/torvald/terrarum/audio/AudioProcessBuf.kt index 5a5b90b8e..a82a35368 100644 --- a/src/net/torvald/terrarum/audio/AudioProcessBuf.kt +++ b/src/net/torvald/terrarum/audio/AudioProcessBuf.kt @@ -6,7 +6,6 @@ import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RATE import net.torvald.terrarum.ceilToInt import net.torvald.terrarum.floorToInt -import net.torvald.terrarum.printStackTrace import net.torvald.terrarum.serialise.toUint import org.dyn4j.Epsilon import kotlin.math.PI