summaryrefslogtreecommitdiff
path: root/basedProject/src/ofApp.h
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2014-03-02 22:14:34 +0000
committerComment <tim@gray.(none)>2014-03-02 22:14:34 +0000
commit1082e9eed74507b6eb5a3d0d7ab8a6cdecf40e19 (patch)
treec9e21ac3e1c3434b30c8530497b1f678641038dc /basedProject/src/ofApp.h
parenta2fe68dfed91e362404ea1171cc8f0b313956cc3 (diff)
working version for show
Diffstat (limited to 'basedProject/src/ofApp.h')
-rw-r--r--basedProject/src/ofApp.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/basedProject/src/ofApp.h b/basedProject/src/ofApp.h
index 3e45838..f1ab52a 100644
--- a/basedProject/src/ofApp.h
+++ b/basedProject/src/ofApp.h
@@ -30,12 +30,17 @@ have to track how many frames each key has been pressed for
#include "ofEvents.h"
#include "ofxXmlSettings.h"
//#include "ofx3DModelLoader.h"
+#include "ofxBeat.h"
#include "mapUtils.h"
#include "viewpoint.h"
#include "audioGlitcher.h"
+#define NUM_MODES 2
+#define MODE_RUN 0
+#define MODE_CALIB 1
+
class ofApp : public ofBaseApp{
@@ -57,13 +62,19 @@ class ofApp : public ofBaseApp{
int activeView;
bool fullscreen;
- ofImage xhair;
+ ofImage *checkers;
void audioIn(float * input, int bufferSize, int nChannels);
- audioGlitcher glitch;
+ audioGlitcher glitch1;
+ audioGlitcher glitch2;
+ audioGlitcher glitch3;
ofSoundStream soundStream;
vector<float> samples;
+ int mode;
+
+ ofxBeat beat;
+ bool kick,snare,hihat;
};