Skip to content

Commit

Permalink
fixed soft distortion
Browse files Browse the repository at this point in the history
  • Loading branch information
@oskarsh
oskarsh committed Jun 4, 2024
1 parent c58203d commit 801da27
Show file tree
Hide file tree
Showing 21 changed files with 174 additions and 98 deletions.
24 changes: 12 additions & 12 deletions AdditionalSourceCode/nodes/Reverb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,24 +291,24 @@ template <int NV> struct instance: public Reverb_impl::Reverb_t_<NV>
0x5C29, 0x3FCF, 0x0000, 0x3F80, 0xD70A, 0x3C23, 0x0C5B, 0x0000,
0x4D00, 0x7869, 0x0000, 0x0000, 0x0000, 0x8000, 0x003F, 0x8000,
0x003F, 0x8000, 0x003F, 0x0000, 0x5B00, 0x000D, 0x0000, 0x7270,
0x4465, 0x6C65, 0x7961, 0x0000, 0x0000, 0x0000, 0xFA00, 0xCD44,
0x9E8C, 0x0043, 0x0000, 0xCD3F, 0xCCCC, 0x5B3D, 0x000E, 0x0000,
0x4465, 0x6C65, 0x7961, 0x0000, 0x0000, 0x0000, 0xFA00, 0x0044,
0x0000, 0x0000, 0x0000, 0xCD3F, 0xCCCC, 0x5B3D, 0x000E, 0x0000,
0x6546, 0x6465, 0x6162, 0x6B63, 0x0000, 0x0000, 0x0000, 0x8000,
0x533F, 0x2432, 0x003F, 0x8000, 0x003F, 0x0000, 0x5B00, 0x000F,
0x003F, 0x0000, 0x0000, 0x8000, 0x003F, 0x0000, 0x5B00, 0x000F,
0x0000, 0x6D53, 0x6F6F, 0x6874, 0x6E69, 0x0067, 0x0000, 0x0000,
0x0000, 0x3F80, 0x0000, 0x0000, 0x0000, 0x3F80, 0x0000, 0x0000,
0x105B, 0x0000, 0x4400, 0x6C65, 0x7961, 0x694D, 0x0078, 0x0000,
0x0000, 0x0000, 0x3F80, 0x8237, 0x3EFB, 0x0000, 0x3F80, 0x0000,
0x0000, 0x0000, 0x3F80, 0x0000, 0x3F80, 0x0000, 0x3F80, 0x0000,
0x0000, 0x115B, 0x0000, 0x4400, 0x6C65, 0x7961, 0x7355, 0x5465,
0x6D65, 0x6F70, 0x0000, 0x0000, 0x0000, 0x8000, 0x003F, 0x0000,
0x0000, 0x8000, 0x003F, 0x8000, 0x5B3F, 0x0012, 0x0000, 0x6544,
0x616C, 0x5479, 0x6D65, 0x6F70, 0x0000, 0x0000, 0x0000, 0x9000,
0x0041, 0xC000, 0x0040, 0x8000, 0x003F, 0x8000, 0x5B3F, 0x0013,
0x0000, 0x6544, 0x616C, 0x4879, 0x6769, 0x7068, 0x7361, 0x0073,
0x0000, 0x41A0, 0x4000, 0x469C, 0x4000, 0x469C, 0x6C1A, 0x3E6B,
0x0000, 0x41A0, 0x4000, 0x469C, 0x0000, 0x41A0, 0x6C1A, 0x3E6B,
0x0000, 0x0000, 0x145B, 0x0000, 0x4400, 0x6C65, 0x7961, 0x6F4C,
0x7077, 0x7361, 0x0073, 0x0000, 0x41A0, 0x4000, 0x469C, 0x0000,
0x41A0, 0x6C1A, 0x3E6B, 0x0000, 0x0000, 0x0000
0x7077, 0x7361, 0x0073, 0x0000, 0x41A0, 0x4000, 0x469C, 0x4000,
0x469C, 0x6C1A, 0x3E6B, 0x0000, 0x0000, 0x0000
};
};

