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

mixer: compression indicator

Browse Source
This commit is contained in:
minjaesong
2023-11-22 23:22:45 +09:00
parent 179e10f4a4
commit 42e189582e
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ 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 net.torvald.terrarum.modulebasegame.ui.abs
import kotlin.math.absoluteValue
import kotlin.math.tanh import kotlin.math.tanh
abstract class TerrarumAudioFilter { abstract class TerrarumAudioFilter {
@@ -27,13 +28,24 @@ object NullFilter : TerrarumAudioFilter() {
} }
object SoftLim : TerrarumAudioFilter() { object SoftLim : TerrarumAudioFilter() {
var downForce = 1.0f; private set
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>) {
downForce = 1.0f
for (ch in inbuf1.indices) { for (ch in inbuf1.indices) {
val inn = inbuf1[ch] val inn = inbuf1[ch]
val out = outbuf1[ch] val out = outbuf1[ch]
for (i in inn.indices) { for (i in inn.indices) {
out[i] = tanh(inn[i]) val u = inn[i]
val v = tanh(u)
val diff = (v.absoluteValue / u.absoluteValue)
out[i] = v
if (!diff.isNaN()) {
downForce = minOf(downForce, diff)
}
} }
} }
} }

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

@@ -385,16 +385,18 @@ class BasicDebugInfoWindow : UICanvas() {
private val COL_WELL2 = Color(0x3f5360_aa) private val COL_WELL2 = Color(0x3f5360_aa)
private val COL_WELL3 = Color(0x485437_aa) private val COL_WELL3 = Color(0x485437_aa)
private val COL_WELL4 = Color(0x543748_aa) private val COL_WELL4 = Color(0x543748_aa)
private val COL_FILTER_TITLE = Color(0x72777d_aa) private val COL_FILTER_TITLE = Color(0x5e656c_aa)
private val COL_FILTER_TITLE_SHADE = Color(0x505558_aa) private val COL_FILTER_TITLE_SHADE = Color(0x3b3f43_aa)
private val COL_FILTER_WELL_BACK = Color(0x222325_aa) private val COL_FILTER_WELL_BACK = Color(0x222325_aa)
private val COL_MIXER_BACK = Color(0x0f110c_aa) private val COL_MIXER_BACK = Color(0x0f110c_aa)
private val COL_METER_TROUGH = Color(0x242527_aa) private val COL_METER_TROUGH = Color(0x232527_aa)
private val COL_METER_GRAD = Color(0x1c5075_aa) private val COL_METER_GRAD = Color(0x1c5075_aa)
private val COL_METER_GRAD2 = Color(0x2ca3f3_aa) private val COL_METER_GRAD2 = Color(0x25a0f2_aa)
private val COL_SENDS_GRAD = Color(0x50751c_aa) private val COL_SENDS_GRAD = Color(0x50751c_aa)
private val COL_SENDS_GRAD2 = Color(0xa3f32c_aa.toInt()) private val COL_SENDS_GRAD2 = Color(0xa0f225_aa.toInt())
private val COL_METER_BAR = Color(0x76c9fb_aa) private val COL_METER_BAR = Color(0x4caee5_aa)
private val COL_METER_COMP_BAR = Color(0xf3d458_aa.toInt())
private val COL_METER_COMP_BAR2 = Color(0x7f6b18_aa.toInt())
private val FILTER_NAME_ACTIVE = Color(0xeeeeee_bf.toInt()) private val FILTER_NAME_ACTIVE = Color(0xeeeeee_bf.toInt())
private val FILTER_BYPASSED = Color(0xf1b934_bf.toInt()) private val FILTER_BYPASSED = Color(0xf1b934_bf.toInt())
@@ -520,6 +522,18 @@ class BasicDebugInfoWindow : UICanvas() {
Toolkit.fillArea(batch, x, faderY + 18f + meterHeight, 6f, h) Toolkit.fillArea(batch, x, faderY + 18f + meterHeight, 6f, h)
} }
// comp marker
track.filters.filterIsInstance<SoftLim>().firstOrNull()?.let {
val downDb = fullscaleToDecibels(it.downForce.toDouble())
if (downDb.isFinite()) {
val h = meterHeight + ((downDb + dbLow) / dbLow * -meterHeight).coerceAtMost(0.0).toFloat()
batch.color = COL_METER_COMP_BAR2
Toolkit.fillArea(batch, x + 32f, faderY + 18f, 1f, h)
batch.color = COL_METER_COMP_BAR
Toolkit.fillArea(batch, x + 33f, faderY + 18f, 1f, h)
}
}
// slider trough // slider trough
batch.color = COL_METER_TROUGH batch.color = COL_METER_TROUGH
Toolkit.fillArea(batch, sliderX, faderY + 16, 2, meterTroughHeight) Toolkit.fillArea(batch, sliderX, faderY + 16, 2, meterTroughHeight)
@@ -550,7 +564,7 @@ class BasicDebugInfoWindow : UICanvas() {
) )
private val scopePlotCol = Color(0x76c9fb_33) private val scopePlotCol = Color(0x61b3df_33)
private fun drawFilterParam(batch: SpriteBatch, x: Int, y: Int, filter: TerrarumAudioFilter, track: TerrarumAudioMixerTrack) { private fun drawFilterParam(batch: SpriteBatch, x: Int, y: Int, filter: TerrarumAudioFilter, track: TerrarumAudioMixerTrack) {
when (filter) { when (filter) {