Wavetable transition smoothing

ctag-fh-kiel · Sep 14, 2024 · f100e2d · f100e2d
1 parent c250dca
commit f100e2d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/components/ctagSoundProcessor/ctagSoundProcessorWTOsc.cpp b/components/ctagSoundProcessor/ctagSoundProcessorWTOsc.cpp
@@ -30,7 +30,8 @@ using namespace CTAG::SP::HELPERS;
 void ctagSoundProcessorWTOsc::Process(const ProcessData &data) {
     // wave select
     currentBank = wavebank;
-    MK_FLT_PAR_ABS(fWave, wave, 4095.f, 1.f)
+	if(cv_wave != -1) ONE_POLE(fWave, fabsf(data.cv[cv_wave]), 0.1f)
+	else fWave = wave / 4095.f;
 
 
     if(lastBank != currentBank){ // this is slow, hence not modulated by CV

diff --git a/components/ctagSoundProcessor/ctagSoundProcessorWTOsc.hpp b/components/ctagSoundProcessor/ctagSoundProcessorWTOsc.hpp
@@ -49,6 +49,7 @@ namespace CTAG {
             stmlib::Svf svf;
             int16_t *buffer = NULL;
             float *fbuffer = NULL;
+        	float fWave = 0.f;
             const int16_t *wavetables[64];
             int currentBank = 0;
             int lastBank = -1;

diff --git a/components/ctagSoundProcessor/ctagSoundProcessorWTOscDuo.cpp b/components/ctagSoundProcessor/ctagSoundProcessorWTOscDuo.cpp
@@ -30,8 +30,10 @@ using namespace CTAG::SP::HELPERS;
 void ctagSoundProcessorWTOscDuo::Process(const ProcessData &data) {
     // wave select
     currentBank = wavebank;
-    MK_FLT_PAR_ABS(fwave_1, wave_1, 4095.f, 1.f)
-    MK_FLT_PAR_ABS(fwave_2, wave_2, 4095.f, 1.f)
+    if(cv_wave_1 != -1) ONE_POLE(fwave_1, fabsf(data.cv[cv_wave_1]), 0.1f)
+    else fwave_1 = wave_1 / 4095.f;
+    if(cv_wave_2 != -1) ONE_POLE(fwave_2, fabsf(data.cv[cv_wave_1]), 0.1f)
+    else fwave_2 = wave_2 / 4095.f;
 
     if (lastBank != currentBank) { // this is slow, hence not modulated by CV
         prepareWavetables();

diff --git a/components/ctagSoundProcessor/ctagSoundProcessorWTOscDuo.hpp b/components/ctagSoundProcessor/ctagSoundProcessorWTOscDuo.hpp
@@ -58,6 +58,8 @@ namespace CTAG {
             int currentBank = 0;
             int lastBank = -1;
             bool isWaveTableGood = false;
+        	float fwave_1 = 0.f;
+        	float fwave_2 = 0.f;
             float valADSR_1 = 0.f;
             float valADSR_2 = 0.f; 
             float valLFO_1 = 0.f;