Merge pull request #470 from ASleepyCat/laser-fx-fix

Drewol · web-flow · commit 71bb686023f7 · 2021-05-19T19:00:19.000+02:00
Clamp laser FX parameters, fix FX parameters being parsed incorrectly
diff --git a/Audio/include/Audio/DSP.hpp b/Audio/include/Audio/DSP.hpp
@@ -44,9 +44,9 @@ class BQFDSP : public DSP
 	// Delayed samples
 	static const uint32 order = 2;
 	// FIR Delay buffers
-	float zb[2][order];
+	float zb[2][order]{};
 	// IIR Delay buffers
-	float za[2][order];
+	float za[2][order]{};
 };
 
 // Combinded Low/High-pass and Peaking filter
@@ -117,7 +117,7 @@ class GateDSP : public DSP
 	uint32 m_length = 0;
 	uint32 m_fadeIn = 0;  // Fade In mark
 	uint32 m_fadeOut = 0; // Fade Out mark
-	uint32 m_halfway;	  // Halfway mark
+	uint32 m_halfway{};	  // Halfway mark
 	uint32 m_currentSample = 0;
 };
 
@@ -177,7 +177,7 @@ class WobbleDSP : public BQFDSP
 	virtual const char *GetName() const { return "WobbleDSP"; }
 
 private:
-	uint32 m_length;
+	uint32 m_length{};
 	uint32 m_currentSample = 0;
 };
 
@@ -269,7 +269,7 @@ class SidechainDSP : public DSP
 	// Volume multiplier for the sidechaing
 	float amount = 0.25f;
 
-	Interpolation::CubicBezier curve;
+	Interpolation::CubicBezier curve{};
 
 	virtual void Process(float *out, uint32 numSamples);
 	virtual const char *GetName() const { return "SidechainDSP"; }
diff --git a/Audio/src/DSP.cpp b/Audio/src/DSP.cpp
@@ -2,7 +2,6 @@
 #include "DSP.hpp"
 #include "AudioOutput.hpp"
 #include "Audio_Impl.hpp"
-#include <Shared/Interpolation.hpp>
 
 void PanDSP::Process(float *out, uint32 numSamples)
 {
@@ -217,6 +216,7 @@ void GateDSP::SetLength(double length)
 }
 void GateDSP::SetGating(float gating)
 {
+	gating = Math::Clamp(gating, 0.f, 1.f);
 	float flength = (float)m_length;
 	m_gating = gating;
 	m_halfway = (uint32)(flength * gating);
@@ -335,6 +335,7 @@ void RetriggerDSP::SetResetDuration(uint32 resetDuration)
 }
 void RetriggerDSP::SetGating(float gating)
 {
+	gating = Math::Clamp(gating, 0.f, 1.f);
 	m_gating = gating;
 	m_gateLength = (uint32)((float)m_length * gating);
 }
@@ -675,12 +676,8 @@ class PitchShiftDSP_Impl
 	Vector<float> m_receiveBuffer;
 
 public:
