1 files changed, 49 insertions, 32 deletions

diff --git a/src/testApp.cpp b/src/testApp.cpp
index c12ef7e..4fbba8a 100755
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -10,7 +10,7 @@ void previewWindow::setBuffer(ofFbo *buffer){
 void previewWindow::draw(){
 
 	rb->draw(0,0,ofGetWidth(),ofGetHeight()); //why crash?
-	
+
 	ofSetColor(255,255,255);
 	ofDrawBitmapString(ofToString(ofGetFrameRate(), 2),20,20);
 
@@ -66,19 +66,19 @@ void testApp::setup(){
 	kw->addListener(kinectWin);
 	kinectWin->setup();
 	kinectWin->setParent(this);
-	
+
 	// enable depth->video image calibration
-	kinect.setRegistration(); //true);
-    
-	kinect.init();
+	kinect.setRegistration(true); //true);
+
+	kinect.init(true);
 	//kinect.init(true); // shows infrared instead of RGB video image
 	//kinect.init(false, false); // disable video image (faster fps)
-	
+
 	kinect.open();		// opens first available kinect
 	//kinect.open(1);	// open a kinect by id, starting with 0 (sorted by serial # lexicographically))
 	//kinect.open("A00362A08602047A");	// open a kinect using it's unique serial #
-	
-	

+
+

 	if( !XML.loadFile("settings.xml") ){

 		printf("unable to load settings.xml check data/ folder\n");

 	}else{

@@ -120,7 +120,7 @@ void testApp::setup(){
 

 	}
 
-	
+
 
 	activeView=-1;
 

@@ -161,26 +161,29 @@ void testApp::setup(){
 	gui.add(resetFBscale.setup("reset FB scale"));
 	gui.add(drawCloud.setup("draw pointCloud",false));
 	*/
-	
+
 	gui.add(logo.setup("logo",false));
-	
+	gui.add(add.setup("add",false));
+	gui.add(usecolour.setup("add",false));
+
+
 	fade=255;
 	gui.add(fadectl.setup("fade level",fade,0,255,255));
 	decimate=1.0f;
 	gui.add(decimatectl.setup("decimate",decimate,0,1.0f,255));
-	
+
 	featuresize=1.0f;
 	gui.add(featurectl.setup("featuresize",featuresize,0,16.0f,255));
 
 	gui.add(pointsMode.setup("points",true));
 	gui.add(linesMode.setup("lines",false));
-	gui.add(polysMode.setup("lines",false));
+	gui.add(polysMode.setup("polys",false));
 	drawMode=POINTS;
-	
+
 	pointsMode.addListener(this,&testApp::pointsModeSet);
 	linesMode.addListener(this,&testApp::linesModeSet);
 	polysMode.addListener(this,&testApp::polysModeSet);
-	
+
 	range=5000;
 	gui.add(rangectl.setup("max range",range,0,5000,255));
 	xrot=0.0f;
@@ -189,13 +192,14 @@ void testApp::setup(){
 	gui.add(yrotctl.setup("y rotate",yrot,-1.0f,1.0f,255));
 	zrot=0.0f;
 	gui.add(zrotctl.setup("z rotate",zrot,-1.0f,1.0f,255));
-	
-	gui.add(resetDrawscale.setup("points"));
-	gui.add(resetFBscale.setup("points"));
-	gui.add(resetSlide.setup("points"));
 
-	//resetDrawscale.addListener(this,&testApp::resetDrawscalePressed);
-	//resetFBscale.addListener(this,&testApp::resetFBscalePressed);
+	gui.add(resetDrawscale.setup("resetdraw"));
+	gui.add(resetFBscale.setup("resetFB"));
+	gui.add(resetSlide.setup("resetSlide"));
+
+	resetDrawscale.addListener(this,&testApp::resetDrawscalePressed);
+	resetFBscale.addListener(this,&testApp::resetFBscalePressed);
+    resetSlide.addListener(this,&testApp::resetSlidePressed);
 
 	//gui window stuff
 	ofxFenster* win2=ofxFensterManager::get()->createFenster(0, 0,  200, 400, OF_WINDOW);
@@ -214,6 +218,19 @@ printf("GLPOINTSIZE = %d\n", values[i]);
 }

 }
 
+void testApp::resetDrawscalePressed(bool & set) {
+    for (int i=0;i<viewports.size();i++) viewports[i]->scale=1.0f;
+}
+void testApp::resetFBscalePressed(bool & set) {
+    for (int i=0;i<viewports.size();i++) viewports[i]->fscale=1.0f;
+}
+void testApp::resetSlidePressed(bool & set) {
+    for (int i=0;i<viewports.size();i++) {
+        viewports[i]->xshift=0;
+        viewports[i]->yshift=0;
+    }
+}
+
 void testApp::pointsModeSet(bool & set){
 	drawMode=POINTS;
 	//pointsMode=true; //segfaults!?
@@ -257,9 +274,9 @@ void testApp::saveSettings(string filename){
 }
 //--------------------------------------------------------------
 void testApp::draw(){
-	
+
 	for (int i=0;i<viewports.size();i++) {
-		viewports[i]->draw(drawMode,fade,decimate,featuresize,xrot,yrot,zrot,range,logo);
+		viewports[i]->draw(drawMode,fade,decimate,featuresize,xrot,yrot,zrot,range,add,logo,usecolour);
 	}
 
 }
@@ -274,7 +291,7 @@ void testApp::keyPressed(int key, ofxFenster* win){
 	else keyPressed(key);
 }
 void testApp::keyPressed(int key){
-	
+
     	//if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->keyPressed(key);
         //else if (activeView<viewports.size()) viewports[activeView]->keyPressed(key);
 
@@ -304,7 +321,7 @@ void testApp::keyPressed(int key){
 		if(key == 'f'){

 			toggleFPS();

 		}

-		
+
 		if(key == 'z'){
 		    if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->camera.enableAllInput();
 		    else if (activeView<viewports.size()) viewports[activeView]->camera.enableAllInput();
@@ -380,12 +397,12 @@ void testApp::windowEvent(ofResizeEventArgs &args){
 }
 
 void testApp::mousePressedEvent(ofMouseEventArgs &args) {
-	
+
 	int xs=0;
 	int ys=0;
 	float sc=1.0f;
 	float fs=1.0f;
-	
+
 	switch (args.button) {
 		case 0:
 			xs=args.x-(win->getWidth()/2);
@@ -398,9 +415,9 @@ void testApp::mousePressedEvent(ofMouseEventArgs &args) {
 			fs=(pow(pow(args.x-(win->getWidth()/2),2)+pow(args.y-(win->getHeight()/2),2),0.5)/(win->getWidth()))+0.5;
 			break;
 	}
-	
-	
-	
+
+
+
 	for (int i=0;i<viewports.size();i++) viewports[i]->mousePressedEvent(xs,ys,sc,fs);
 }
 
@@ -440,14 +457,14 @@ void testApp::newMidiMessage(ofxMidiEventArgs& eventArgs){
                 //    if (layers[i]->note==eventArgs.byteOne) layers[i]->setActive(noteOn);

                 //}
                 if (DEBUG) printf("note: %i %i\n",eventArgs.byteOne,eventArgs.byteTwo);
-                

+

                 break;

             case 176: //control change channel 0

                 //for (int i=0;i<numLayers;i++){

                 //    if (layers[i]->mix==eventArgs.byteOne) layers[i]->setMixAmt(((float)eventArgs.byteTwo)/127.0f);

                 //}
                 if (DEBUG)  printf("cc: %i %i\n",eventArgs.byteOne,eventArgs.byteTwo);
-                

+

         }

     }

 }