whelan's

1 files changed, 13 insertions, 34 deletions

diff --git a/liveengine/src/testApp.cpp b/liveengine/src/testApp.cpp
index a2a242f..238c6e7 100755
--- a/liveengine/src/testApp.cpp
+++ b/liveengine/src/testApp.cpp
@@ -43,13 +43,15 @@ kinectWindow::~kinectWindow(){
 	cout << "kinect window destroyed" << endl;
 }
 void kinectWindow::setup(){
+	ofSetBackgroundAuto(false);
 }
 void kinectWindow::setParent(testApp *p){
 	parent=p;
 }
 void kinectWindow::draw(){
-	parent->recordDepth.draw(0,0,ofGetWidth(),ofGetHeight());
-	parent->recordUser.draw(ofGetWidth(),ofGetHeight());
+	//parent->NIinstance.drawpreview();
+	parent->NIinstance.recordDepth.draw(0,0,ofGetWidth(),ofGetHeight());
+	parent->NIinstance.recordUser.draw(ofGetWidth(),ofGetHeight());
 }
 
 
@@ -77,8 +79,9 @@ void testApp::setup(){
                     int rot=XML.getAttribute("viewport", "rot",0,i);
                     int ox=XML.getAttribute("viewport", "ox",0,i);
                     int oy=XML.getAttribute("viewport", "oy",0,i);
-                    printf("viewport %i: %ix%i\n",i,w,h);
-		    if (XML.getAttribute("viewport", "mapped",0,i)==1) {
+			int mapped=XML.getAttribute("viewport", "mapped",0,i);
+                    printf("viewport %i: %ix%i %s\n",i,w,h,mapped==1?"mapped":"unmapped");
+		    if (mapped==1) {
 			    if (!useKinect) {
 				//set up preview window and kinect classes
 				useKinect=true;
@@ -88,30 +91,12 @@ void testApp::setup(){
 				kw->addListener(kinectWin);
 				kinectWin->setup();
 				kinectWin->setParent(this);
+				    
+				NIinstance.start();
 
-				isLive			= true;
-				isTracking		= false;
-				isFiltering		= false;
-				isMasking		= true;
-				isCloud		= true;
-
-				nearThreshold = 500;
-				farThreshold  = 1000;
-
-				filterFactor = 10.0f;
-
-				recordContext.setup();
-				recordContext.setMirror(true);
-				recordDepth.setup(&recordContext);
-				recordImage.setup(&recordContext);
-				recordUser.setup(&recordContext);
-				recordUser.setSmoothing(filterFactor);	// built in openni skeleton smoothing...
-				recordUser.setUseMaskPixels(isMasking);
-				recordUser.setUseCloudPoints(isCloud);
-				recordUser.setMaxNumberOfUsers(2);
 			    }
 			    viewports.push_back(new viewport(w,h,x,y,rot,ox,oy));
-			    viewports[i]->setUG(&recordUser);
+			    viewports[i]->setUG(&NIinstance.recordUser);
 
 			    XML.pushTag("viewport",i);
                         vector<string>keys;
@@ -148,7 +133,7 @@ void testApp::setup(){
 
 	controllers=new unsigned char[NUM_CONTROLLERS];
 	memset(controllers,NUM_CONTROLLERS,0);
-	note=1;
+	note=0;
 
 	makeColours();
 
@@ -173,7 +158,7 @@ void testApp::setup(){
 
 	fadetime=0;
 

-	mode=BLOCKS;
+	mode=SOLID;
 
 	lastnoteTime=ofGetElapsedTimef();
 	decayTime=1.0f;

@@ -245,14 +230,8 @@ void testApp::makeColours() {
 }
 //--------------------------------------------------------------
 void testApp::update(){

-	//for (int i=0;i<numLayers;i++) layers[i]->update();
 
-	if (useKinect) {
-		recordContext.update();
-		recordDepth.update();
-		recordImage.update();
-		recordUser.update();
-	}
+	
 }
 void testApp::saveSettings(string filename){