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

removing modulebasegame imports from the audio engine

Browse Source
This commit is contained in:
minjaesong
2024-02-10 16:14:10 +09:00
parent b93e987011
commit 87081b0a33
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<BinoPan>().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))

1
src/net/torvald/terrarum/audio/AudioProcessBuf.kt
View File

@@ -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