-	PitchShiftDSP_Impl()
-	{
-	}
-	~PitchShiftDSP_Impl()
-	{
-	}
+	PitchShiftDSP_Impl() = default;
+	~PitchShiftDSP_Impl() = default;
 	void Init(uint32 sampleRate)
 	{
 		m_soundtouch.setChannels(2);
diff --git a/Beatmap/src/BeatmapFromKSH.cpp b/Beatmap/src/BeatmapFromKSH.cpp
@@ -198,12 +198,7 @@ struct MultiParamRange
 static MultiParam ParseParam(const String &in)
 {
 	MultiParam ret;
-	if (in.find('.') != -1)
-	{
-		ret.type = MultiParam::Float;
-		sscanf(*in, "%f", &ret.fval);
-	}
-	else if (in.find('/') != -1)
+	if (in.find('/') != -1)
 	{
 		ret.type = MultiParam::Float;
 		String a, b;
@@ -222,6 +217,11 @@ static MultiParam ParseParam(const String &in)
 		sscanf(*in, "%i", &percentage);
 		ret.fval = percentage / 100.0;
 	}
+	else if (in.find('.') != -1)
+	{
+		ret.type = MultiParam::Float;
+		sscanf(*in, "%f", &ret.fval);
+	}
 	else
 	{
 		ret.type = MultiParam::Int;
@@ -236,7 +236,7 @@ AudioEffect ParseCustomEffect(const KShootEffectDefinition &def, Vector<String>
 	bool typeSet = false;
 
 	Map<String, MultiParamRange> params;
-	for (auto s : def.parameters)
+	for (const auto& s : def.parameters)
 	{
 		// This one is easy
 		if (s.first == "type")
diff --git a/Main/include/Audio/AudioPlayback.hpp b/Main/include/Audio/AudioPlayback.hpp
@@ -122,4 +122,6 @@ class AudioPlayback : Unique
 	class DSP *m_buttonDSPs[2] = {nullptr};
 	HoldObjectState *m_currentHoldEffects[2] = {nullptr};
 	float m_effectMix[2] = {0.0f};
+
+	bool m_SkipEffectIfInputIsZero();
 };
diff --git a/Main/src/Audio/AudioPlayback.cpp b/Main/src/Audio/AudioPlayback.cpp
@@ -251,9 +251,15 @@ void AudioPlayback::SetLaserEffect(EffectType type)
 		m_laserEffect = m_beatmap->GetFilter(type);
 	}
 }
+bool AudioPlayback::m_SkipEffectIfInputIsZero()
+{
+	return m_laserEffect.type == EffectType::PeakingFilter || m_laserEffect.type == EffectType::HighPassFilter
+		|| m_laserEffect.type == EffectType::LowPassFilter || m_laserEffect.type == EffectType::PitchShift
+		|| m_laserEffect.type == EffectType::Bitcrush;
+}
 void AudioPlayback::SetLaserFilterInput(float input, bool active)
 {
-	if (m_laserEffect.type != EffectType::None && (active || (input != 0.0f)))
+	if (m_laserEffect.type != EffectType::None && (active && (input != 0.0f || !m_SkipEffectIfInputIsZero())))
 	{
 		if (m_laserEffect.type == EffectType::SwitchAudio)
 		{
@@ -292,6 +298,7 @@ void AudioPlayback::SetLaserFilterInput(float input, bool active)
 
 		// Set params
 		m_SetLaserEffectParameter(input);
+		m_laserDSP->mix = Math::Clamp(m_laserDSP->mix, 0.f, 1.f);
 		m_laserInput = input;
 	}
 	else
@@ -436,9 +443,6 @@ void AudioPlayback::m_CleanupDSP(DSP *&ptr)
 }
 void AudioPlayback::m_SetLaserEffectParameter(float input)
 {
-	if (!m_laserDSP)
-		return;
-
 	assert(input >= 0.0f && input <= 1.0f);
 
 	// Mix float biquad filters, these are applied manualy by changing the filter parameters (gain,q,freq,etc.)
@@ -454,14 +458,14 @@ void AudioPlayback::m_SetLaserEffectParameter(float input)
 	case EffectType::Bitcrush:
 	{
 		m_laserDSP->mix = m_laserEffect.mix.Sample(input);
-		BitCrusherDSP *bcDSP = (BitCrusherDSP *)m_laserDSP;
+		auto *bcDSP = (BitCrusherDSP *)m_laserDSP;
 		bcDSP->SetPeriod((float)m_laserEffect.bitcrusher.reduction.Sample(input));
 		break;
 	}
 	case EffectType::Echo:
 	{
 		m_laserDSP->mix = m_laserEffect.mix.Sample(input);
-		EchoDSP *echoDSP = (EchoDSP *)m_laserDSP;
+		auto *echoDSP = (EchoDSP *)m_laserDSP;
 		echoDSP->feedback = m_laserEffect.echo.feedback.Sample(input);
 		break;
 	}
@@ -471,42 +475,40 @@ void AudioPlayback::m_SetLaserEffectParameter(float input)
 		if (input > 0.8f)
 			mix *= 1.0f - (input - 0.8f) / 0.2f;
 
-		BQFDSP *bqfDSP = (BQFDSP *)m_laserDSP;
+		auto *bqfDSP = (BQFDSP *)m_laserDSP;
 		bqfDSP->SetPeaking(m_laserEffect.peaking.q.Sample(input), m_laserEffect.peaking.freq.Sample(input), m_laserEffect.peaking.gain.Sample(input) * mix);
 		break;
 	}
 	case EffectType::LowPassFilter:
 	{
 		m_laserDSP->mix = m_laserEffectMix;
-		BQFDSP *bqfDSP = (BQFDSP *)m_laserDSP;
+		auto *bqfDSP = (BQFDSP *)m_laserDSP;
 		bqfDSP->SetLowPass(m_laserEffect.lpf.q.Sample(input) * mix + 0.1f, m_laserEffect.lpf.freq.Sample(input));
 		break;
 	}
 	case EffectType::HighPassFilter:
 	{
 		m_laserDSP->mix = m_laserEffectMix;
-		BQFDSP *bqfDSP = (BQFDSP *)m_laserDSP;
+		auto *bqfDSP = (BQFDSP *)m_laserDSP;
 		bqfDSP->SetHighPass(m_laserEffect.hpf.q.Sample(input) * mix + 0.1f, m_laserEffect.hpf.freq.Sample(input));
 		break;
 	}
 	case EffectType::PitchShift:
 	{
 		m_laserDSP->mix = m_laserEffect.mix.Sample(input);
-		PitchShiftDSP *ps = (PitchShiftDSP *)m_laserDSP;
+		auto *ps = (PitchShiftDSP *)m_laserDSP;
 		ps->amount = m_laserEffect.pitchshift.amount.Sample(input);
 		break;
 	}
 	case EffectType::Gate:
 	{
 		m_laserDSP->mix = m_laserEffect.mix.Sample(input);
-		GateDSP *gd = (GateDSP *)m_laserDSP;
-		// gd->SetLength(actualLength);
 		break;
 	}
 	case EffectType::Retrigger:
 	{
 		m_laserDSP->mix = m_laserEffect.mix.Sample(input);
-		RetriggerDSP *rt = (RetriggerDSP *)m_laserDSP;
+		auto *rt = (RetriggerDSP *)m_laserDSP;
 		rt->SetLength(actualLength);
 		break;
 	}
diff --git a/Main/src/Scoring.cpp b/Main/src/Scoring.cpp
@@ -428,7 +428,10 @@ bool Scoring::IsLaserHeld(uint32 laserIndex, bool includeSlams) const
 	if (m_holdObjects[laserIndex + 6])
 	{
 		// Check for slams
-		return (((LaserObjectState*)m_holdObjects[laserIndex + 6])->flags & LaserObjectState::flag_Instant) == 0;
+		auto obj = (LaserObjectState*)m_holdObjects[laserIndex + 6];
+		if ((obj->flags & LaserObjectState::flag_Instant) && obj->next)
+			return true;
+		return !(obj->flags & LaserObjectState::flag_Instant);
 	}
 	return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`#include "DSP.hpp"`
`3`	`3`	`#include "AudioOutput.hpp"`
`4`	`4`	`#include "Audio_Impl.hpp"`
`5`		`-#include <Shared/Interpolation.hpp>`
`6`	`5`
`7`	`6`	`void PanDSP::Process(float *out, uint32 numSamples)`
`8`	`7`	`{`
`@@ -217,6 +216,7 @@ void GateDSP::SetLength(double length)`
`217`	`216`	`}`
`218`	`217`	`void GateDSP::SetGating(float gating)`
`219`	`218`	`{`
	`219`	`+ gating = Math::Clamp(gating, 0.f, 1.f);`
`220`	`220`	`float flength = (float)m_length;`
`221`	`221`	`m_gating = gating;`
`222`	`222`	`m_halfway = (uint32)(flength * gating);`
`@@ -335,6 +335,7 @@ void RetriggerDSP::SetResetDuration(uint32 resetDuration)`
`335`	`335`	`}`
`336`	`336`	`void RetriggerDSP::SetGating(float gating)`
`337`	`337`	`{`
	`338`	`+ gating = Math::Clamp(gating, 0.f, 1.f);`
`338`	`339`	`m_gating = gating;`
`339`	`340`	`m_gateLength = (uint32)((float)m_length * gating);`
`340`	`341`	`}`
`@@ -675,12 +676,8 @@ class PitchShiftDSP_Impl`
`675`	`676`	`Vector<float> m_receiveBuffer;`
`676`	`677`
`677`	`678`	`public:`
`678`		`- PitchShiftDSP_Impl()`
`679`		`- {`
`680`		`- }`
`681`		`- ~PitchShiftDSP_Impl()`
`682`		`- {`
`683`		`- }`
	`679`	`+ PitchShiftDSP_Impl() = default;`
	`680`	`+ ~PitchShiftDSP_Impl() = default;`
`684`	`681`	`void Init(uint32 sampleRate)`
`685`	`682`	`{`
`686`	`683`	`m_soundtouch.setChannels(2);`
Original file line number	Diff line number	Diff line change
`@@ -251,9 +251,15 @@ void AudioPlayback::SetLaserEffect(EffectType type)`
`251`	`251`	`m_laserEffect = m_beatmap->GetFilter(type);`
`252`	`252`	`}`
`253`	`253`	`}`
	`254`	`+bool AudioPlayback::m_SkipEffectIfInputIsZero()`
	`255`	`+{`
	`256`	`+ return m_laserEffect.type == EffectType::PeakingFilter \|\| m_laserEffect.type == EffectType::HighPassFilter`
	`257`	`+ \|\| m_laserEffect.type == EffectType::LowPassFilter \|\| m_laserEffect.type == EffectType::PitchShift`
	`258`	`+ \|\| m_laserEffect.type == EffectType::Bitcrush;`
	`259`	`+}`
`254`	`260`	`void AudioPlayback::SetLaserFilterInput(float input, bool active)`
`255`	`261`	`{`
`256`		`- if (m_laserEffect.type != EffectType::None && (active \|\| (input != 0.0f)))`
	`262`	`+ if (m_laserEffect.type != EffectType::None && (active && (input != 0.0f \|\| !m_SkipEffectIfInputIsZero())))`
`257`	`263`	`{`
`258`	`264`	`if (m_laserEffect.type == EffectType::SwitchAudio)`
`259`	`265`	`{`
`@@ -292,6 +298,7 @@ void AudioPlayback::SetLaserFilterInput(float input, bool active)`
`292`	`298`
`293`	`299`	`// Set params`
`294`	`300`	`m_SetLaserEffectParameter(input);`
	`301`	`+ m_laserDSP->mix = Math::Clamp(m_laserDSP->mix, 0.f, 1.f);`
`295`	`302`	`m_laserInput = input;`
`296`	`303`	`}`
`297`	`304`	`else`
`@@ -436,9 +443,6 @@ void AudioPlayback::m_CleanupDSP(DSP *&ptr)`
`436`	`443`	`}`
`437`	`444`	`void AudioPlayback::m_SetLaserEffectParameter(float input)`
`438`	`445`	`{`
`439`		`- if (!m_laserDSP)`
`440`		`- return;`
`441`		`-`
`442`	`446`	`assert(input >= 0.0f && input <= 1.0f);`
`443`	`447`
`444`	`448`	`// Mix float biquad filters, these are applied manualy by changing the filter parameters (gain,q,freq,etc.)`
`@@ -454,14 +458,14 @@ void AudioPlayback::m_SetLaserEffectParameter(float input)`
`454`	`458`	`case EffectType::Bitcrush:`
`455`	`459`	`{`
`456`	`460`	`m_laserDSP->mix = m_laserEffect.mix.Sample(input);`
`457`		`- BitCrusherDSP bcDSP = (BitCrusherDSP )m_laserDSP;`
	`461`	`+ auto bcDSP = (BitCrusherDSP )m_laserDSP;`
`458`	`462`	`bcDSP->SetPeriod((float)m_laserEffect.bitcrusher.reduction.Sample(input));`
`459`	`463`	`break;`
`460`	`464`	`}`
`461`	`465`	`case EffectType::Echo:`
`462`	`466`	`{`
`463`	`467`	`m_laserDSP->mix = m_laserEffect.mix.Sample(input);`
`464`		`- EchoDSP echoDSP = (EchoDSP )m_laserDSP;`
	`468`	`+ auto echoDSP = (EchoDSP )m_laserDSP;`
`465`	`469`	`echoDSP->feedback = m_laserEffect.echo.feedback.Sample(input);`
`466`	`470`	`break;`
`467`	`471`	`}`
`@@ -471,42 +475,40 @@ void AudioPlayback::m_SetLaserEffectParameter(float input)`
`471`	`475`	`if (input > 0.8f)`
`472`	`476`	`mix *= 1.0f - (input - 0.8f) / 0.2f;`
`473`	`477`
`474`		`- BQFDSP bqfDSP = (BQFDSP )m_laserDSP;`
	`478`	`+ auto bqfDSP = (BQFDSP )m_laserDSP;`
`475`	`479`	`bqfDSP->SetPeaking(m_laserEffect.peaking.q.Sample(input), m_laserEffect.peaking.freq.Sample(input), m_laserEffect.peaking.gain.Sample(input) * mix);`
`476`	`480`	`break;`
`477`	`481`	`}`
`478`	`482`	`case EffectType::LowPassFilter:`
`479`	`483`	`{`
`480`	`484`	`m_laserDSP->mix = m_laserEffectMix;`
`481`		`- BQFDSP bqfDSP = (BQFDSP )m_laserDSP;`
	`485`	`+ auto bqfDSP = (BQFDSP )m_laserDSP;`
`482`	`486`	`bqfDSP->SetLowPass(m_laserEffect.lpf.q.Sample(input) * mix + 0.1f, m_laserEffect.lpf.freq.Sample(input));`
`483`	`487`	`break;`
`484`	`488`	`}`
`485`	`489`	`case EffectType::HighPassFilter:`
`486`	`490`	`{`
`487`	`491`	`m_laserDSP->mix = m_laserEffectMix;`
`488`		`- BQFDSP bqfDSP = (BQFDSP )m_laserDSP;`
	`492`	`+ auto bqfDSP = (BQFDSP )m_laserDSP;`
`489`	`493`	`bqfDSP->SetHighPass(m_laserEffect.hpf.q.Sample(input) * mix + 0.1f, m_laserEffect.hpf.freq.Sample(input));`
`490`	`494`	`break;`
`491`	`495`	`}`
`492`	`496`	`case EffectType::PitchShift:`
`493`	`497`	`{`
`494`	`498`	`m_laserDSP->mix = m_laserEffect.mix.Sample(input);`
`495`		`- PitchShiftDSP ps = (PitchShiftDSP )m_laserDSP;`
	`499`	`+ auto ps = (PitchShiftDSP )m_laserDSP;`
`496`	`500`	`ps->amount = m_laserEffect.pitchshift.amount.Sample(input);`
`497`	`501`	`break;`
`498`	`502`	`}`
`499`	`503`	`case EffectType::Gate:`
`500`	`504`	`{`
`501`	`505`	`m_laserDSP->mix = m_laserEffect.mix.Sample(input);`
`502`		`- GateDSP gd = (GateDSP )m_laserDSP;`
`503`		`- // gd->SetLength(actualLength);`
`504`	`506`	`break;`
`505`	`507`	`}`
`506`	`508`	`case EffectType::Retrigger:`
`507`	`509`	`{`
`508`	`510`	`m_laserDSP->mix = m_laserEffect.mix.Sample(input);`
`509`		`- RetriggerDSP rt = (RetriggerDSP )m_laserDSP;`
	`511`	`+ auto rt = (RetriggerDSP )m_laserDSP;`
`510`	`512`	`rt->SetLength(actualLength);`
`511`	`513`	`break;`
`512`	`514`	`}`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,10 @@ bool Scoring::IsLaserHeld(uint32 laserIndex, bool includeSlams) const`
`428`	`428`	`if (m_holdObjects[laserIndex + 6])`
`429`	`429`	`{`
`430`	`430`	`// Check for slams`
`431`		`- return (((LaserObjectState*)m_holdObjects[laserIndex + 6])->flags & LaserObjectState::flag_Instant) == 0;`
	`431`	`+ auto obj = (LaserObjectState*)m_holdObjects[laserIndex + 6];`
	`432`	`+ if ((obj->flags & LaserObjectState::flag_Instant) && obj->next)`
	`433`	`+ return true;`
	`434`	`+ return !(obj->flags & LaserObjectState::flag_Instant);`
`432`	`435`	`}`
`433`	`436`	`return false;`
`434`	`437`	`}`