finalized 0.5.3

reillypascal · Jun 19, 2024 · 701f470 · 701f470
1 parent 23c32af
commit 701f470
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 8 deletions.
diff --git a/Source/ConcertHallB.cpp b/Source/ConcertHallB.cpp
@@ -397,7 +397,10 @@ ReverbProcessorParameters& LargeConcertHallB::getParameters() { return mParamete
 void LargeConcertHallB::setParameters(const ReverbProcessorParameters& params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
 
 ////==============================================================================

diff --git a/Source/DattorroVerb.cpp b/Source/DattorroVerb.cpp
@@ -258,7 +258,10 @@ ReverbProcessorParameters& DattorroPlate::getParameters() { return mParameters;
 void DattorroPlate::setParameters(const ReverbProcessorParameters& params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
 
 //DattorroPlate::DattorroPlate() {}

diff --git a/Source/EarlyReflections.cpp b/Source/EarlyReflections.cpp
@@ -100,5 +100,8 @@ ReverbProcessorParameters& EarlyReflections::getParameters() { return mParameter
 void EarlyReflections::setParameters(const ReverbProcessorParameters& params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
diff --git a/Source/FDNs.cpp b/Source/FDNs.cpp
@@ -246,7 +246,10 @@ ReverbProcessorParameters& GeneralizedFDN::getParameters() { return mParameters;
 void GeneralizedFDN::setParameters(const ReverbProcessorParameters& params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
 
 //===================================================================

diff --git a/Source/Freeverb.cpp b/Source/Freeverb.cpp
@@ -195,7 +195,10 @@ ReverbProcessorParameters& Freeverb::getParameters() { return mParameters; }
 void Freeverb::setParameters(const ReverbProcessorParameters& params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
 
 ////==============================================================================

diff --git a/Source/GardnerRooms.cpp b/Source/GardnerRooms.cpp
@@ -146,7 +146,10 @@ ReverbProcessorParameters& GardnerSmallRoom::getParameters() { return mParameter
 void GardnerSmallRoom::setParameters(const ReverbProcessorParameters &params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
 
 
@@ -333,7 +336,10 @@ ReverbProcessorParameters& GardnerMediumRoom::getParameters() { return mParamete
 void GardnerMediumRoom::setParameters(const ReverbProcessorParameters& params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
 
 //==============================================================================
@@ -522,7 +528,10 @@ ReverbProcessorParameters& GardnerLargeRoom::getParameters() { return mParameter
 void GardnerLargeRoom::setParameters(const ReverbProcessorParameters &params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 1.75f);
+    }
 }
 
 ////==============================================================================

diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
@@ -323,7 +323,7 @@ void RSAlgorithmicVerbAudioProcessor::processBlock (juce::AudioBuffer<float>& bu
         reverbParameters.diffusion = parameters.getRawParameterValue("diffusion")->load();
         reverbParameters.modDepth = parameters.getRawParameterValue("modDepth")->load();
         reverbParameters.modRate = parameters.getRawParameterValue("modRate")->load();
-        reverbParameters.roomSize = scale(parameters.getRawParameterValue("roomSize")->load(), 0.0f, 1.0f, 0.25f, 1.75f);
+        reverbParameters.roomSize = parameters.getRawParameterValue("roomSize")->load();
 
         //============ set parameters ============
         reverbProcessor->setParameters(reverbParameters);

diff --git a/Source/SpecialFX.cpp b/Source/SpecialFX.cpp
@@ -21,6 +21,10 @@ void Constellation::prepare(const juce::dsp::ProcessSpec& spec)
 
     delay.prepare(spec);
     dampingFilter.prepare(spec);
+    dcFilter.prepare(spec);
+
+    dcFilter.setType(juce::dsp::FirstOrderTPTFilterType::highpass);
+    dcFilter.setCutoffFrequency(20.0f);
 
     // prepare lfo
     lfoParameters.frequency_Hz = 0.25;
@@ -60,32 +64,34 @@ void Constellation::processBlock(juce::AudioBuffer<float>& buffer, juce::MidiBuf
             lfoOutput = lfo[channel].renderAudioOutput();
 
             // input + damped feedback into delay
-            delay.pushSample(channel, channelData[sample] + (dampingFilter.processSample(channel, channelFeedback[channel]) * mParameters.decayTime));
+            delay.pushSample(channel, channelData[sample] + dcFilter.processSample(channel, dampingFilter.processSample(channel, channelFeedback[channel]) * mParameters.decayTime));
             dampingFilter.snapToZero();
+            dcFilter.snapToZero();
 
             // reset channelData, then sum outputs to channel
             channelData[sample] = 0.0f;
             for (int delOut = 0; delOut < 4; ++delOut)
             {
-                channelData[sample] += delay.getSampleAtDelay(channel, channelOutDelayTimes[channel][delOut] * mSamplesPerMs) / 2.828f;
+                channelData[sample] += delay.getSampleAtDelay(channel, channelOutDelayTimes[channel][delOut] * mSamplesPerMs) / 2.0f;
             }
 
             // reset feedback, then add delay taps
             channelFeedback[channel] = 0.0f;
-            for (int delFb = 0; delFb < 16; ++delFb)
+            for (int delTime = 0; delTime < 16; ++delTime)
             {
                 float selectedLfo { 0.0f };
 
-                if (delFb % 4 == 0)
+                if (delTime % 4 == 0)
                     selectedLfo = lfoOutput.quadPhaseOutput_neg;
-                else if (delFb % 3 == 0)
+                else if (delTime % 3 == 0)
                     selectedLfo = lfoOutput.invertedOutput;
-                else if (delFb % 2 == 0)
+                else if (delTime % 2 == 0)
                     selectedLfo = lfoOutput.quadPhaseOutput_pos;
                 else
                     selectedLfo = lfoOutput.normalOutput;
 
-                channelFeedback[channel] += delay.getSampleAtDelay(channel, (feedbackDelayTimes[delFb] * mSamplesPerMs * mParameters.roomSize) + (selectedLfo * 32.0f)) / 13.0f;
+                // modulate from +/- 32 to +/- 64; does not turn fully off to allow for longer tails
+                channelFeedback[channel] += delay.getSampleAtDelay(channel, (feedbackDelayTimes[delTime] * mSamplesPerMs * mParameters.roomSize) + (selectedLfo * (mParameters.modDepth * 32.0f + 32.0f))) / 7.0f;
             }
         }
     }
@@ -102,6 +108,9 @@ ReverbProcessorParameters& Constellation::getParameters() { return mParameters;
 void Constellation::setParameters(const ReverbProcessorParameters& params)
 {
     if (!(params == mParameters))
+    {
         mParameters = params;
+        mParameters.roomSize = scale(mParameters.roomSize, 0.0f, 1.0f, 0.25f, 4.0f);
+    }
 }
 
diff --git a/Source/SpecialFX.h b/Source/SpecialFX.h
@@ -38,6 +38,7 @@ class Constellation : public ReverbProcessorBase
     DelayLineWithSampleAccess<float> delay { 22050 };
 
     juce::dsp::FirstOrderTPTFilter<float> dampingFilter;
+    juce::dsp::FirstOrderTPTFilter<float> dcFilter;
 
     OscillatorParameters lfoParameters;
     SignalGenData lfoOutput;