diff options
Diffstat (limited to 'liveengineUnmapped/src/testApp.h')
| -rwxr-xr-x | liveengineUnmapped/src/testApp.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/liveengineUnmapped/src/testApp.h b/liveengineUnmapped/src/testApp.h index fe988f1..e3ca574 100755 --- a/liveengineUnmapped/src/testApp.h +++ b/liveengineUnmapped/src/testApp.h @@ -121,6 +121,8 @@ class testApp : public ofxFensterListener, public ofxMidiListener{ void keyPressedEvent(ofKeyEventArgs &args); void windowEvent(ofResizeEventArgs &args); + void nmidiMessage(int event,int data1, int data2); + void makeColours(); void toggleFPS(); @@ -165,7 +167,7 @@ class testApp : public ofxFensterListener, public ofxMidiListener{ void newMidiMessage(ofxMidiEventArgs& eventArgs); playlist list; - + ofxPanel gui; ofxToggle reversemain; @@ -174,6 +176,17 @@ class testApp : public ofxFensterListener, public ofxMidiListener{ ofxToggle transparentBlack; ofxButton resetDrawscale; ofxButton resetFBscale; + ofxIntSlider fS; + ofxParameter<int> fadeScale; + ofxToggle oscScale; + ofxToggle breakOsc; + ofxToggle randomOsc; + ofxFloatSlider sA; + ofxParameter<float> scaleAmplitude; + ofxFloatSlider sF; + ofxParameter<float> scaleFrequency; + + float randOffs; void resetDrawscalePressed(bool & pressed); void resetFBscalePressed(bool & pressed); |
