From fca7b90f5802169099b2258e3ea8468eafa406e9 Mon Sep 17 00:00:00 2001 From: chriskiefer Date: Thu, 6 Nov 2025 17:59:31 +0000 Subject: [PATCH] rc2 --- src/memllib | 2 +- voicespaces/VoiceSpace1.hpp | 2 +- voicespaces/VoiceSpace2.hpp | 2 +- voicespaces/VoiceSpaceSingle1.hpp | 13 +++++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/memllib b/src/memllib index 25f2177..0331d95 160000 --- a/src/memllib +++ b/src/memllib @@ -1 +1 @@ -Subproject commit 25f217773a91c4f1459aeb34a644117a18fe17b7 +Subproject commit 0331d95ad44c3eea44bbaea6dfcd05eb8183169e diff --git a/voicespaces/VoiceSpace1.hpp b/voicespaces/VoiceSpace1.hpp index 2c73e59..edf9d8a 100644 --- a/voicespaces/VoiceSpace1.hpp +++ b/voicespaces/VoiceSpace1.hpp @@ -32,7 +32,7 @@ \ dlfb = params[19] * 0.9f; \ \ - env.setup(params[30] * 200.f,params[20] * params[20] * 500.f,0.01 + (params[31] * 0.5f), params[32] * 500.f, sampleRatef ); \ + env.setup(1.f + params[30] * 200.f,1.f + params[20] * params[20] * 500.f,0.01 + (params[31] * 0.5f), 1.f + params[32] * 500.f, sampleRatef ); \ \ sineShapeGain = params[26] * params[26]; \ sineShapeASym = params[27] * params[27] * 0.1f; \ diff --git a/voicespaces/VoiceSpace2.hpp b/voicespaces/VoiceSpace2.hpp index e68f11b..0f3c1d2 100644 --- a/voicespaces/VoiceSpace2.hpp +++ b/voicespaces/VoiceSpace2.hpp @@ -42,7 +42,7 @@ \ dlfb = params[19] * 0.95f; \ \ - env.setup(params[30] * 200.f,params[20] * params[20] * 500.f,0.01 + (params[31] * 0.5f), params[32] * 500.f, sampleRatef ); \ + env.setup(1.f + params[30] * 200.f,1.f + params[20] * params[20] * 500.f,0.01 + (params[31] * 0.5f), 1.f + params[32] * 500.f, sampleRatef ); \ \ sineShapeGain = params[26] * params[26]; \ sineShapeASym = params[27] * params[27] * 0.2f; \ diff --git a/voicespaces/VoiceSpaceSingle1.hpp b/voicespaces/VoiceSpaceSingle1.hpp index 203355c..e6c4ad8 100644 --- a/voicespaces/VoiceSpaceSingle1.hpp +++ b/voicespaces/VoiceSpaceSingle1.hpp @@ -8,15 +8,20 @@ p1Gain=0.f; \ p2Gain=0.f; \ p3Gain=0.f; \ - \ - paf0_cf = (params[0] * 2.0f); \ - paf0_bw = 10.f + (params[0] * 500.f); \ + float p1 = params[0] + params[7] + params[8];\ + p1 = ((sinf(p1 * TWOPI)) + 1.f) * 0.5f;\ + float p2 = params[9] + params[10] + params[11];\ + p2 = ((sinf(p2 * TWOPI)) + 1.f) * 0.5f;\ + float p3 = params[12] + params[13] + params[14] + params[15];\ + p3 = ((sinf(p3 * TWOPI)) + 1.f) * 0.5f;\ + paf0_cf = (p1 * 2.0f); \ + paf0_bw = 10.f + (p2 * 700.f); \ \ paf0_vib = 0.f; \ \ paf0_vfr = 0.f; \ \ - paf0_shift = -20.f + (params[0] * 40.f); \ + paf0_shift = -20.f + (p3 * 40.f); \ \ dl1mix = 0.f; \ \