# HG changeset patch
# User Becky Stewart <rebecca.stewart@eecs.qmul.ac.uk>
# Date 1298635342 0
# Node ID 85d158045994634cf0944689dacdbff7bfdbca93
# Parent  a3656215878b4dc3d9ead0231f037d32fe30017d
Cleaned up some formatting, no content change.

diff -r a3656215878b -r 85d158045994 of/testApp.cpp
--- a/of/testApp.cpp	Fri Feb 18 13:44:10 2011 +0000
+++ b/of/testApp.cpp	Fri Feb 25 12:02:22 2011 +0000
@@ -17,9 +17,9 @@
 //	Davy.loadImage("images/davy.jpg");
    ofEnableSmoothing();
    ofSetBackgroundAuto(false);
-   	ofBackground(238,238,224);
-   	ofEnableAlphaBlending();
-   	ofSetLineWidth(12);
+   ofBackground(238,238,224);
+   ofEnableAlphaBlending();
+   ofSetLineWidth(12);
 }
 
 //--------------------------------------------------------------
@@ -55,28 +55,60 @@
 				 << tracked->left_lower_arm.end.x << " " 
 				 << tracked->left_lower_arm.end.y << " "
 				 << tracked->neck.begin.z << endl; 
-if (tracked->neck.begin.x != 0)
-
-ofSetColor(139,0,0,100);
-	ofNoFill();
-	float w = ofGetWidth();
-	float h = ofGetHeight();
-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);
-		}
-	}
+			
+            if (tracked->neck.begin.x != 0)
+                 ofSetColor(139,0,0,100);
+            
+            ofNoFill();
+            float w = ofGetWidth();
+            float h = ofGetHeight();
+            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);
+        }
+    }
 	ofFill();
 	ofSetColor(238,238,224,20);
 	ofRect(0,0,ofGetWidth(),ofGetHeight());