Mercurial > hg > movesynth

changeset 44:b1c6e3d3a18b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tiedied bezier stuff, stop command is in
author Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk>
date Tue, 01 Mar 2011 12:28:19 +0000
parents 7286e5d455a7
children 763d56955d10
files of/testApp.cpp of/testApp.h
diffstat 2 files changed, 92 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- a/of/testApp.cpp	Tue Mar 01 11:32:02 2011 +0000
+++ b/of/testApp.cpp	Tue Mar 01 12:28:19 2011 +0000
@@ -22,6 +22,9 @@
    ofSetLineWidth(12);
 
 
+	for (int y = 0;y < NUMBER_OF_USERS;y++){
+		typeOfFaceToUse[y] = y%2;
+	}
 	
 	anubis.loadImage("images/anubis-wall-mask.gif");
 	
@@ -197,86 +200,15 @@
 			float w = ofGetWidth();
 			float h = ofGetHeight();
 
+			/*
+			if (typeOfFaceToUse[userID] == 1)
+			bezierFunctionStuff(userID);
+			else 
+			drawAcidSmiley(userID);
+			 */
+			}
+	}
 
-//		ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->left_lower_arm.begin.x,tracked->left_lower_arm.begin.y,tracked->left_lower_arm.end.x,/*tracked->left_lower_arm.end.y*/ w);
-//		ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->right_lower_arm.begin.x,tracked->right_lower_arm.begin.y,tracked->right_lower_arm.end.x,/*tracked->right_lower_arm.end.y*/ w);
-//		ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->left_lower_leg.begin.x,tracked->left_lower_leg.begin.y,tracked->left_lower_leg.end.x,/*tracked->left_lower_leg.end.y*/ h);
-//		ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->right_lower_leg.begin.x,tracked->right_lower_leg.begin.y,tracked->right_lower_leg.end.x,/*tracked->right_lower_leg.end.y*/ h);
-
-		//acid smiley	
-		ofFill();
-=======
-            ofBezier(tracked->neck.begin.x,
-                     tracked->neck.begin.y,
-                     tracked->neck.end.x,
-                     tracked->neck.end.y,
-                     tracked->left_lower_arm.begin.x,
-                     tracked->left_lower_arm.begin.y,
-                     tracked->left_lower_arm.end.x,
-                    /*tracked->left_lower_arm.end.y*/ w);
-                      
-            ofBezier(tracked->neck.begin.x,
-                     tracked->neck.begin.y,
-                     tracked->neck.end.x,
-                     tracked->neck.end.y,
-                     tracked->right_lower_arm.begin.x,
-                     tracked->right_lower_arm.begin.y,
-                     tracked->right_lower_arm.end.x,
-                    /*tracked->right_lower_arm.end.y*/ w);
-                      
-            ofBezier(tracked->neck.begin.x,
-                     tracked->neck.begin.y,
-                     tracked->neck.end.x,
-                     tracked->neck.end.y,
-                     tracked->left_lower_leg.begin.x,
-                     tracked->left_lower_leg.begin.y,
-                     tracked->left_lower_leg.end.x,
-                    /*tracked->left_lower_leg.end.y*/ h);
-                      
-            ofBezier(tracked->neck.begin.x,
-                    tracked->neck.begin.y,
-                    tracked->neck.end.x,
-                    tracked->neck.end.y,
-                    tracked->right_lower_leg.begin.x,
-                    tracked->right_lower_leg.begin.y,
-                    tracked->right_lower_leg.end.x,
-                    /*tracked->right_lower_leg.end.y*/ h);
-		ofFill();
-
-		ofSetColor(255,255,100);
-		ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,30);
-		ofSetColor(0);
-		ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,35);
-		ofSetColor(255,255,100);
-		ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,30);
-		ofSetColor(0);
-		ofCircle(tracked->neck.begin.x+10.0f,tracked->neck.begin.y,6);
-		ofCircle(tracked->neck.begin.x-10.0f,tracked->neck.begin.y,6);
-			
-//		anubis.draw(tracked->neck.begin.x,tracked->neck.begin.y);	
-
-
-ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->left_lower_arm.begin.x,tracked->left_lower_arm.begin.y,tracked->left_lower_arm.end.x,/*tracked->left_lower_arm.end.y*/ w);
-ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->right_lower_arm.begin.x,tracked->right_lower_arm.begin.y,tracked->right_lower_arm.end.x,/*tracked->right_lower_arm.end.y*/ w);
-ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->left_lower_leg.begin.x,tracked->left_lower_leg.begin.y,tracked->left_lower_leg.end.x,/*tracked->left_lower_leg.end.y*/ h);
-ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->right_lower_leg.begin.x,tracked->right_lower_leg.begin.y,tracked->right_lower_leg.end.x,/*tracked->right_lower_leg.end.y*/ h);
-ofFill();
-ofSetColor(255,255,100);
-	ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,30);
-ofSetColor(0);
-ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,35);
-ofSetColor(255,255,100);
-	ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,30);
-	ofSetColor(0);
-ofCircle(tracked->neck.begin.x+10.0f,tracked->neck.begin.y,6);
-ofCircle(tracked->neck.begin.x-10.0f,tracked->neck.begin.y,6);
-
-		}
-	}
-=======
-        }
-    }
->>>>>>> other
 	
 	//faint rectangle?
 	ofFill();
