GameCult/AquaSynth
Watch
9
0
Fork
You've already forked AquaSynth
 0
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

Add smooth vocal gesture curves

Browse source
This commit is contained in:
Meta Vens 2026-05-28 23:19:57 +01:00
commit 7936912a1a
6 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/AquaSynth.Core/FaustExport.cs
View file

@ -43,6 +43,8 @@ public static class FaustEmitter
source.AppendLine("release_start(a,d,g) = max(g, a + d);");
source.AppendLine("oneshot_adsr(a,d,s,r,g) = select2(age < a, select2(age < a + d, select2(age < release_start(a,d,g), select2(age < release_start(a,d,g) + r, 0.0, s * (1.0 - (age - release_start(a,d,g)) / max(0.0001, r))), s), 1.0 - (1.0 - s) * ((age - a) / max(0.0001, d))), age / max(0.0001, a));");
source.AppendLine("seg(t,t0,d,a,b) = a + (b - a) * clip01((t - t0) / max(0.0001, d));");
source.AppendLine("smooth01(x) = clip01(x) * clip01(x) * (3.0 - 2.0 * clip01(x));");
source.AppendLine("seg_smooth(t,t0,d,a,b) = a + (b - a) * smooth01((t - t0) / max(0.0001, d));");
source.AppendLine("seg_exp(t,t0,d,a,b) = exp(log(max(0.00001, a)) + (log(max(0.00001, b)) - log(max(0.00001, a))) * clip01((t - t0) / max(0.0001, d)));");
source.AppendLine("seg_curve(c,t,t0,d,a,b) = select2(c < 0.5, seg_exp(t,t0,d,a,b), seg(t,t0,d,a,b));");
source.AppendLine("rl_release_start(r1,r2,r3,g) = max(g, r1 + r2 + r3);");
@ -160,9 +162,12 @@ public static class FaustEmitter
{
var from = points[i];
var to = points[i + 1];
var segment = interpolation == ControlCurveInterpolation.Hold
? F(from.Value)
: $"seg({curveId}_time, {F(from.TimeSeconds)}, {F(Math.Max(0.0001f, to.TimeSeconds - from.TimeSeconds))}, {F(from.Value)}, {F(to.Value)})";
var segment = interpolation switch
{
ControlCurveInterpolation.Hold => F(from.Value),
ControlCurveInterpolation.Smooth => $"seg_smooth({curveId}_time, {F(from.TimeSeconds)}, {F(Math.Max(0.0001f, to.TimeSeconds - from.TimeSeconds))}, {F(from.Value)}, {F(to.Value)})",
_ => $"seg({curveId}_time, {F(from.TimeSeconds)}, {F(Math.Max(0.0001f, to.TimeSeconds - from.TimeSeconds))}, {F(from.Value)}, {F(to.Value)})"
};
expression = $"select2({curveId}_time < {F(to.TimeSeconds)}, {expression}, {segment})";
}

3
src/AquaSynth.Core/Model.cs
View file

@ -559,7 +559,8 @@ public enum ControlCurveMode
public enum ControlCurveInterpolation
{
Linear,
Hold
Hold,
Smooth
}
public sealed record ControlCurvePoint(float TimeSeconds, float Value);

1
src/AquaSynth.Core/PatchScript.cs
View file

@ -2903,6 +2903,7 @@ public static class PatchScript
{
"linear" or "lin" => ControlCurveInterpolation.Linear,
"hold" or "step" or "sample_hold" => ControlCurveInterpolation.Hold,
"smooth" or "smoothstep" or "ease" or "eased" => ControlCurveInterpolation.Smooth,
_ => throw new PatchScriptException(line, $"unknown control curve interpolation `{value}`")
};