Expand Down Expand Up @@ -506,14 +506,14 @@ template <int NV> struct instance: public Reverb_impl::Reverb_t_<NV>
this->setParameterT(10, 0.406359);
this->setParameterT(11, 1.62);
this->setParameterT(12, 1.);
this->setParameterT(13, 317.1);
this->setParameterT(14, 0.641393);
this->setParameterT(13, 0.);
this->setParameterT(14, 0.);
this->setParameterT(15, 0.);
this->setParameterT(16, 0.491228);
this->setParameterT(16, 1.);
this->setParameterT(17, 0.);
this->setParameterT(18, 6.);
this->setParameterT(19, 20000.);
this->setParameterT(20, 20.);
this->setParameterT(19, 20.);
this->setParameterT(20, 20000.);
this->setExternalData({}, -1);
}
~instance() override
Expand Down
101 changes: 67 additions & 34 deletions AdditionalSourceCode/nodes/Waveshaper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ using minmax_t = control::minmax<NV,
template <int NV>
using minmax1_t = control::minmax<NV,
parameter::plain<project::Distortion<NV>, 0>>;

template <int NV> using minmax2_t = minmax_t<NV>;

template <int NV>
using smoothed_parameter_unscaled_mod = parameter::chain<ranges::Identity,
parameter::plain<minmax_t<NV>, 0>,
parameter::plain<minmax1_t<NV>, 0>,
parameter::plain<minmax2_t<NV>, 0>>;

template <int NV>
using smoothed_parameter_unscaled_t = wrap::mod<smoothed_parameter_unscaled_mod<NV>,
control::smoothed_parameter_unscaled<NV, smoothers::linear_ramp<NV>>>;
template <int NumVoices> struct snex_softsat
{
SNEX_NODE(snex_softsat);
Expand Down Expand Up @@ -122,7 +134,8 @@ using snex_shaper_t = wrap::no_data<core::snex_shaper<snex_softsat<NV>>>;
template <int NV>
using chain_t = container::chain<parameter::empty,
wrap::fix<2, core::gain<NV>>,
snex_shaper_t<NV>>;
snex_shaper_t<NV>,
core::gain<NV>>;
template <int NV>
using branch_t = container::branch<parameter::empty,
wrap::fix<2, chain_t<NV>>,
Expand All @@ -132,7 +145,9 @@ template <int NV>
using wet_path_t = container::chain<parameter::empty,
wrap::fix<2, filters::one_pole<NV>>,
filters::one_pole<NV>,
smoothed_parameter_unscaled_t<NV>,
minmax_t<NV>,
minmax2_t<NV>,
minmax1_t<NV>,
branch_t<NV>,
filters::one_pole<NV>,
Expand All @@ -152,16 +167,14 @@ namespace Waveshaper_t_parameters
{
// Parameter list for Waveshaper_impl::Waveshaper_t ------------------------------------------------

template <int NV>
using Amount = parameter::chain<ranges::Identity,
parameter::plain<Waveshaper_impl::minmax_t<NV>, 0>,
parameter::plain<Waveshaper_impl::minmax1_t<NV>, 0>>;

using Distort = parameter::empty;
template <int NV>
using Mix = parameter::plain<Waveshaper_impl::dry_wet1_t<NV>,
0>;
template <int NV>
using Amount = parameter::plain<Waveshaper_impl::smoothed_parameter_unscaled_t<NV>,
0>;
template <int NV>
using Gain = parameter::plain<project::Distortion<NV>,
1>;
template <int NV>
Expand Down Expand Up @@ -210,9 +223,9 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>
0x5B00, 0x0001, 0x0000, 0x694D, 0x0078, 0x0000, 0x0000, 0x0000,
0x3F80, 0x0000, 0x3F80, 0x0000, 0x3F80, 0x0000, 0x0000, 0x025B,
0x0000, 0x4100, 0x6F6D, 0x6E75, 0x0074, 0x0000, 0x0000, 0x0000,
0x3F80, 0xDC7F, 0x3EA1, 0x0000, 0x3F80, 0x0000, 0x0000, 0x035B,
0x3F80, 0xF705, 0x3F0E, 0x0000, 0x3F80, 0x0000, 0x0000, 0x035B,
0x0000, 0x4700, 0x6961, 0x006E, 0x0000, 0xC2C0, 0x0000, 0x4040,
0x0000, 0x3F80, 0x0000, 0x3F80, 0xCCCD, 0x3DCC, 0x045B, 0x0000,
0x0000, 0x35C0, 0x0000, 0x3F80, 0xCCCD, 0x3DCC, 0x045B, 0x0000,
0x6C00, 0x0070, 0x0000, 0x41A0, 0x4000, 0x469C, 0x1C08, 0x45A1,
0x6C1A, 0x3E6B, 0x0000, 0x0000, 0x055B, 0x0000, 0x6800, 0x0070,
0x0000, 0x41A0, 0x4000, 0x469C, 0xD49A, 0x4318, 0x6C1A, 0x3E6B,
Expand All @@ -221,7 +234,7 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>
0x0000, 0x0000, 0x075B, 0x0000, 0x7000, 0x736F, 0x6874, 0x0070,
0x0000, 0x41A0, 0x4000, 0x469C, 0xF1BE, 0x4234, 0x6C1A, 0x3E6B,
0x0000, 0x0000, 0x085B, 0x0000, 0x4D00, 0x646F, 0x0065, 0x0000,
0x0000, 0x0000, 0x3F80, 0x0000, 0x3F80, 0x0000, 0x3F80, 0x0000,
0x0000, 0x0000, 0x3F80, 0x0000, 0x0000, 0x0000, 0x3F80, 0x0000,
0x3F80, 0x0000
};
};
Expand All @@ -237,26 +250,27 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>
auto& wet_path = this->getT(0).getT(1); // Waveshaper_impl::wet_path_t<NV>
auto& one_pole = this->getT(0).getT(1).getT(0); // filters::one_pole<NV>
auto& one_pole1 = this->getT(0).getT(1).getT(1); // filters::one_pole<NV>
auto& minmax = this->getT(0).getT(1).getT(2); // Waveshaper_impl::minmax_t<NV>
auto& minmax1 = this->getT(0).getT(1).getT(3); // Waveshaper_impl::minmax1_t<NV>
auto& branch = this->getT(0).getT(1).getT(4); // Waveshaper_impl::branch_t<NV>
auto& chain = this->getT(0).getT(1).getT(4).getT(0); // Waveshaper_impl::chain_t<NV>
auto& gain = this->getT(0).getT(1).getT(4).getT(0).getT(0); // core::gain<NV>
auto& snex_shaper = this->getT(0).getT(1).getT(4).getT(0).getT(1); // Waveshaper_impl::snex_shaper_t<NV>
auto& faust = this->getT(0).getT(1).getT(4).getT(1); // project::Distortion<NV>
auto& one_pole2 = this->getT(0).getT(1).getT(5); // filters::one_pole<NV>
auto& one_pole3 = this->getT(0).getT(1).getT(6); // filters::one_pole<NV>
auto& wet_gain = this->getT(0).getT(1).getT(7); // core::gain<NV>
auto& smoothed_parameter_unscaled = this->getT(0).getT(1).getT(2); // Waveshaper_impl::smoothed_parameter_unscaled_t<NV>
auto& minmax = this->getT(0).getT(1).getT(3); // Waveshaper_impl::minmax_t<NV>
auto& minmax2 = this->getT(0).getT(1).getT(4); // Waveshaper_impl::minmax2_t<NV>
auto& minmax1 = this->getT(0).getT(1).getT(5); // Waveshaper_impl::minmax1_t<NV>
auto& branch = this->getT(0).getT(1).getT(6); // Waveshaper_impl::branch_t<NV>
auto& chain = this->getT(0).getT(1).getT(6).getT(0); // Waveshaper_impl::chain_t<NV>
auto& gain = this->getT(0).getT(1).getT(6).getT(0).getT(0); // core::gain<NV>
auto& snex_shaper = this->getT(0).getT(1).getT(6).getT(0).getT(1); // Waveshaper_impl::snex_shaper_t<NV>
auto& gain1 = this->getT(0).getT(1).getT(6).getT(0).getT(2); // core::gain<NV>
auto& faust = this->getT(0).getT(1).getT(6).getT(1); // project::Distortion<NV>
auto& one_pole2 = this->getT(0).getT(1).getT(7); // filters::one_pole<NV>
auto& one_pole3 = this->getT(0).getT(1).getT(8); // filters::one_pole<NV>
auto& wet_gain = this->getT(0).getT(1).getT(9); // core::gain<NV>