@@ -329,3 +261,80 @@
 
 }
 
+
+void testApp::bezierFunctionStuff(int i){
+
+	ofxTrackedUser* tracked = user.getTrackedUser(i);
+	float w = ofGetWidth();
+	float h = ofGetHeight();
+	
+	ofFill();
+	
+	ofBezier(tracked->neck.begin.x,
+			 tracked->neck.begin.y,
+			 tracked->neck.end.x,
+			 tracked->neck.end.y,
+			 tracked->left_lower_arm.begin.x,
+			 tracked->left_lower_arm.begin.y,
+			 tracked->left_lower_arm.end.x,
+			 /*tracked->left_lower_arm.end.y*/ w);
+	
+	ofBezier(tracked->neck.begin.x,
+			 tracked->neck.begin.y,
+			 tracked->neck.end.x,
+			 tracked->neck.end.y,
+			 tracked->right_lower_arm.begin.x,
+			 tracked->right_lower_arm.begin.y,
+			 tracked->right_lower_arm.end.x,
+			 /*tracked->right_lower_arm.end.y*/ w);
+	
+	ofBezier(tracked->neck.begin.x,
+			 tracked->neck.begin.y,
+			 tracked->neck.end.x,
+			 tracked->neck.end.y,
+			 tracked->left_lower_leg.begin.x,
+			 tracked->left_lower_leg.begin.y,
+			 tracked->left_lower_leg.end.x,
+			 /*tracked->left_lower_leg.end.y*/ h);
+	
+	ofBezier(tracked->neck.begin.x,
+			 tracked->neck.begin.y,
+			 tracked->neck.end.x,
+			 tracked->neck.end.y,
+			 tracked->right_lower_leg.begin.x,
+			 tracked->right_lower_leg.begin.y,
+			 tracked->right_lower_leg.end.x,
+			 /*tracked->right_lower_leg.end.y*/ h);
+	
+	
+	ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->left_lower_arm.begin.x,tracked->left_lower_arm.begin.y,tracked->left_lower_arm.end.x,/*tracked->left_lower_arm.end.y*/ w);
+	ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->right_lower_arm.begin.x,tracked->right_lower_arm.begin.y,tracked->right_lower_arm.end.x,/*tracked->right_lower_arm.end.y*/ w);
+	ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->left_lower_leg.begin.x,tracked->left_lower_leg.begin.y,tracked->left_lower_leg.end.x,/*tracked->left_lower_leg.end.y*/ h);
+	ofBezier(tracked->neck.begin.x,tracked->neck.begin.y,tracked->neck.end.x,tracked->neck.end.y,tracked->right_lower_leg.begin.x,tracked->right_lower_leg.begin.y,tracked->right_lower_leg.end.x,/*tracked->right_lower_leg.end.y*/ h);
+	
+	
+}
+
+void testApp::drawAcidSmiley(int i){
+	//acid smiley
+	
+	ofxTrackedUser* tracked = user.getTrackedUser(i);
+	float w = ofGetWidth();
+	float h = ofGetHeight();
+	
+	
+	ofFill();
+	
+	ofSetColor(255,255,100);
+	ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,30);
+	ofSetColor(0);
+	ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,35);
+	ofSetColor(255,255,100);
+	ofCircle(tracked->neck.begin.x,tracked->neck.begin.y,30);
+	ofSetColor(0);
+	ofCircle(tracked->neck.begin.x+10.0f,tracked->neck.begin.y,6);
+	ofCircle(tracked->neck.begin.x-10.0f,tracked->neck.begin.y,6);
+	
+	
+	
+}
--- a/of/testApp.h	Tue Mar 01 11:32:02 2011 +0000
+++ b/of/testApp.h	Tue Mar 01 12:28:19 2011 +0000
@@ -29,6 +29,8 @@
 		void mousePressed(int x, int y, int button);
 		void mouseReleased(int x, int y, int button);
 		void windowResized(int w, int h);
+		void bezierFunctionStuff(int i);
+	void drawAcidSmiley(int userID);
 		ofxOpenNIContext context;
 		ofxDepthGenerator depth;
 		ofxUserGenerator user;
@@ -41,8 +43,8 @@
 	
 	float maxTorsoValues[3];
 	void checkTorsoMaxima(int id);
-
-	double lastRecordedTime[6];//x,y,and z of the head
+	int typeOfFaceToUse[NUMBER_OF_USERS];
+	double lastRecordedTime[NUMBER_OF_USERS];//x,y,and z of the head
 	float torso[6][3];//x,y,and z of the head
 	bool userPresent[6];