Custom Waveform

Magical8bitPlug2.jucer

@@ -33,6 +33,10 @@
               file="Source/SliderComponent.cpp"/>
         <FILE id="qIuf9N" name="SliderComponent.h" compile="0" resource="0"
               file="Source/SliderComponent.h"/>
+        <FILE id="uajfNh" name="SliderVerticalComponent.cpp" compile="1" resource="0"
+              file="Source/SliderVerticalComponent.cpp"/>
+        <FILE id="p2nPNB" name="SliderVerticalComponent.h" compile="0" resource="0"
+              file="Source/SliderVerticalComponent.h"/>
       </GROUP>
       <FILE id="SFqkUr" name="AdvancedParamsComponent.cpp" compile="1" resource="0"
             file="Source/AdvancedParamsComponent.cpp"/>
@@ -68,6 +72,13 @@
             file="Source/VibratoParamsComponent.h"/>
     </GROUP>
     <GROUP id="{630C27C7-03AA-CFC6-2FC4-4CE2DBE3640A}" name="Source">
+      <FILE id="WS1wsR" name="WaveformParamsComponent.cpp" compile="1" resource="0"
+            file="Source/WaveformParamsComponent.cpp"/>
+      <FILE id="miNL07" name="WaveformParamsComponent.h" compile="0" resource="0"
+            file="Source/WaveformParamsComponent.h"/>
+      <FILE id="vVn1lo" name="WaveformVoice.cpp" compile="1" resource="0"
+            file="Source/WaveformVoice.cpp"/>
+      <FILE id="iZpU3j" name="WaveformVoice.h" compile="0" resource="0" file="Source/WaveformVoice.h"/>
       <FILE id="H2Vgbj" name="FrameSequenceParseErrors.cpp" compile="1" resource="0"
             file="Source/FrameSequenceParseErrors.cpp"/>
       <FILE id="Gwt2vB" name="FrameSequenceParseErrors.h" compile="0" resource="0"

Source/BasicParamsComponent.cpp

@@ -154,6 +154,7 @@ void BasicParamsComponent::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
 {
     processor.setupVoice();
     editor.resized();
+    editor.resizeWholePanel();
     printf ("setup voice!!\n");
 }
 

Source/NoiseVoice.cpp

