SC envelope gets a delay retrigger level (#161)

baconpaul · web-flow · commit b548af9a522c · 2025-01-03T17:17:24.000-05:00
diff --git a/include/sst/basic-blocks/modulators/AHDSRShapedSC.h b/include/sst/basic-blocks/modulators/AHDSRShapedSC.h
@@ -89,7 +89,8 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
         else
         {
             phase = 0;
-            this->outBlock0 = 0.0;
+            delayValue = from;
+            this->outBlock0 = delayValue;
             this->stage = base_t::s_delay;
         }
     }
@@ -262,11 +263,14 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
         case base_t::s_delay:
         {
             phase += dPhase(delay);
+
+            target = delayValue;
             if (phase > 1)
             {
                 phase -= std::floor(phase);
                 if (a > 0.f)
                 {
+                    attackStartValue = delayValue;
                     stage = base_t::s_attack;
                 }
                 else if (h > 0.f)
@@ -403,7 +407,7 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>
         // (int)base_t::stage << " re=" << base_t::outBlock0 << std::endl;
     }
 
-    float phase{0.f}, attackStartValue{0.f}, releaseStartValue{0.f};
+    float phase{0.f}, attackStartValue{0.f}, releaseStartValue{0.f}, delayValue{0.f};
 };
 }; // namespace sst::basic_blocks::modulators
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,8 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>`
`89`	`89`	`else`
`90`	`90`	`{`
`91`	`91`	`phase = 0;`
`92`		`- this->outBlock0 = 0.0;`
	`92`	`+ delayValue = from;`
	`93`	`+ this->outBlock0 = delayValue;`
`93`	`94`	`this->stage = base_t::s_delay;`
`94`	`95`	`}`
`95`	`96`	`}`
`@@ -262,11 +263,14 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>`
`262`	`263`	`case base_t::s_delay:`
`263`	`264`	`{`
`264`	`265`	`phase += dPhase(delay);`
	`266`	`+`
	`267`	`+ target = delayValue;`
`265`	`268`	`if (phase > 1)`
`266`	`269`	`{`
`267`	`270`	`phase -= std::floor(phase);`
`268`	`271`	`if (a > 0.f)`
`269`	`272`	`{`
	`273`	`+ attackStartValue = delayValue;`
`270`	`274`	`stage = base_t::s_attack;`
`271`	`275`	`}`
`272`	`276`	`else if (h > 0.f)`
`@@ -403,7 +407,7 @@ struct AHDSRShapedSC : DiscreteStagesEnvelope<BLOCK_SIZE, RangeProvider>`
`403`	`407`	`// (int)base_t::stage << " re=" << base_t::outBlock0 << std::endl;`
`404`	`408`	`}`
`405`	`409`
`406`		`- float phase{0.f}, attackStartValue{0.f}, releaseStartValue{0.f};`
	`410`	`+ float phase{0.f}, attackStartValue{0.f}, releaseStartValue{0.f}, delayValue{0.f};`
`407`	`411`	`};`
`408`	`412`	`}; // namespace sst::basic_blocks::modulators`
`409`	`413`