don't really need to switch off color any more. flipped the z axis al…

…so so everything makes sense
kylemcdonald · May 4, 2011 · 12fdc42 · 12fdc42
1 parent 8e2ab81
commit 12fdc42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/CombineImages/src/testApp.cpp b/CombineImages/src/testApp.cpp
@@ -37,7 +37,6 @@ void testApp::setup() {
 
 	curImage = 0;
 	reloadImage = true;
-	useColor = true;
 }
 
 const float
@@ -69,10 +68,10 @@ void testApp::updatePointCloud() {
 	int i = 0;
 
 	/*
-	principalPoint.x += ofMap(mouseX, 0, ofGetWidth(), -4, 4);
-	principalPoint.y += ofMap(mouseY, 0, ofGetHeight(), -4, 4);
-	cout << "fudge: " << ofMap(mouseX, 0, ofGetWidth(), -4, 4) << "x" << ofMap(mouseY, 0, ofGetHeight(), -4, 4) << endl;
-	*/
+	 principalPoint.x += ofMap(mouseX, 0, ofGetWidth(), -4, 4);
+	 principalPoint.y += ofMap(mouseY, 0, ofGetHeight(), -4, 4);
+	 cout << "fudge: " << ofMap(mouseX, 0, ofGetWidth(), -4, 4) << "x" << ofMap(mouseY, 0, ofGetHeight(), -4, 4) << endl;
+	 */
 
 	for(int y = 0; y < h; y++) {
 		for(int j = 0; j < w; j++) {
@@ -144,23 +143,19 @@ void testApp::draw() {
 	glEnable(GL_DEPTH_TEST);
 
 	glPushMatrix();
-	glScaled(1, -1, 1);
+	glScaled(1, -1, -1);
 
 	ofDrawAxis(100);
 
 	ofSetColor(255);
 	curColor.draw(0, 0, curColor.getWidth(), curColor.getHeight());
 
 	glEnableClientState(GL_VERTEX_ARRAY);
-	if(useColor) {
-		glEnableClientState(GL_COLOR_ARRAY);
-		glColorPointer(3, GL_FLOAT, sizeof(Point3f), &(pointCloudColors[0].x));
-	}
+	glEnableClientState(GL_COLOR_ARRAY);
+	glColorPointer(3, GL_FLOAT, sizeof(Point3f), &(pointCloudColors[0].x));
 	glVertexPointer(3, GL_FLOAT, sizeof(Point3f), &(pointCloud[0].x));
 	glDrawArrays(GL_POINTS, 0, pointCloud.size());
-	if(useColor) {
-		glDisableClientState(GL_COLOR_ARRAY);
-	}
+	glDisableClientState(GL_COLOR_ARRAY);
 	glDisableClientState(GL_VERTEX_ARRAY);
 
 	glDisable(GL_DEPTH_TEST);
@@ -180,7 +175,7 @@ void testApp::draw() {
 	}
 
 	curCalibration->draw3d(curImage);
-		
+
 	glPopMatrix();
 
 	cam.end();
@@ -195,8 +190,4 @@ void testApp::keyPressed(int key) {
 
 	curImage = ofClamp(curImage, 0, kinectList.size() - 1);
 	reloadImage = true;
-
-	if(key == 'v') {
-		useColor = !useColor;
-	}
 }
diff --git a/CombineImages/src/testApp.h b/CombineImages/src/testApp.h
@@ -45,5 +45,4 @@ class testApp : public ofBaseApp {
 
 	int curImage;
 	bool reloadImage;
-	bool useColor;
 };