fixes for GUI and crash fix

Author: maybites

HeadRoom.xcodeproj/project.xcworkspace/xcuserdata/maybites.xcuserdatad/UserInterfaceState.xcuserstate

@@ -35,12 +35,12 @@ void BlobFinder::setup(ofxGui &gui){
     sensorBoxBottom.addListener(this, &BlobFinder::updateSensorBox);
 
     sensorBoxGuiGroup.setName("SensorBox");
-    sensorBoxGuiGroup.add(sensorBoxLeft.set("left", -500, 0, -4000));
-    sensorBoxGuiGroup.add(sensorBoxRight.set("right", 500, 0, 4000));
+    sensorBoxGuiGroup.add(sensorBoxLeft.set("left", -500, 1000, -4000));
+    sensorBoxGuiGroup.add(sensorBoxRight.set("right", 500, -1000, 4000));
     sensorBoxGuiGroup.add(sensorBoxFront.set("front", 0, 0, 10000));
-    sensorBoxGuiGroup.add(sensorBoxBack.set("back", 2000, 0, 7000));
-    sensorBoxGuiGroup.add(sensorBoxTop.set("top", 2200, 0, 3000));
-    sensorBoxGuiGroup.add(sensorBoxBottom.set("bottom", 1000, 0, 3000));
+    sensorBoxGuiGroup.add(sensorBoxBack.set("back", 2000, 0, 10000));
+    sensorBoxGuiGroup.add(sensorBoxTop.set("top", 2200, 0, 5000));
+    sensorBoxGuiGroup.add(sensorBoxBottom.set("bottom", 1000, 0, 5000));
     panel->addGroup(sensorBoxGuiGroup);
 
     blobGuiGroup.setName("Blobs");
@@ -251,7 +251,7 @@ void BlobFinder::update(){
         ofRectangle bounds = contourEyeFinder.blobs[i].boundingRect;
         for(int bid = 0; bid < trackedBlobs.size(); bid++){
             // find the blob
-            if(trackedBlobs[bid].finder(bounds)){
+            if(trackedBlobs[bid].isAlive() & trackedBlobs[bid].finder(bounds)){
 
                 //calculate the blob pos in worldspace
                 ofVec3f headBlobCenter = ofVec3f(((float)bounds.getCenter().x / captureScreenSize.x) * sensorFieldWidth + sensorFieldLeft, sensorFieldBack - ((float)bounds.getCenter().y / captureScreenSize.y ) * sensorFieldDepth, trackedBlobs[bid].headCenter.z);

src/BlobFinder.cpp

@@ -74,20 +74,20 @@ ofVec3f BlobTracker::getCurrentHeadCenter(){
 }
 
 void BlobTracker::updateHead(ofVec3f _headBlobCenter, ofVec2f _headBlobSize, ofVec3f _eyeCenter){
-    if(!hasHeadUpdated){
-        tracker[0].headBlobCenter = _headBlobCenter;
-        tracker[0].headBlobSize = _headBlobSize;
-        tracker[0].eyeCenter = _eyeCenter;
-    } else {
-        // this means the previous blob was split up.
-        if(tracker.size() > 0 && tracker[0].headBlobCenter.z < _headBlobCenter.z){ //if this new blob is higher then take it
+    if(tracker.size() > 0){
+        if(!hasHeadUpdated){
+            tracker[0].headBlobCenter = _headBlobCenter;
+            tracker[0].headBlobSize = _headBlobSize;
+            tracker[0].eyeCenter = _eyeCenter;
+        } else if(tracker[0].headBlobCenter.z < _headBlobCenter.z){
+            //if this new blob is higher then take it
             tracker[0].headBlobCenter = _headBlobCenter;
             tracker[0].headBlobSize = _headBlobSize;
             tracker[0].eyeCenter = _eyeCenter;
         }
+
+        hasHeadUpdated = true;
     }
-    
-    hasHeadUpdated = true;
 }
 
 void BlobTracker::updateEnd(ofVec3f _kinectPos, int _smoothOffset, float _smoothFactor){

src/BlobTracker.cpp

@@ -106,7 +106,7 @@ void ofApp::setup(){
     intrinsicGuiGroup.setName("Corrections");
     intrinsicGuiGroup.add(depthCorrectionBase.set("base", 1.0, 0.9, 1.1));
     intrinsicGuiGroup.add(depthCorrectionDivisor.set("divisor", 100000, 90000, 110000));
-    intrinsicGuiGroup.add(pixelSizeCorrector.set("pixl factor", 1.0, 0.9, 1.1));
+    intrinsicGuiGroup.add(pixelSizeCorrector.set("pixl factor", 1.0, 0.9, 1.2));
     deviceCalib->addGroup(intrinsicGuiGroup);
 
     deviceCalib->loadFromFile(kinectSerialID + ".xml");
@@ -674,6 +674,17 @@ void ofApp::updatePointCloud(ofVboMesh & mesh, int step, bool useFrustumCone, bo
     float sensorFieldTop = blobFinder.sensorBoxTop .get();
     float sensorFieldBottom = blobFinder.sensorBoxBottom.get();
 
+    float centerH = (sensorFieldLeft + sensorFieldRight) / 2.0;
+    float centerK = (sensorFieldFront + sensorFieldBack) / 2.0;
+    float radiusX = (sensorFieldRight - sensorFieldLeft) / 2.0;
+    float radiusY = (sensorFieldBack - sensorFieldFront) / 2.0;
+    
+    radiusX = radiusX * radiusX;
+    radiusY = radiusY * radiusY;
+    
+    //https://math.stackexchange.com/questions/76457/check-if-a-point-is-within-an-ellipse#76463
+    //(x−h)^2/rx^2+(y−k)^2/ry^2≤1.
+    
 	for(int y = 0; y < h; y += step) {
 		for(int x = 0; x < w; x += step) {
             vertex.z = 0;
@@ -690,13 +701,9 @@ void ofApp::updatePointCloud(ofVboMesh & mesh, int step, bool useFrustumCone, bo
             }
             if(vertex.z != 0){
                 if(sensorFieldLeft < vertex.x && vertex.x < sensorFieldRight &&
-                   sensorFieldFront < vertex.y && vertex.y < sensorFieldBack &&
-                   sensorFieldBottom < vertex.z && vertex.z < sensorFieldTop){
-                    mesh.addColor((vertex.z - sensorFieldBottom) / (sensorFieldTop - sensorFieldBottom));
-                } else if(sensorFieldLeft < vertex.x && vertex.x < sensorFieldRight &&
-                     sensorFieldFront < vertex.y && vertex.y < sensorFieldBack &&
-                     sensorFieldBottom < vertex.z && vertex.z < sensorFieldTop){
-                    mesh.addColor((vertex.z - sensorFieldBottom) / (sensorFieldTop - sensorFieldBottom));
+                    sensorFieldFront < vertex.y && vertex.y < sensorFieldBack &&
+                    sensorFieldBottom < vertex.z && vertex.z < sensorFieldTop){
+                        mesh.addColor((vertex.z - sensorFieldBottom) / (sensorFieldTop - sensorFieldBottom));
                 } else {
                     if(useVideoColor)
                         mesh.addColor(kinect.getColorAt(x,y));