1 files changed, 79 insertions, 17 deletions

diff --git a/src/testApp.cpp b/src/testApp.cpp
index de970da..c12ef7e 100755
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -27,6 +27,7 @@ void guiWindow::draw(){
 
 	parent->gui.draw();
 }
+
 void guiWindow::dragEvent(ofDragInfo dragInfo, ofxFenster* win){
     parent->dragEvent(dragInfo);
 }
@@ -67,9 +68,9 @@ void testApp::setup(){
 	kinectWin->setParent(this);
 	
 	// enable depth->video image calibration
-	kinect.setRegistration(true);
+	kinect.setRegistration(); //true);
     
-	kinect.init(true);
+	kinect.init();
 	//kinect.init(true); // shows infrared instead of RGB video image
 	//kinect.init(false, false); // disable video image (faster fps)
 	
@@ -161,10 +162,37 @@ void testApp::setup(){
 	gui.add(drawCloud.setup("draw pointCloud",false));
 	*/
 	
+	gui.add(logo.setup("logo",false));
+	
 	fade=255;
 	gui.add(fadectl.setup("fade level",fade,0,255,255));
-	decimate=255;
-	gui.add(decimatectl.setup("decimate",decimate,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));
+	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;
+	gui.add(xrotctl.setup("x rotate",xrot,-1.0f,1.0f,255));
+	yrot=0.0f;
+	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);
@@ -179,13 +207,31 @@ void testApp::setup(){
 	guiWin->setup();
 	guiWin->setParent(this);
 
-

+int values[2];
+glGetIntegerv(GL_POINT_SIZE_RANGE, values);
+for (int i=0; i<3; i++){
+printf("GLPOINTSIZE = %d\n", values[i]);
+}

 }
 
-void testApp::fadeSet(int amt) {
-	printf("fader set to %i\n",amt);
+void testApp::pointsModeSet(bool & set){
+	drawMode=POINTS;
+	//pointsMode=true; //segfaults!?
+	//linesMode=false;
+	//polysMode=false;
+}
+void testApp::linesModeSet(bool & set){
+	drawMode=LINES;
+	//pointsMode=true;
+	//linesMode=true;
+	//polysMode=false;
+}
+void testApp::polysModeSet(bool & set){
+	drawMode=POLYS;
+	//pointsMode=false;
+	//linesMode=false;
+	//polysMode=true;
 }
-
 
 //--------------------------------------------------------------
 void testApp::update(){

@@ -213,13 +259,9 @@ void testApp::saveSettings(string filename){
 void testApp::draw(){
 	
 	for (int i=0;i<viewports.size();i++) {
-		viewports[i]->draw(fade,decimate);
+		viewports[i]->draw(drawMode,fade,decimate,featuresize,xrot,yrot,zrot,range,logo);
 	}
 
-	
-
-	

-
 }
 
 //--------------------------------------------------------------
@@ -233,8 +275,8 @@ void testApp::keyPressed(int key, ofxFenster* win){
 }
 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);
+    	//if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->keyPressed(key);
+        //else if (activeView<viewports.size()) viewports[activeView]->keyPressed(key);
 
 
         if (key>='0' && key <='5'){
@@ -263,12 +305,32 @@ void testApp::keyPressed(int key){
 			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();
+		}
+		if(key == 'x'){
+			if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->camera.disableAllInput();
+		    else if (activeView<viewports.size()) viewports[activeView]->camera.disableAllInput();
+		}
+		if(key == 'q'){
+		    if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->xrot=0;
+		    else if (activeView<viewports.size()) viewports[activeView]->xrot=0;
+		}
+		if(key == 'w'){
+		    if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->yrot=0;
+		    else if (activeView<viewports.size()) viewports[activeView]->yrot=0;
+		}
+		if(key == 'e'){
+		    if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->zrot=0;
+		    else if (activeView<viewports.size()) viewports[activeView]->zrot=0;
+		}
 }
 
 //--------------------------------------------------------------
 void testApp::keyReleased(int key){
-	if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->keyReleased(key);
-	else if (activeView<viewports.size()) viewports[activeView]->keyReleased(key);
+	//if (activeView<0) for (int i=0;i<viewports.size();i++) viewports[i]->keyReleased(key);
+	//else if (activeView<viewports.size()) viewports[activeView]->keyReleased(key);
 }
 
 //--------------------------------------------------------------