// Parameter Connections -------------------------------------------------------------------

dry_wet1.getParameterT(0).connectT(0, dry_wet_mixer); // DryWet -> dry_wet_mixer::Value

this->getParameterT(1).connectT(0, dry_wet1); // Mix -> dry_wet1::DryWet

auto& Amount_p = this->getParameterT(2);
Amount_p.connectT(0, minmax); // Amount -> minmax::Value
Amount_p.connectT(1, minmax1); // Amount -> minmax1::Value
this->getParameterT(2).connectT(0, smoothed_parameter_unscaled); // Amount -> smoothed_parameter_unscaled::Value

this->getParameterT(3).connectT(0, faust); // Gain -> faust::gain

Expand All @@ -273,10 +287,14 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>
// Modulation Connections ------------------------------------------------------------------

auto& dry_wet_mixer_p = dry_wet_mixer.getWrappedObject().getParameter();
dry_wet_mixer_p.getParameterT(0).connectT(0, dry_gain); // dry_wet_mixer -> dry_gain::Gain
dry_wet_mixer_p.getParameterT(1).connectT(0, wet_gain); // dry_wet_mixer -> wet_gain::Gain
minmax.getWrappedObject().getParameter().connectT(0, gain); // minmax -> gain::Gain
minmax1.getWrappedObject().getParameter().connectT(0, faust); // minmax1 -> faust::distortion
dry_wet_mixer_p.getParameterT(0).connectT(0, dry_gain); // dry_wet_mixer -> dry_gain::Gain
dry_wet_mixer_p.getParameterT(1).connectT(0, wet_gain); // dry_wet_mixer -> wet_gain::Gain
minmax.getWrappedObject().getParameter().connectT(0, gain); // minmax -> gain::Gain
minmax1.getWrappedObject().getParameter().connectT(0, faust); // minmax1 -> faust::distortion
minmax2.getWrappedObject().getParameter().connectT(0, gain1); // minmax2 -> gain1::Gain
smoothed_parameter_unscaled.getParameter().connectT(0, minmax); // smoothed_parameter_unscaled -> minmax::Value
smoothed_parameter_unscaled.getParameter().connectT(1, minmax1); // smoothed_parameter_unscaled -> minmax1::Value
smoothed_parameter_unscaled.getParameter().connectT(2, minmax2); // smoothed_parameter_unscaled -> minmax2::Value

// Default Values --------------------------------------------------------------------------

Expand All @@ -302,13 +320,24 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>
one_pole1.setParameterT(4, 1.); // filters::one_pole::Mode
one_pole1.setParameterT(5, 1.); // filters::one_pole::Enabled

; // smoothed_parameter_unscaled::Value is automated
smoothed_parameter_unscaled.setParameterT(1, 100.); // control::smoothed_parameter_unscaled::SmoothingTime
smoothed_parameter_unscaled.setParameterT(2, 1.); // control::smoothed_parameter_unscaled::Enabled

; // minmax::Value is automated
minmax.setParameterT(1, 0.); // control::minmax::Minimum
minmax.setParameterT(2, 21.5); // control::minmax::Maximum
minmax.setParameterT(2, 30.5); // control::minmax::Maximum
minmax.setParameterT(3, 0.492949); // control::minmax::Skew
minmax.setParameterT(4, 0.1); // control::minmax::Step
minmax.setParameterT(5, 0.); // control::minmax::Polarity

; // minmax2::Value is automated
minmax2.setParameterT(1, -9.39724); // control::minmax::Minimum
minmax2.setParameterT(2, 0.); // control::minmax::Maximum
minmax2.setParameterT(3, 5.73463); // control::minmax::Skew
minmax2.setParameterT(4, 0.); // control::minmax::Step
minmax2.setParameterT(5, 1.); // control::minmax::Polarity

; // minmax1::Value is automated
minmax1.setParameterT(1, 0.); // control::minmax::Minimum
minmax1.setParameterT(2, 50.); // control::minmax::Maximum
Expand All @@ -318,9 +347,13 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>

; // branch::Index is automated

