# HG changeset patch
# User John Tsiombikas <nuclear@mutantstargoat.com>
# Date 1315440406 -10800
# Node ID 70309d71c899cffc2bc0187b7278a7b4f458ef2f
# Parent  e3742aafc85b53e1b0b6c52ba2058ae26e610b50
added the texture translation

diff -r e3742aafc85b -r 70309d71c899 sdr/test.v.glsl
--- a/sdr/test.v.glsl	Thu Sep 08 02:57:29 2011 +0300
+++ b/sdr/test.v.glsl	Thu Sep 08 03:06:46 2011 +0300
@@ -1,4 +1,4 @@
-uniform mat4 matrix_modelview, matrix_projection;
+uniform mat4 matrix_modelview, matrix_projection, matrix_texture;
 
 attribute vec4 attr_vertex, attr_color;
 attribute vec2 attr_texcoord;
@@ -13,5 +13,5 @@
 	gl_Position = mvp * attr_vertex;
 	vpos = (matrix_modelview * attr_vertex).xyz;
 	var_color = attr_color;
-	var_texcoord = attr_texcoord;
+	var_texcoord = (matrix_texture * vec4(attr_texcoord, 0.0, 1.0)).xy;
 }
diff -r e3742aafc85b -r 70309d71c899 src/glutmain.c
--- a/src/glutmain.c	Thu Sep 08 02:57:29 2011 +0300
+++ b/src/glutmain.c	Thu Sep 08 03:06:46 2011 +0300
@@ -12,7 +12,7 @@
 int main(int argc, char **argv)
 {
 	glutInit(&argc, argv);
-	glutInitWindowSize(640, 960);
+	glutInitWindowSize(960, 640);
 	glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
 	glutCreateWindow("test");
 
@@ -38,12 +38,27 @@
 	glutSwapBuffers();
 }
 
+extern int stereo;
+
 void keyb(unsigned char key, int x, int y)
 {
 	switch(key) {
 	case 27:
 		exit(0);
 
+	case 's':
+		stereo = !stereo;
+		break;
+
+	case '`':
+		{
+			int xsz = glutGet(GLUT_WINDOW_WIDTH);
+			int ysz = glutGet(GLUT_WINDOW_HEIGHT);
+
+			glutReshapeWindow(ysz, xsz);
+		}
+		break;
+
 	default:
 		break;
 	}
diff -r e3742aafc85b -r 70309d71c899 src/istereo.c
--- a/src/istereo.c	Thu Sep 08 02:57:29 2011 +0300
+++ b/src/istereo.c	Thu Sep 08 03:06:46 2011 +0300
@@ -23,7 +23,11 @@
 
 int view_xsz, view_ysz;
 
+#ifdef IPHONE
 int stereo = 1;
+#else
+int stereo = 0;
+#endif
 
 /* construction parameters */
 int sides = 24;
@@ -164,10 +168,9 @@
 
 	bind_texture(tex, 0);
 
-	/*glMatrixMode(GL_TEXTURE);
-	glLoadIdentity();
-	//glTranslatef(0, -t * 1.5, 0);
-	glTranslatef(0, -t * 0.5, 0);*/
+	gl_matrix_mode(GL_TEXTURE);
+	gl_load_identity();
+	gl_translatef(0, -t * 0.75, 0);
 
 	gl_begin(GL_QUADS);
 	gl_color3f(1.0, 1.0, 1.0);