Common parts out, nem simplex project.

Overdrive / distorion experimentation.
MiklosPathy · Feb 11, 2018 · 9f74970 · 9f74970
1 parent a423995
commit 9f74970
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/PunkOrgan/MainWindow.xaml b/PunkOrgan/MainWindow.xaml
@@ -19,7 +19,7 @@
         <Slider x:Name="slider_Bending" Value="{Binding Bending}" HorizontalAlignment="Left" Margin="10,277,0,0" VerticalAlignment="Top" Width="581" Maximum="200" Minimum="-200" SmallChange="1" MouseLeftButtonUp="slider_Bending_MouseLeftButtonUp"/>
         <Slider x:Name="slider_Leslie_Freq" Value="{Binding Leslie_Freq}" HorizontalAlignment="Left" Height="148" Margin="460,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical"/>
         <Slider x:Name="slider_Leslie_Rate" Value="{Binding Leslie_Rate}" HorizontalAlignment="Left" Height="148" Margin="485,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical" Maximum="50"/>
-        <Slider x:Name="slider_OverDrive" Value="{Binding OverDrive}" HorizontalAlignment="Left" Height="148" Margin="412,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical" SmallChange="1" Maximum="100"/>
+        <Slider x:Name="slider_OverDrive" Value="{Binding OverDrive}" HorizontalAlignment="Left" Height="148" Margin="412,10,0,0" VerticalAlignment="Top" Width="20" Orientation="Vertical" SmallChange="1" Maximum="100" Minimum="10"/>
         <Label x:Name="label" Content="Overdrive" HorizontalAlignment="Left" Margin="368,136,0,0" VerticalAlignment="Top" Height="26" RenderTransformOrigin="1.054,0.904">
             <Label.RenderTransform>
                 <TransformGroup>

diff --git a/PunkOrgan/PunkHammond.cs b/PunkOrgan/PunkHammond.cs
@@ -52,7 +52,7 @@ public PunkHammond()
 
             CurrentPolyphony = 3;
 
-            OverDrive = 0;
+            OverDrive = 10;
 
         }
 
@@ -90,7 +90,8 @@ public override int Read(short[] buffer, int offset, int sampleCount)
                 //The 90 divider is for the drawbars. There are 9 of them. They have 10 position here.
                 currentsamplevalue = currentsamplevalue / 90 * short.MaxValue / CurrentPolyphony;
 
-                currentsamplevalue = overdrive(currentsamplevalue);
+                if (overDrive != 10) currentsamplevalue = overdrive(currentsamplevalue * overDrive / 10);
+                //currentsamplevalue = distortion(currentsamplevalue, overDrive / 10, 1);
 
 
                 currentsamplevalue = currentsamplevalue + echobuffer[limitechophase(echophase + Echo_Freq)] * Echo_Rate / 100;
@@ -105,6 +106,7 @@ public override int Read(short[] buffer, int offset, int sampleCount)
             return sampleCount;
         }
 
+        //Buffer looping
         private int limitechophase(int phase)
         {
             return phase < echobuffersize ? phase : phase - echobuffersize;
@@ -146,5 +148,26 @@ private double overdrive(double input)            //by Schetzen Formula
             }
             return signinput * short.MaxValue;
         }
+
+        private double distortion(double x, double gain, double mix)
+        {
+            // Distortion based on an exponential function
+            // x - input
+            // gain - amount of distortion, >0->
+            // mix - mix of original and distorted sound, 1=only distorted
+            if (x == 0) return 0;
+            x = x / short.MaxValue;
+
+            double y = x / Math.Abs(x) * (1 - Math.Pow(Math.E, gain * x * x / Math.Abs(x)));
+            return y * short.MaxValue;
+
+
+            //double q = x * gain / Math.Abs(x);
+            //double z = Math.Sign(-q) * (1 - Math.Exp(Math.Sign(-q) * q));
+            //double y = mix * z * Math.Abs(x) / Math.Abs(z) + (1 - mix) * x;
+            //y = y * Math.Abs(x) / Math.Abs(y);
+
+
+        }
     }
 }