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

Repair AquaSynth merge witnesses

Browse source
This commit is contained in:
Meta Vens 2026-06-15 00:32:54 +01:00
commit c67158116a
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
patches/aquasynth-patch-cultcache.cc
View file

Binary file not shown.

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

@ -142,6 +142,7 @@ public static class CultCachePatchDocumentCatalog
new("patches/advanced/additive-pad.aqua", "advanced", "additive-pad", "BuiltInScripts.ReferenceScripts", "Additive body plus PAD spectral halo; slow controls own bloom and air."), new("patches/advanced/additive-pad.aqua", "advanced", "additive-pad", "BuiltInScripts.ReferenceScripts", "Additive body plus PAD spectral halo; slow controls own bloom and air."),
new("patches/advanced/aurora-pad.aqua", "advanced", "aurora-pad", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."), new("patches/advanced/aurora-pad.aqua", "advanced", "aurora-pad", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),
new("patches/advanced/bird-syrinx.aqua", "advanced", "bird-syrinx", "Graph-native syrinx patch", "Paired labial source-port bird voice for differentiable training and audition."), new("patches/advanced/bird-syrinx.aqua", "advanced", "bird-syrinx", "Graph-native syrinx patch", "Paired labial source-port bird voice for differentiable training and audition."),
new("patches/advanced/electro-drop-demo.aqua", "advanced", "electro-drop-demo", "AquaSynth song-swarm synthesis demo", "Electro/complextro demo with intro/build/drop section gates, layered bass chops, additive wash, shaped texture, and mix automation."),
new("patches/advanced/glass-creature.aqua", "advanced", "glass-creature", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."), new("patches/advanced/glass-creature.aqua", "advanced", "glass-creature", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),
new("patches/advanced/machine-breath.aqua", "advanced", "machine-breath", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."), new("patches/advanced/machine-breath.aqua", "advanced", "machine-breath", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),
new("patches/advanced/ritual-sequence.aqua", "advanced", "ritual-sequence", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."), new("patches/advanced/ritual-sequence.aqua", "advanced", "ritual-sequence", "BuiltInScripts.ReferenceScripts", "Stock reference patch exported from the in-code catalog."),

12
tests/AquaSynth.Dsl.Tests/PatchScriptTests.cs
View file

@ -1704,7 +1704,7 @@ public sealed class PatchScriptTests
Assert.Equal(.1f, voice.Envelope.AttackSeconds, 5); Assert.Equal(.1f, voice.Envelope.AttackSeconds, 5);
Assert.Equal(.5f, voice.Envelope.SustainLevel, 5); Assert.Equal(.5f, voice.Envelope.SustainLevel, 5);
Assert.Equal(RateLevelCurve.Exponential, voice.RateLevelEnvelope.Curve2); Assert.Equal(RateLevelCurve.Exponential, voice.RateLevelEnvelope.Curve2);
Assert.Contains("rl4_env(0.1, 1, 0, 0.2, 0.8, 1, 0.3, 0.5, 1, 0.4, 0, 0, patch_param_0)", export.Source); Assert.Contains("rl4_env_at(voice_0_age, 0.1, 1, 0, 0.2, 0.8, 1, 0.3, 0.5, 1, 0.4, 0, 0, patch_param_0)", export.Source);
} }
[Fact] [Fact]
@ -1945,7 +1945,7 @@ public sealed class PatchScriptTests
Assert.Equal(0, envelope.Level4); Assert.Equal(0, envelope.Level4);
Assert.Equal(.75f, op2.Note.GateSeconds, 5); Assert.Equal(.75f, op2.Note.GateSeconds, 5);
Assert.Equal(RateLevelCurve.Linear, envelope.Curve1); Assert.Equal(RateLevelCurve.Linear, envelope.Curve1);
Assert.Contains("rl4_env(0.004, 1, 0, 0.12, 0.7, 0, 0.2, 0.25, 0, 0.4, 0, 0, 0.75)", export.Source); Assert.Contains("rl4_env_at(age, 0.004, 1, 0, 0.12, 0.7, 0, 0.2, 0.25, 0, 0.4, 0, 0, 0.75)", export.Source);
} }
[Fact] [Fact]
@ -1966,7 +1966,7 @@ public sealed class PatchScriptTests
Assert.Equal(RateLevelCurve.Exponential, envelope.Curve2); Assert.Equal(RateLevelCurve.Exponential, envelope.Curve2);
Assert.Equal(RateLevelCurve.Exponential, envelope.Curve3); Assert.Equal(RateLevelCurve.Exponential, envelope.Curve3);
Assert.Equal(RateLevelCurve.Linear, envelope.Curve4); Assert.Equal(RateLevelCurve.Linear, envelope.Curve4);
Assert.Contains("rl4_env(0.004, 1.2, 0, 0.12, 0.7, 1, 0.2, 0.25, 1, 0.4, 0, 0, 0.75)", export.Source); Assert.Contains("rl4_env_at(age, 0.004, 1.2, 0, 0.12, 0.7, 1, 0.2, 0.25, 1, 0.4, 0, 0, 0.75)", export.Source);
} }
[Fact] [Fact]
@ -1989,7 +1989,7 @@ public sealed class PatchScriptTests
Assert.Contains(patch.ParameterBindings, binding => binding.FieldPath == "/opgraphs/0/operators/2/env/decay" && binding.ParameterPath == "/macro/strike"); Assert.Contains(patch.ParameterBindings, binding => binding.FieldPath == "/opgraphs/0/operators/2/env/decay" && binding.ParameterPath == "/macro/strike");
Assert.Contains(patch.ParameterBindings, binding => binding.FieldPath == "/opgraphs/0/routes/2>1/index" && binding.ParameterPath == "/macro/brightness"); Assert.Contains(patch.ParameterBindings, binding => binding.FieldPath == "/opgraphs/0/routes/2>1/index" && binding.ParameterPath == "/macro/brightness");
Assert.Contains("opgraph_0_op_2 * patch_param_0", export.Source); Assert.Contains("opgraph_0_op_2 * patch_param_0", export.Source);
Assert.Contains("oneshot_adsr(0.01, patch_param_1, 0, 0", export.Source); Assert.Contains("oneshot_adsr_at(age, 0.01, patch_param_1, 0, 0", export.Source);
Assert.Contains("opgraph_0 = (opgraph_0_op_1) * patch_param_0;", export.Source); Assert.Contains("opgraph_0 = (opgraph_0_op_1) * patch_param_0;", export.Source);
Assert.Empty(export.Warnings); Assert.Empty(export.Warnings);
} }
@ -2022,7 +2022,7 @@ public sealed class PatchScriptTests
var export = FaustEmitter.EmitScript("param path=/macro/brightness default=.45 min=0 max=1 step=.001;v w=saw f=80 lpf=@/macro/brightness"); var export = FaustEmitter.EmitScript("param path=/macro/brightness default=.45 min=0 max=1 step=.001;v w=saw f=80 lpf=@/macro/brightness");
Assert.Contains("patch_param_0 = hslider(\"/macro/brightness\", 0.45, 0, 1, 0.001) : si.smoo;", export.Source); Assert.Contains("patch_param_0 = hslider(\"/macro/brightness\", 0.45, 0, 1, 0.001) : si.smoo;", export.Source);
Assert.Contains("clip01(patch_param_0 * (1.0 + 0 * age * 1.8) + patch_mod_lpf + 0.0)", export.Source); Assert.Contains("clip01(patch_param_0 * (1.0 + 0 * voice_0_age * 1.8) + patch_mod_lpf + 0.0)", export.Source);
Assert.Empty(export.Warnings); Assert.Empty(export.Warnings);
} }
@ -2071,7 +2071,7 @@ public sealed class PatchScriptTests
Assert.NotNull(envelope); Assert.NotNull(envelope);
Assert.Equal(.4f, envelope.StartLevel, 5); Assert.Equal(.4f, envelope.StartLevel, 5);
Assert.Equal(.3f, envelope.Level1, 5); Assert.Equal(.3f, envelope.Level1, 5);
Assert.Contains("rl4_env_from(0.4", export.Source); Assert.Contains("rl4_env_from_at(voice_0_age, 0.4", export.Source);
} }
[Fact] [Fact]