git

commit 46aa80a8ba3cc73200a7c247cece88ce70641f49
Author: Tal Sznicer <talsznicer@gmail.com>
Date:   Fri Apr 19 15:16:51 2013 +0300

    torso

diff --git a/Texperience_Final.pde b/Texperience_Final.pde
index f30e214..9efcfdb 100644
--- a/Texperience_Final.pde
+++ b/Texperience_Final.pde
@@ -1,6 +1,5 @@
 
 //tal sznicer test
-
 //imports
 import SimpleOpenNI.*;
 import processing.opengl.*;
@@ -12,8 +11,8 @@ HashMap<Integer, ArrayList> hm = new HashMap();
 
 OBJModel test, moon, stars, tree, xoxoMan, xoxoCouch, twoMan, twoManArrow, sphear, stone;
 
-SimpleOpenNI context;
-boolean autoCalib=true;
+SimpleOpenNI  context;
+boolean       autoCalib=true;
 PVector head = new PVector();
 
 //Sensor position relative to screen in mm
@@ -21,6 +20,11 @@ PVector sensorPosition = new PVector(0, 0, 0);
 PVector defaultCameraPosition = new PVector(0, 0, 0);
 PVector currentCameraPosition = defaultCameraPosition;
 
+//Opening
+float zoomF =0.5f;
+color[] userColors = { color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color(0, 255, 255) };
+color[] userCoMColors = { color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0) };
+
 //My Floats
 float mouseZPosition = 19000.0;
 float zPosition = 0.0;
@@ -31,9 +35,15 @@ float xoxoFall = 6000;
 //boolean runOnce = true;
 
 float treeNumber = 5;
-float[] treeX = { (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0))};
-float[] treeZ = { (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0))};
-float[] treeRotate = { (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)) };
+float[] treeX = { 
+  (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0)), (random(-6000.0, 6000.0))
+};
+float[] treeZ = { 
+  (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0)), (random(-400.0, 29500.0))
+};
+float[] treeRotate = { 
+  (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0)), (random(0.0, 360.0))
+};
 float treeHoleR = 1;
 float treeY = 0;
 boolean startWallUp = false;
@@ -41,9 +51,16 @@ float wallUp = 0;
 
 float startPosition = 30000;
 
+<<<<<<< HEAD
 float zoomF =0.5f;
-color[] userColors = { color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color(0, 255, 255) };
-color[] userCoMColors = { color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0) };
+color[] userColors = { 
+  color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color(0, 255, 255)
+};
+color[] userCoMColors = { 
+  color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0)
+};
+=======
+>>>>>>> parent of b5fea6c... staets FIXED!
 
 float lastRWPx = 0.0;
 float lastRWPy = 0.0;