; // gain::Gain is automated
gain.setParameterT(1, 20.); // core::gain::Smoothing
gain.setParameterT(2, 0.); // core::gain::ResetValue
; // gain::Gain is automated
gain.setParameterT(1, 96.2); // core::gain::Smoothing
gain.setParameterT(2, 0.); // core::gain::ResetValue

; // gain1::Gain is automated
gain1.setParameterT(1, 100.6); // core::gain::Smoothing
gain1.setParameterT(2, 0.); // core::gain::ResetValue

; // faust::distortion is automated
; // faust::gain is automated
Expand All @@ -345,13 +378,13 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>

this->setParameterT(0, 1.);
this->setParameterT(1, 1.);
this->setParameterT(2, 0.316135);
this->setParameterT(3, 1.);
this->setParameterT(2, 0.558457);
this->setParameterT(3, 1.43051e-06);
this->setParameterT(4, 5155.5);
this->setParameterT(5, 152.83);
this->setParameterT(6, 7118.38);
this->setParameterT(7, 45.2361);
this->setParameterT(8, 1.);
this->setParameterT(8, 0.);
this->setExternalData({}, -1);
}
~instance() override
Expand All @@ -371,7 +404,7 @@ template <int NV> struct instance: public Waveshaper_impl::Waveshaper_t_<NV>
{
// External Data Connections ---------------------------------------------------------------

this->getT(0).getT(1).getT(4).getT(0).getT(1).setExternalData(b, index); // Waveshaper_impl::snex_shaper_t<NV>
this->getT(0).getT(1).getT(6).getT(0).getT(1).setExternalData(b, index); // Waveshaper_impl::snex_shaper_t<NV>
}
};
}
Expand Down
14 changes: 7 additions & 7 deletions DspNetworks/Networks/Reverb.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<Parameter MinValue="0.0" MaxValue="1.0" ID="Feedback" Automated="1"/>
</Parameters>
</Node>
<Node ID="faust2" FactoryPath="core.faust" Bypassed="0" Folded="1">
<Node ID="faust2" FactoryPath="core.faust" Bypassed="0">
<Properties>
<Property ID="ClassId" Value="Delay2"/>
<Property ID="NumParameters" Value="0"/>
Expand Down Expand Up @@ -409,13 +409,13 @@
<Connection NodeId="dry_wet2" ParameterId="DryWet"/>
</Connections>
</Parameter>
<Parameter ID="preDelay" MinValue="0.0" MaxValue="2000.0" Value="317.1000047251582"
StepSize="0.1000000014901161" SkewFactor="0.5">
<Parameter ID="preDelay" MinValue="0.0" MaxValue="2000.0" Value="0.0" StepSize="0.1000000014901161"
SkewFactor="0.5">
<Connections>
<Connection NodeId="tempo_sync" ParameterId="UnsyncedTime"/>
</Connections>
</Parameter>
<Parameter ID="Feedback" MinValue="0.0" MaxValue="1.0" Value="0.6413928833007813">
<Parameter ID="Feedback" MinValue="0.0" MaxValue="1.0" Value="0.0">
<Connections>
<Connection NodeId="receive" ParameterId="Feedback"/>
</Connections>
Expand All @@ -425,7 +425,7 @@
<Connection NodeId="bipolar" ParameterId="Value"/>
</Connections>
</Parameter>
<Parameter ID="DelayMix" MinValue="0.0" MaxValue="1.0" Value="0.4912278442382813">
<Parameter ID="DelayMix" MinValue="0.0" MaxValue="1.0" Value="1.0">
<Connections>
<Connection NodeId="dry_wet3" ParameterId="DryWet"/>
</Connections>
Expand All @@ -443,13 +443,13 @@
</Connections>
</Parameter>
<Parameter ID="DelayHighpass" MinValue="20.0" MaxValue="20000.0" SkewFactor="0.2299045622348785"
Value="20000.0">
Value="20.0">
<Connections>
<Connection NodeId="biquad" ParameterId="Frequency"/>
</Connections>
</Parameter>
<Parameter ID="DelayLowpass" MinValue="20.0" MaxValue="20000.0" SkewFactor="0.2299045622348785"
Value="20.0">
Value="20000.0">
<Connections>
<Connection NodeId="moog" ParameterId="Frequency"/>
</Connections>
Expand Down
Loading

0 comments on commit 801da27

Please sign in to comment.