added beep on randomization

kylemcdonald · Mar 9, 2012 · a72f140 · a72f140
1 parent 3abbcfb
commit a72f140
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/FaceBeat Project/FaceBeat.als b/FaceBeat Project/FaceBeat.als
diff --git a/FaceMusic/src/animation/animationManager.cpp b/FaceMusic/src/animation/animationManager.cpp
@@ -327,14 +327,24 @@ void animationManager::update() {
     if (presence > 0.5){
 
         bWasPresentLastFrame = true;
-        if (ofGetElapsedTimef() - lastNonPresenceTime < 1.1 && (lastNonPresenceTime-fistNonPresenceTime) > 0.3){
-            float pct = (ofGetElapsedTimef() - lastNonPresenceTime)/1.1;
+				bool didSwitch = false;
+				float curTime = ofGetElapsedTimef();
+				float clickWaitTime = .5; // wait for this much non-face until randomizing
+				float clickingTime = 2; // how long the randomizing lasts
+				float presenceLength = curTime - lastNonPresenceTime;
+				float nonPresenceLength = lastNonPresenceTime - fistNonPresenceTime;
+        if (presenceLength < clickingTime && nonPresenceLength > clickWaitTime) {
+            float pct = pow(ofNormalize(presenceLength, 0, clickingTime), .1f);
             for (int i = 0; i < FA->nFeatures; i++){
-                if (ofRandom(1) > (pct)){
+                if (ofRandomf() > pct){
                     which[i] = ofRandom(0,10000000);
+										didSwitch = true;
                 }
             }
         }
+				if(didSwitch) {
+					Graph::sendManualNote(96);
+				}
 
         for (int i = 0; i < FA->nFeatures; i++){
             ofPoint offsetme;

diff --git a/FaceMusic/src/faceAnalysis/Graph.cpp b/FaceMusic/src/faceAnalysis/Graph.cpp
@@ -176,6 +176,11 @@ void Graph::addSample(float sample) {
 	sendMidi();
 }
 
+void Graph::sendManualNote(int midiNote) {
+	midi.sendNoteOn(1, midiNote, 127);
+	midi.sendNoteOff(1, midiNote);
+}
+
 void Graph::sendMidi() const {
 	if(getTriggered()) {
 		midi.sendNoteOn(1, midiNote, 127);

diff --git a/FaceMusic/src/faceAnalysis/Graph.h b/FaceMusic/src/faceAnalysis/Graph.h
@@ -29,6 +29,8 @@ class Graph {
 	void keyPressed(int key);
 	void mouseMoved(int x, int y);
 
+	static void sendManualNote(int midiNote);
+
 //private:
 	int width, height;
 	string name;

diff --git a/FaceMusic/src/faceAnalysis/faceTrackerManager.cpp b/FaceMusic/src/faceAnalysis/faceTrackerManager.cpp
@@ -137,6 +137,9 @@ void faceTrackerManager::keyPressed(int key) {
 	if(key == '\t') {
 		enabled = !enabled;
 	}
+	if(key == 'c') {
+		Graph::sendManualNote(96);
+	}
 	if(key == 'r') {
 		classifier.reset();
 		expressionGraphs.clear();