@@ -18,7 +18,9 @@
 NoiseVoice::NoiseVoice(SettingRefs *sRefs) : TonalVoice(sRefs) {}
 
 void NoiseVoice::startNote(int midiNoteNumber, float velocity, SynthesiserSound *, int currentPitchBendPosition) {
-    TonalVoice::startNote(midiNoteNumber, velocity, 0, currentPitchBendPosition);
+    //TonalVoice::startNote(midiNoteNumber, velocity, 0, currentPitchBendPosition);
+    int midiNote = midiNoteNumber;
+    int midiNoteRange[16] = { 5, 17, 29, 34, 41, 46, 53, 57, 61, 65, 70, 77, 89, 101, 113, 125 };
     switch (settingRefs->noiseAlgorithm()) {
         case kNoiseInfinite2:
             cycleLength = MathConstants<float>::pi / 25.0;
@@ -29,10 +31,19 @@ void NoiseVoice::startNote(int midiNoteNumber, float velocity, SynthesiserSound
             cycleLength = MathConstants<float>::pi / 8.0;
             break;
 
+        case kNoiseLongNes:
+        case kNoiseShortNes:
+            cycleLength = MathConstants<float>::pi / 20.175;
+            //rgstr = 0x8000;
+            //rgstr = rand();
+            midiNote = midiNoteRange[(midiNote + 8) % 16];
+            break;
+
         default:
             cycleLength = MathConstants<float>::pi / 8.0;
             break;
     }
+    TonalVoice::startNote(midiNote, velocity, 0, currentPitchBendPosition);
 }
 
 float NoiseVoice::voltageForAngle (double angle)
@@ -58,9 +69,10 @@ float NoiseVoice::voltageForAngle (double angle)
     {
         if (settingRefs->noiseAlgorithm() == kNoiseInfinite2)
         {
-            currentVoltage = float (rand() % 16 - 8) / 16.;
+            currentVoltage = float (rand() % 16 - 8) / 16.0;
+            //currentVoltage = float(rand() % 16 - 7.5) / 15.0;
         }
-        else
+        else  if (settingRefs->noiseAlgorithm() == kNoiseLong || settingRefs->noiseAlgorithm() == kNoiseShort)
         {
             int compareBitPos = settingRefs->noiseAlgorithm() == kNoiseLong ? 1 : 6;
 
@@ -76,6 +88,14 @@ float NoiseVoice::voltageForAngle (double angle)
 
             currentVoltage = (float)bit0 - 0.5;
         }
+        else
+        {
+            int shortFreq = settingRefs->noiseAlgorithm() == kNoiseLongNes ? 1 : 6;
+
+            rgstr >>= 1;
+            rgstr |= ((rgstr ^ (rgstr >> shortFreq)) & 1) << 15;
+            currentVoltage = (float)(rgstr & 1) - 0.5;
+        }
 
         nextAngle = (double) ((int) (angle / cycleLength) + 1) * cycleLength;
 

Source/PluginEditor.cpp

@@ -18,6 +18,7 @@
 #include "BendParamsComponent.h"
 #include "SweepParamsComponent.h"
 #include "VibratoParamsComponent.h"
+#include "WaveformParamsComponent.h"
 
 //==============================================================================
 Magical8bitPlug2AudioProcessorEditor::Magical8bitPlug2AudioProcessorEditor (Magical8bitPlug2AudioProcessor& p)
@@ -29,7 +30,7 @@ Magical8bitPlug2AudioProcessorEditor::Magical8bitPlug2AudioProcessorEditor (Magi
 
     basicCompo.reset (new BasicParamsComponent (p, *this));
     addAndMakeVisible (basicCompo.get());
-
+    
     envCompo.reset (new EnvelopeParamsComponent (p));
     addAndMakeVisible (envCompo.get());
 
@@ -51,6 +52,10 @@ Magical8bitPlug2AudioProcessorEditor::Magical8bitPlug2AudioProcessorEditor (Magi
     vibCompo.reset (new VibratoParamsComponent (p));
     addAndMakeVisible (vibCompo.get());
 
+    // waveform
+    waveformCompo.reset (new WaveformParamsComponent (p));
+    addAndMakeVisible (waveformCompo.get());
+
     (p.parameters.getParameter ("isVolumeSequenceEnabled_raw"))->addListener (this);
     (p.parameters.getParameter ("isDutySequenceEnabled_raw"))->addListener (this);
 
@@ -141,7 +146,7 @@ struct
                                 + genericControlHeight;
     const int sweepCompoHeight = componentMargin * 2
                                  + indexHeight
-                                 + genericControlHeight * 2;
+                                 + genericControlHeight * 3;
     const int vibCompoHeight = componentMargin * 2
                                + indexHeight
                                + genericControlHeight * 4;
@@ -240,6 +245,11 @@ void Magical8bitPlug2AudioProcessorEditor::resized()
     y3 += sizes.sectionSeparatorHeight;
     advCompo->setBounds (x, y3, sizes.fullComponentWidth, sizes.advCompoHeight);
 
+    // Waveform
+    int wrX = sizes.leftMargin + sizes.totalWidth;
+    int wrY = sizes.topMargin;
+    waveformCompo->setBounds(wrX, wrY, waveformCompo->getWidth(), waveformCompo->getHeight());
+
     //
     // Visibility
     //
@@ -272,7 +282,12 @@ void Magical8bitPlug2AudioProcessorEditor::resized()
 
 void Magical8bitPlug2AudioProcessorEditor::resizeWholePanel()
 {
-    setSize (sizes.totalWidth, sizes.totalHeight (processor.settingRefs.isAdvancedPanelOpen()));
+    int totalWidth = sizes.totalWidth;
+    if (processor.settingRefs.oscillatorType() == kVoiceTypeWaveform)
+    {
+        totalWidth += sizes.leftMargin * 2 + waveformCompo->getWidth();
+    }
+    setSize (totalWidth, sizes.totalHeight (processor.settingRefs.isAdvancedPanelOpen()));
 }
 
 void Magical8bitPlug2AudioProcessorEditor::parameterValueChanged (int parameterIndex, float newValue)
@@ -291,3 +306,13 @@ void Magical8bitPlug2AudioProcessorEditor::parameterValueChanged (int parameterI
     }
 }
 
+// waveform
+//void Magical8bitPlug2AudioProcessorEditor::waveformInit()
+//{
+//    waveformCompo->sliderInit();
+//}
+
+void Magical8bitPlug2AudioProcessorEditor::waveformUpdate()
+{
+    waveformCompo->sliderRepaint();
+}

Source/PluginEditor.h

@@ -20,6 +20,7 @@ class NoiseParamsComponent;
 class BendParamsComponent;
 class SweepParamsComponent;
 class VibratoParamsComponent;
+class WaveformParamsComponent;
 
 //==============================================================================
 /**
@@ -40,6 +41,10 @@ class Magical8bitPlug2AudioProcessorEditor  : public AudioProcessorEditor
     void parameterValueChanged (int parameterIndex, float newValue) override;
     void parameterGestureChanged (int parameterIndex, bool gestureIsStarting) override {};
 
+    // waveform
+    //void waveformInit();
+    void waveformUpdate();
+
 private:
     Magical8bitPlug2AudioProcessor& processor;
 
@@ -51,6 +56,7 @@ class Magical8bitPlug2AudioProcessorEditor  : public AudioProcessorEditor
     std::unique_ptr<BendParamsComponent> bendCompo;
     std::unique_ptr<SweepParamsComponent> sweepCompo;
     std::unique_ptr<VibratoParamsComponent> vibCompo;
+    std::unique_ptr<WaveformParamsComponent> waveformCompo;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Magical8bitPlug2AudioProcessorEditor)
 };