@@ -95,8 +112,23 @@ void setup() {
   size(900, 1000, P3D);
 
   context = new SimpleOpenNI(this);
-  
+
+<<<<<<< HEAD
   enableDepthMap();
+=======
+  // enable depthMap generation 
+  if (context.enableDepth() == false)
+  {
+    println("Can't open the depthMap, maybe the camera is not connected!"); 
+
+    if ( context.openFileRecording("C:\\Users\\tal\\Documents\\GitHub\\Texperience_Final\\data\\1.oni") == false)
+    {
+      println("can't find recording !!!!");
+      exit();
+      return;
+    }
+  }
+>>>>>>> parent of b5fea6c... staets FIXED!
 
   // enable skeleton generation for all joints
   context.enableUser(SimpleOpenNI.SKEL_PROFILE_ALL);
@@ -108,6 +140,7 @@ void setup() {
 
   //3D Objects 
   //types of rendering: LINES,POLYGON,QUADS,
+
   // test
   test = new OBJModel(this, "test.obj", "relative", POLYGON);
   test.enableDebug();
@@ -190,31 +223,45 @@ void setup() {
 
 
 void draw() {
+<<<<<<< HEAD
 
   printInfo();
+=======
+//beginCamera();
+  println("state:     "+state);
+  println("_____");
+  println("cameraX:    "+(currentCameraPosition.x + sensorPosition.x));
+  println("cameraY:   "+(currentCameraPosition.y + sensorPosition.y));
+  println("cameraZ:   "+(currentCameraPosition.z + sensorPosition.z));
+  println("_____");
+  println("zPosition:  "+zPosition);  
+  println("______________________");
 
+>>>>>>> parent of b5fea6c... staets FIXED!
   context.update();
-  
-
   //cameraZero ();
   cameraToggle ();
-  drawSkeleton();
+  statusManager();
+  //Draw the wall projection
+pushStyle();
+  scale(0.5f);
+popStyle();
+  drawUsers ();
   xoxoFall ();
   wallUp ();
   treePop ();
-  scale(1, -1, 1);
   background(10, 10, 40);
-  
+
   //  lights();
   //directionalLight(255, 255, 255, 0, -1, 0);
   //  directionalLight(255, 255, 255, 0, 0, 1);
   //  directionalLight(255, 255, 255, 1, 0, 0);
 
-//Draw the wall projection
-  drawWall ();
-
-//Draw 3D Objects
+  
+  
 
+  //Draw 3D Objects
+  scale(1, -1, 1);
   /*
   // test
    pushMatrix();
@@ -226,7 +273,7 @@ void draw() {
    popStyle();  
    popMatrix();
    */
-
+  
   //Begining wall
   pushMatrix();
   pushStyle();
@@ -334,7 +381,7 @@ void draw() {
   stone.draw();
   popStyle();  
   popMatrix();
-  
+
   perspective(PI / 3, float(width)/float(height), 1, 1000000);
   //endCamera();
 }
@@ -363,6 +410,7 @@ void draw() {
 
 
 // Voids
+<<<<<<< HEAD
 void enableDepthMap()
 {
   // enable depthMap generation 
@@ -381,7 +429,7 @@ void enableDepthMap()
 
 void printInfo()
 {
-//beginCamera();
+  //beginCamera();
   println("state:     "+state);
   println("_____");
   println("cameraX:    "+(currentCameraPosition.x + sensorPosition.x));
@@ -394,8 +442,83 @@ void printInfo()
   println("______________________");
 }
 
+void drawUsers()
+{
+  if (state == ENGAGE || state == SYNC) {
+
+    //scale(zoomF);
+    int[]   depthMap = context.depthMap();
+    int     steps   = 5;  // to speed up the drawing, draw every third point
+    int     index;
+    PVector realWorldPoint;
+
+    pushMatrix();
+    pushStyle();  
+    scale(0.5f);
+    translate(0, 1300, startPosition + 6000);  // set the rotation center of the scene 1000 infront of the camera
+    rotateY(radians(180));
+    int userCount = context.getNumberOfUsers();
+    int[] userMap = null;
+    if (userCount > 0)
+    {
+      userMap = context.getUsersPixels(SimpleOpenNI.USERS_ALL);
+    }
+
+    for (int y=0;y < context.depthHeight();y+=steps)
+    {
+      for (int x=0;x < context.depthWidth();x+=steps)
+      {
+        index = x + y * context.depthWidth();
+        if (depthMap[index] > 0)
+        { 
+          // get the realworld points
+          realWorldPoint = context.depthMapRealWorld()[index];
+
+          // check if there is a user
+          if (userMap != null && userMap[index] != 0)
+          {  // call the user color
+
+            //int colorIndex = userMap[index] % userColors.length;
+            strokeWeight(4);
+            if (state == ENGAGE || state == SYNC)
+            {
+              if ( userMap[index] == chosenUser) {
+                //color of chosen person
+                stroke(color(0, 255, 0));
+              }
+              else {
+                //color of recognized people
+                stroke(color(0, 0, 255));
+              }
+            }
+            else {
+              //stroke(userColors[0]);
+              stroke(color(0, 0, 255));
+            }
+          }
+          else
+            // camera capture background color
+            stroke(255); 
+
+          point(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z);
+          //line(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z, lastRWPx,lastRWPy,lastRWPz);
+
+          lastRWPx = realWorldPoint.x;
+          lastRWPy = realWorldPoint.y;
+          lastRWPz = realWorldPoint.z;
+        }
+      }
+    }
+    popStyle();
+    popMatrix();
+  }
+}
+
+void statusManager() {
+=======
 void drawSkeleton(){
   // draw the skeleton if it's available
+>>>>>>> parent of b5fea6c... staets FIXED!
   int[] userList = context.getUsers();
   int numTreckedUsers = 0;
   for (int i=0;i<userList.length;i++)  
@@ -416,8 +539,13 @@ void drawSkeleton(){
 
         if (headHistory.size() > historySize)
         {
+<<<<<<< HEAD
+          //check if not moving
+          float total = 0; //accumulated torso movement
+=======
         //check if not moving
           float total = 0; //accumulated head movement
+>>>>>>> parent of 79ea794... follow torso instead of head
           for (int j=1;j<historySize;j++)
           {
             PVector v3 = PVector.sub(headHistory.get(j), headHistory.get(j-1));
@@ -441,18 +569,18 @@ void drawSkeleton(){
           headHistory.remove(0);
         }
       }
-    else if (state == SYNC) 
-    {      
-      if (currentCameraPosition.z + sensorPosition.z >= 8000.0)
+      else if (state == SYNC) 
+      {      
+        if (currentCameraPosition.z + sensorPosition.z >= 8000.0)
         {
-        startWalk(userList[i]);
+          startWalk(userList[i]);
         }
-    }
-    else if (state == STARTWALK)
-    {
-     startWallUp = true; 
-    }  
-    
+      }
+      else if (state == STARTWALK)
+      {
+        startWallUp = true;
+      }  
+
       numTreckedUsers++;
       context.getJointPositionSkeleton(userList[i], SimpleOpenNI.SKEL_HEAD, head);
       head.x = -head.x;
@@ -471,13 +599,13 @@ void drawSkeleton(){
   else {
     target = defaultCameraPosition ;
   }
-currentCameraPosition.lerp(target, 0.1);
+  currentCameraPosition.lerp(target, 0.1);
 }
 
 void engage ()
 {
   //reset all inits and floats
- //println("ENGAGE");
+  //println("ENGAGE");
   state  = ENGAGE;
   chosenUser = 0;
 }
@@ -526,36 +654,36 @@ void treePop ()
 }
 
 /*void cameraZero ()
-{
+ {
  if ( cameraY >= 1 )
  {
-  cameraY = 0;
+ cameraY = 0;
  } else {
-   cameraY =  currentCameraPosition.y + sensorPosition.y;
+ cameraY =  currentCameraPosition.y + sensorPosition.y;
  }
-}*/
+ }*/
 
 void cameraToggle ()
 {
   //Toggle between camera and mouse
   if (cameraOn) {
-    if (state == SYNC || state == ENGAGE) {  
+    if (state == SYNC || state == ENGAGE) { 
 
-      //println("camera on freez");
+      println("camera on freez");
       camera( 
-      60, -1000, mouseZPosition, 
+      60, -1000, startPosition, 
       0, -5000, 0, 
       0, 1.0, 0);
       //zPosition = 19000;
     } 
     else {
-      //println("camera on user");
+      println("camera on user");
       zPosition =(currentCameraPosition.z + sensorPosition.z); 
       camera( 
       currentCameraPosition.x + sensorPosition.x, currentCameraPosition.y + sensorPosition.y, currentCameraPosition.z + sensorPosition.z, 
-      0,0,0,
+      0, 0, 0, 
       0, 1.0, 0);
-      
+
       // println("X: "+ currentCameraPosition.x);
       // println("y: "+ currentCameraPosition.y);
       // println("z: "+ currentCameraPosition.z);
@@ -563,29 +691,31 @@ void cameraToggle ()
     }
   }
   else if (cameraOn == false) {
-    //println("camera off");
+    println("camera off");
     camera( 
     (((float(mouseX) / width) - 0.5) * 2000), (((float(mouseY) / height) - 0.5) * 2000), mouseZPosition, //mouseY / height * 2000, //move camera
     0, 0, 0, 
     0, 1.0, 0);
     zPosition = mouseZPosition ;
+<<<<<<< HEAD
+=======
   }  
 }
 
 void drawWall()
 {
-  if (state == ENGAGE || state == SYNC) {
+  if (state == ENGAGE || state == ENGAGE) {
 
     scale(zoomF);
     int[]   depthMap = context.depthMap();
-    int     steps   = 3;  // to speed up the drawing, draw every third point
+    int     steps   = 10;  // to speed up the drawing, draw every third point
     int     index;
     PVector realWorldPoint;
 
     pushMatrix();
     pushStyle();  
     scale(1);
-    translate(0, 1300,(startPosition + 3000));  // set the rotation center of the scene 1000 infront of the camera
+    translate(0, 1300, (startPosition + 300));  // set the rotation center of the scene 1000 infront of the camera
     rotateY(radians(180));
     int userCount = context.getNumberOfUsers();
     int[] userMap = null;
@@ -628,7 +758,7 @@ void drawWall()
           }
           else
             // camera capture background color
-            stroke(255); 
+            stroke(0); 
           
           point(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z);
           //line(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z, lastRWPx,lastRWPy,lastRWPz);
@@ -641,6 +771,7 @@ void drawWall()
     }
     popStyle();
     popMatrix();
+>>>>>>> parent of b5fea6c... staets FIXED!
   }
 }
 
@@ -671,6 +802,7 @@ void drawWall()
 
 
 
+
 // Keyboard events
 void keyPressed() {
 
@@ -820,4 +952,3 @@ void onEndPose(String pose, int userId)
 
 
 
-
diff --git a/build-tmp/Texperience_Final.class b/build-tmp/Texperience_Final.class
index 30567f1..bccf794 100644
Binary files a/build-tmp/Texperience_Final.class and b/build-tmp/Texperience_Final.class differ
diff --git a/build-tmp/source/Texperience_Final.java b/build-tmp/source/Texperience_Final.java
index a2420ea..fdd19fc 100644
--- a/build-tmp/source/Texperience_Final.java
+++ b/build-tmp/source/Texperience_Final.java
@@ -21,7 +21,6 @@ public class Texperience_Final extends PApplet {
 
 
 //tal sznicer test
-
 //imports
 
 
@@ -33,8 +32,8 @@ HashMap<Integer, ArrayList> hm = new HashMap();
 
 OBJModel test, moon, stars, tree, xoxoMan, xoxoCouch, twoMan, twoManArrow, sphear, stone;
 
-SimpleOpenNI context;
-boolean autoCalib=true;
+SimpleOpenNI  context;
+boolean       autoCalib=true;
 PVector head = new PVector();
 
 //Sensor position relative to screen in mm
@@ -42,6 +41,11 @@ PVector sensorPosition = new PVector(0, 0, 0);
 PVector defaultCameraPosition = new PVector(0, 0, 0);
 PVector currentCameraPosition = defaultCameraPosition;
 
+//Opening
+float zoomF =0.5f;
+int[] userColors = { color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color(0, 255, 255) };
+int[] userCoMColors = { color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0) };
+
 //My Floats
 float mouseZPosition = 19000.0f;
 float zPosition = 0.0f;
@@ -52,9 +56,15 @@ float xoxoFall = 6000;
 //boolean runOnce = true;
 
 float treeNumber = 5;
-float[] treeX = { (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f))};
-float[] treeZ = { (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f))};
-float[] treeRotate = { (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)) };
+float[] treeX = { 
+  (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f)), (random(-6000.0f, 6000.0f))
+};
+float[] treeZ = { 
+  (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f)), (random(-400.0f, 29500.0f))
+};
+float[] treeRotate = { 
+  (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f)), (random(0.0f, 360.0f))
+};
 float treeHoleR = 1;
 float treeY = 0;
 boolean startWallUp = false;
@@ -62,9 +72,16 @@ float wallUp = 0;
 
 float startPosition = 30000;
 
+<<<<<<< HEAD
 float zoomF =0.5f;
-int[] userColors = { color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color(0, 255, 255) };
-int[] userCoMColors = { color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0) };
+int[] userColors = { 
+  color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color (0, 0, 0), color(0, 255, 255)
+};
+int[] userCoMColors = { 
+  color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0), color (255, 0, 0)
+};
+=======
+>>>>>>> parent of b5fea6c... staets FIXED!
 
 float lastRWPx = 0.0f;
 float lastRWPy = 0.0f;
@@ -116,8 +133,23 @@ public void setup() {
   size(900, 1000, P3D);
 
   context = new SimpleOpenNI(this);
-  
+
+<<<<<<< HEAD
   enableDepthMap();
+=======
+  // enable depthMap generation 
+  if (context.enableDepth() == false)
+  {
+    println("Can't open the depthMap, maybe the camera is not connected!"); 
+
+    if ( context.openFileRecording("C:\\Users\\tal\\Documents\\GitHub\\Texperience_Final\\data\\1.oni") == false)
+    {
+      println("can't find recording !!!!");
+      exit();
+      return;
+    }
+  }
+>>>>>>> parent of b5fea6c... staets FIXED!
 
   // enable skeleton generation for all joints
   context.enableUser(SimpleOpenNI.SKEL_PROFILE_ALL);
@@ -129,6 +161,7 @@ public void setup() {
 
   //3D Objects 
   //types of rendering: LINES,POLYGON,QUADS,
+
   // test
   test = new OBJModel(this, "test.obj", "relative", POLYGON);
   test.enableDebug();
@@ -211,31 +244,45 @@ public void setup() {
 
 
 public void draw() {
+<<<<<<< HEAD
 
   printInfo();
+=======
+//beginCamera();
+  println("state:     "+state);
+  println("_____");
+  println("cameraX:    "+(currentCameraPosition.x + sensorPosition.x));
+  println("cameraY:   "+(currentCameraPosition.y + sensorPosition.y));
+  println("cameraZ:   "+(currentCameraPosition.z + sensorPosition.z));
+  println("_____");
+  println("zPosition:  "+zPosition);  
+  println("______________________");
 
+>>>>>>> parent of b5fea6c... staets FIXED!
   context.update();
-  
-
   //cameraZero ();
   cameraToggle ();
-  drawSkeleton();
+  statusManager();
+  //Draw the wall projection
+pushStyle();
+  scale(0.5f);
+popStyle();
+  drawUsers ();
   xoxoFall ();
   wallUp ();
   treePop ();
-  scale(1, -1, 1);
   background(10, 10, 40);
-  
+
   //  lights();
   //directionalLight(255, 255, 255, 0, -1, 0);
   //  directionalLight(255, 255, 255, 0, 0, 1);
   //  directionalLight(255, 255, 255, 1, 0, 0);
 
-//Draw the wall projection
-  drawWall ();
-
-//Draw 3D Objects
+  
+  
 
+  //Draw 3D Objects
+  scale(1, -1, 1);
   /*
   // test
    pushMatrix();
@@ -247,7 +294,7 @@ public void draw() {
    popStyle();  
    popMatrix();
    */
-
+  
   //Begining wall
   pushMatrix();
   pushStyle();
@@ -355,7 +402,7 @@ public void draw() {
   stone.draw();
   popStyle();  
   popMatrix();
-  
+
   perspective(PI / 3, PApplet.parseFloat(width)/PApplet.parseFloat(height), 1, 1000000);
   //endCamera();
 }
@@ -384,6 +431,7 @@ public void draw() {
 
 
 // Voids
+<<<<<<< HEAD
 public void enableDepthMap()
 {
   // enable depthMap generation 
@@ -402,7 +450,7 @@ public void enableDepthMap()
 
 public void printInfo()
 {
-//beginCamera();
+  //beginCamera();
   println("state:     "+state);
   println("_____");
   println("cameraX:    "+(currentCameraPosition.x + sensorPosition.x));
@@ -415,8 +463,85 @@ public void printInfo()
   println("______________________");
 }
 
+public void drawUsers()
+{
+  if (state == ENGAGE || state == SYNC) {
+
+    //scale(zoomF);
+    int[]   depthMap = context.depthMap();
+    int     steps   = 5;  // to speed up the drawing, draw every third point
+    int     index;
+    PVector realWorldPoint;
+
+    pushMatrix();
+    pushStyle();  
+    scale(0.5f);
+    translate(0, 1300, startPosition + 6000);  // set the rotation center of the scene 1000 infront of the camera
+    rotateY(radians(180));
+    int userCount = context.getNumberOfUsers();
+    int[] userMap = null;
+    if (userCount > 0)
+    {
+      userMap = context.getUsersPixels(SimpleOpenNI.USERS_ALL);
+    }
+
+    for (int y=0;y < context.depthHeight();y+=steps)
+    {
+      for (int x=0;x < context.depthWidth();x+=steps)
+      {
+        index = x + y * context.depthWidth();
+        if (depthMap[index] > 0)
+        { 
+          // get the realworld points
+          realWorldPoint = context.depthMapRealWorld()[index];
+
+          // check if there is a user
+          if (userMap != null && userMap[index] != 0)
+          {  // call the user color
+
+            //int colorIndex = userMap[index] % userColors.length;
+            strokeWeight(4);
+            if (state == ENGAGE || state == SYNC)
+            {
+              if ( userMap[index] == chosenUser) {
+                //color of chosen person
+                stroke(color(0, 255, 0));
+              }
+              else {
+                //color of recognized people
+                stroke(color(0, 0, 255));
+              }
+            }
+            else {
+              //stroke(userColors[0]);
+              stroke(color(0, 0, 255));
+            }
+          }
+          else
+            // camera capture background color
+            stroke(255); 
+
+          point(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z);
+//          fill(255);
+  //        rect(0, 0, 4000, 4000);
+          //line(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z, lastRWPx,lastRWPy,lastRWPz);
+
+          lastRWPx = realWorldPoint.x;
+          lastRWPy = realWorldPoint.y;
+          lastRWPz = realWorldPoint.z;
+        }
+      }
+    }
+    popStyle();
+    popMatrix();
+  }
+}
+
+public void statusManager() {
+=======
 public void drawSkeleton(){
   // draw the skeleton if it's available
+>>>>>>> parent of b5fea6c... staets FIXED!
   int[] userList = context.getUsers();
   int numTreckedUsers = 0;
   for (int i=0;i<userList.length;i++)  
@@ -437,8 +562,13 @@ public void drawSkeleton(){
 
         if (headHistory.size() > historySize)
         {
+<<<<<<< HEAD
+          //check if not moving
+          float total = 0; //accumulated torso movement
+=======
         //check if not moving
           float total = 0; //accumulated head movement
+>>>>>>> parent of 79ea794... follow torso instead of head
           for (int j=1;j<historySize;j++)
           {
             PVector v3 = PVector.sub(headHistory.get(j), headHistory.get(j-1));
@@ -462,18 +592,18 @@ public void drawSkeleton(){
           headHistory.remove(0);
         }
       }
-    else if (state == SYNC) 
-    {      
-      if (currentCameraPosition.z + sensorPosition.z >= 8000.0f)
+      else if (state == SYNC) 
+      {      
+        if (currentCameraPosition.z + sensorPosition.z >= 8000.0f)
         {
-        startWalk(userList[i]);
+          startWalk(userList[i]);
         }
-    }
-    else if (state == STARTWALK)
-    {
-     startWallUp = true; 
-    }  
-    
+      }
+      else if (state == STARTWALK)
+      {
+        startWallUp = true;
+      }  
+
       numTreckedUsers++;
       context.getJointPositionSkeleton(userList[i], SimpleOpenNI.SKEL_HEAD, head);
       head.x = -head.x;
@@ -492,13 +622,13 @@ public void drawSkeleton(){
   else {
     target = defaultCameraPosition ;
   }
-currentCameraPosition.lerp(target, 0.1f);
+  currentCameraPosition.lerp(target, 0.1f);
 }
 
 public void engage ()
 {
   //reset all inits and floats
- //println("ENGAGE");
+  //println("ENGAGE");
   state  = ENGAGE;
   chosenUser = 0;
 }
@@ -547,36 +677,36 @@ public void treePop ()
 }
 
 /*void cameraZero ()
-{
+ {
  if ( cameraY >= 1 )
  {
-  cameraY = 0;
+ cameraY = 0;
  } else {
-   cameraY =  currentCameraPosition.y + sensorPosition.y;
+ cameraY =  currentCameraPosition.y + sensorPosition.y;
  }
-}*/
+ }*/
 
 public void cameraToggle ()
 {
   //Toggle between camera and mouse
   if (cameraOn) {
-    if (state == SYNC || state == ENGAGE) {  
+    if (state == SYNC || state == ENGAGE) { 
 
-      //println("camera on freez");
+      println("camera on freez");
       camera( 
-      60, -1000, mouseZPosition, 
+      60, -1000, startPosition, 
       0, -5000, 0, 
       0, 1.0f, 0);
       //zPosition = 19000;
     } 
     else {
-      //println("camera on user");
+      println("camera on user");
       zPosition =(currentCameraPosition.z + sensorPosition.z); 
       camera( 
       currentCameraPosition.x + sensorPosition.x, currentCameraPosition.y + sensorPosition.y, currentCameraPosition.z + sensorPosition.z, 
-      0,0,0,
+      0, 0, 0, 
       0, 1.0f, 0);
-      
+
       // println("X: "+ currentCameraPosition.x);
       // println("y: "+ currentCameraPosition.y);
       // println("z: "+ currentCameraPosition.z);
@@ -584,29 +714,31 @@ public void cameraToggle ()
     }
   }
   else if (cameraOn == false) {
-    //println("camera off");
+    println("camera off");
     camera( 
     (((PApplet.parseFloat(mouseX) / width) - 0.5f) * 2000), (((PApplet.parseFloat(mouseY) / height) - 0.5f) * 2000), mouseZPosition, //mouseY / height * 2000, //move camera
     0, 0, 0, 
     0, 1.0f, 0);
     zPosition = mouseZPosition ;
+<<<<<<< HEAD
+=======
   }  
 }
 
 public void drawWall()
 {
-  if (state == ENGAGE || state == SYNC) {
+  if (state == ENGAGE || state == ENGAGE) {
 
     scale(zoomF);
     int[]   depthMap = context.depthMap();
-    int     steps   = 3;  // to speed up the drawing, draw every third point
+    int     steps   = 10;  // to speed up the drawing, draw every third point
     int     index;
     PVector realWorldPoint;
 
     pushMatrix();
     pushStyle();  
     scale(1);
-    translate(0, 1300,(startPosition + 3000));  // set the rotation center of the scene 1000 infront of the camera
+    translate(0, 1300, (startPosition + 300));  // set the rotation center of the scene 1000 infront of the camera
     rotateY(radians(180));
     int userCount = context.getNumberOfUsers();
     int[] userMap = null;
@@ -649,7 +781,7 @@ public void drawWall()
           }
           else
             // camera capture background color
-            stroke(255); 
+            stroke(0); 
           
           point(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z);
           //line(realWorldPoint.x, realWorldPoint.y, realWorldPoint.z, lastRWPx,lastRWPy,lastRWPz);
@@ -662,6 +794,7 @@ public void drawWall()
     }
     popStyle();
     popMatrix();
+>>>>>>> parent of b5fea6c... staets FIXED!
   }
 }
 
@@ -692,6 +825,7 @@ public void drawWall()
 
 
 
+
 // Keyboard events
 public void keyPressed() {
 
@@ -841,7 +975,6 @@ public void onEndPose(String pose, int userId)
 
 
 
-
 // // The Link class is used for handling constraints between particles.
 // class Link {
 //   float restingDistance;