Merge branch 'work80' of https://github.com/asb2m10/dexed into work80

Source/DXLookNFeel.cpp

@@ -23,8 +23,31 @@
 Colour DXLookNFeel::dxDarkBrown = Colour(0xFF47260D);
 Colour DXLookNFeel::dxLightBrown = Colour(0xFFA87B67);
 
+Colour DXLookNFeel::background = Colour(60,50,47);
+Colour DXLookNFeel::fillColour = Colour(77,159,151);
+
 DXLookNFeel::DXLookNFeel() {
     setColour(TextButton::buttonColourId,Colour(0xFF0FC00F));
     setColour(Slider::rotarySliderOutlineColourId,Colour(0xFF0FC00F));
     setColour(Slider::rotarySliderFillColourId,Colour(0xFFFFFFFF));
 }
+
+
+
+void DXLookNFeel::drawRotarySlider( Graphics &g, int x, int y, int width, int height, float sliderPosProportional,
+     float rotaryStartAngle, float rotaryEndAngle,  Slider &slider ) {
+     Image myStrip = ImageCache::getFromMemory (BinaryData::knobstrip_png, BinaryData::knobstrip_pngSize);
+        
+        
+     const double fractRotation = (slider.getValue() - slider.getMinimum())  /   (slider.getMaximum() - slider.getMinimum()); //value between 0 and 1 for current amount of rotation
+     const int nFrames = myStrip.getHeight()/myStrip.getWidth(); // number of frames for vertical film strip
+     const int frameIdx = (int)ceil(fractRotation * ((double)nFrames-1.0) ); // current index from 0 --> nFrames-1
+        
+     const float radius = jmin (width / 2.0f, height / 2.0f) ;
+     const float centreX = x + width * 0.5f;
+     const float centreY = y + height * 0.5f;
+     const float rx = centreX - radius - 1.0f;
+     const float ry = centreY - radius - 1.0f;
+        
+     g.drawImage(myStrip, (int)rx, (int)ry, 2*(int)radius, 2*(int)radius, 0, frameIdx*myStrip.getWidth(), myStrip.getWidth(), myStrip.getWidth());
+};

Source/DXLookNFeel.h

@@ -25,10 +25,14 @@
 
 class DXLookNFeel : public LookAndFeel_V3 {
 public:
+    static Colour background;
+    static Colour fillColour;
+    DXLookNFeel();
+
+    virtual void drawRotarySlider(Graphics &g, int x, int y, int width, int height, float sliderPosProportional, float rotaryStartAngle, float rotaryEndAngle,  Slider &slider );
+
     static Colour dxDarkBrown;
     static Colour dxLightBrown;
-    
-    DXLookNFeel();
 };
 
 #endif  // DXLOOKNFEEL_H_INCLUDED

Source/PluginEditor.cpp

@@ -25,6 +25,7 @@
 #include "SysexComm.h"
 #include "Dexed.h"
 #include "math.h"
+#include "DXLookNFeel.h"
 #include <fstream>
 
 #include "msfa/fm_op_kernel.h"
@@ -226,11 +227,8 @@ DexedAudioProcessorEditor::~DexedAudioProcessorEditor() {
 
 //==============================================================================
 void DexedAudioProcessorEditor::paint (Graphics& g) {    
-    g.setColour(Colour(0xFF47260D));
+    g.setColour(DXLookNFeel::background);
     g.fillRoundedRectangle(0.0f, 0.0f, (float) getWidth(), (float) getHeight(), 0);
-    
-    g.setColour(Colour(0xFF4D3828));
-    g.fillRoundedRectangle(0.0f, 30, (float) getWidth(), 200, 0);
 }
 
 void DexedAudioProcessorEditor::buttonClicked(Button *buttonThatWasClicked) {