# HG changeset patch
# User Eleni Maria Stea <eleni@mutantstargoat.com>
# Date 1383603865 -7200
# Node ID 65fd6d7c42b1c7c62f55d3e0042522fbe53e7167
# Parent  226073258785c21411873c8a5f1f2a8964f75aad
foo: show/hide rgb video and depth frames

diff -r 226073258785 -r 65fd6d7c42b1 src/frame.cc
--- a/src/frame.cc	Mon Nov 04 23:39:22 2013 +0200
+++ b/src/frame.cc	Tue Nov 05 00:24:25 2013 +0200
@@ -1,5 +1,4 @@
 #include <GL/gl.h>
-#include <assert.h>
 #include <cxcore.h>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/photo/photo.hpp>
@@ -55,8 +54,10 @@
 	if(has_video) {
 		glBindTexture(GL_TEXTURE_2D, video_tex);
 		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, KINECT_VIDEO_WIDTH, KINECT_VIDEO_HEIGHT, GL_BGR, GL_UNSIGNED_BYTE, video_buf.data);
-		//glBindTexture(GL_TEXTURE_2D, depth_tex);
-		//subi;
+	}
+	if(has_depth) {
+		glBindTexture(GL_TEXTURE_2D, depth_tex);
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, KINECT_DEPTH_WIDTH, KINECT_DEPTH_HEIGHT, GL_LUMINANCE, GL_UNSIGNED_BYTE, depth_buf.data);
 	}
 	if(has_video && has_depth) {//pot
 	}
diff -r 226073258785 -r 65fd6d7c42b1 src/kinect.cc
--- a/src/kinect.cc	Mon Nov 04 23:39:22 2013 +0200
+++ b/src/kinect.cc	Tue Nov 05 00:24:25 2013 +0200
@@ -42,12 +42,12 @@
 		return false;
 	}
 
-	if(freenect_set_tilt_degs(*kin_dev, kin_params->angle) < 0) {
+/*	if(freenect_set_tilt_degs(*kin_dev, kin_params->angle) < 0) {
 		stop_kinect(*kin_ctx, *kin_dev);
 		fprintf(stderr, "Failed to set kinect angle\n");
 		return false;
 	}
-
+*/
 	if(freenect_set_led(*kin_dev, kin_params->led_color) < 0) {
 		fprintf(stderr, "Failed to set kinect LED\n");
 		stop_kinect(*kin_ctx, *kin_dev);
diff -r 226073258785 -r 65fd6d7c42b1 src/main.cc
--- a/src/main.cc	Mon Nov 04 23:39:22 2013 +0200
+++ b/src/main.cc	Tue Nov 05 00:24:25 2013 +0200
@@ -1,7 +1,6 @@
 #include <GL/glew.h>
 #include <GL/glut.h>
 
-#include <assert.h>
 #include <stdio.h>
 
 #include "kinect.h"
@@ -13,6 +12,8 @@
 KinectParams kin_params;
 Frame *frame;
 
+static bool show;
+
 static void cleanup();
 
 static void display();
@@ -67,19 +68,18 @@
 		fprintf(stderr, "Failed to process events.\n");
 		exit(0);
 	}
-	assert(glGetError() == GL_NO_ERROR);
 	frame->process();
 
 	glEnable(GL_TEXTURE_2D);
-	glBindTexture(GL_TEXTURE_2D, frame->video_tex);
-	assert(glGetError() == GL_NO_ERROR);
-	draw_tess_quad(-1, -1, 0.6, 0.6, 1, 1);
-//	glBindTexture(GL_TEXTURE_2D, frame->depth_tex);
-//	draw_tes..
+	if(show) {
+		glBindTexture(GL_TEXTURE_2D, frame->video_tex);
+		draw_tess_quad(-1, -1, 1, 2, 1, 1);
+		glBindTexture(GL_TEXTURE_2D, frame->depth_tex);
+		draw_tess_quad(0, -1, 1, 2, 1, 1);
+	}
 	glDisable(GL_TEXTURE_2D);
 
 	glutSwapBuffers();
-	assert(glGetError() == GL_NO_ERROR);
 }
 
 static void reshape(int w, int h)
@@ -93,6 +93,12 @@
 static void keyb(unsigned char key, int x, int y)
 {
 	switch(key) {
+	case 's':
+		if(show)
+			show = false;
+		else
+			show = true;
+		break;
 	case 27:
 		exit(0);
 	default: