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

renaming and putting more accurate const

Browse Source
This commit is contained in:
minjaesong
2023-11-23 15:00:05 +09:00
parent 39f3ff89b7
commit 08d69ba09c
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ object AudioMixer: Disposable {
init { init {
masterTrack.filters[0] = SoftLim masterTrack.filters[0] = SoftClp
masterTrack.filters[1] = Buffer masterTrack.filters[1] = Buffer
masterTrack.filters[2] = Scope() masterTrack.filters[2] = Scope()

5
src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt
View File

@@ -2,7 +2,6 @@ package net.torvald.terrarum.audio
import com.jme3.math.FastMath import com.jme3.math.FastMath
import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.BUFFER_SIZE import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.BUFFER_SIZE
import net.torvald.terrarum.modulebasegame.ui.abs
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
import kotlin.math.tanh import kotlin.math.tanh
@@ -27,7 +26,7 @@ object NullFilter : TerrarumAudioFilter() {
} }
} }
object SoftLim : TerrarumAudioFilter() { object SoftClp : TerrarumAudioFilter() {
val downForce = arrayOf(1.0f, 1.0f) val downForce = arrayOf(1.0f, 1.0f)
override fun thru(inbuf0: List<FloatArray>, inbuf1: List<FloatArray>, outbuf0: List<FloatArray>, outbuf1: List<FloatArray>) { override fun thru(inbuf0: List<FloatArray>, inbuf1: List<FloatArray>, outbuf0: List<FloatArray>, outbuf1: List<FloatArray>) {
@@ -55,7 +54,7 @@ class Scope : TerrarumAudioFilter() {
val backbufL = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) } val backbufL = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) }
val backbufR = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) } val backbufR = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) }
private val sqrt2p = 0.7071067811865476 private val sqrt2p = 0.7071067811865475
override fun thru(inbuf0: List<FloatArray>, inbuf1: List<FloatArray>, outbuf0: List<FloatArray>, outbuf1: List<FloatArray>) { override fun thru(inbuf0: List<FloatArray>, inbuf1: List<FloatArray>, outbuf0: List<FloatArray>, outbuf1: List<FloatArray>) {
// shift buffer // shift buffer

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

@@ -13,9 +13,7 @@ import net.torvald.terrarum.Terrarum.mouseTileX
import net.torvald.terrarum.Terrarum.mouseTileY import net.torvald.terrarum.Terrarum.mouseTileY
import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
import net.torvald.terrarum.audio.* import net.torvald.terrarum.audio.*
import net.torvald.terrarum.audio.MixerTrackProcessor.Companion.BACK_BUF_COUNT
import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.BUFFER_SIZE import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.BUFFER_SIZE
import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RATED
import net.torvald.terrarum.controller.TerrarumController import net.torvald.terrarum.controller.TerrarumController
import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.GameWorld
import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.gameworld.fmod
@@ -548,7 +546,7 @@ class BasicDebugInfoWindow : UICanvas() {
} }
// comp marker // comp marker
track.filters.filterIsInstance<SoftLim>().firstOrNull()?.let { track.filters.filterIsInstance<SoftClp>().firstOrNull()?.let {
for (ch in 0..1) { for (ch in 0..1) {
val downForceNow = it.downForce[ch] * 1.0 val downForceNow = it.downForce[ch] * 1.0
if (downForceNow != 0.0) { if (downForceNow != 0.0) {