istereo

changeset 11:698cbf1a1b97

find changesets by author, revision, files, or words in the commit message
foo
author John Tsiombikas <nuclear@mutantstargoat.com>
date Wed, 07 Sep 2011 08:25:56 +0300
parents f72f96c93972
children 9890940948f7
files sdr/test.v.glsl src/istereo.c
diffstat 2 files changed, 9 insertions(+), 8 deletions(-) [+]
line diff
     1.1 --- a/sdr/test.v.glsl	Wed Sep 07 08:22:18 2011 +0300
     1.2 +++ b/sdr/test.v.glsl	Wed Sep 07 08:25:56 2011 +0300
     1.3 @@ -1,4 +1,4 @@
     1.4 -uniform mat4 matrix_modelview, matrix_projection;
     1.5 +//uniform mat4 matrix_modelview, matrix_projection;
     1.6  
     1.7  attribute vec4 attr_vertex, attr_color;
     1.8  
     1.9 @@ -6,7 +6,7 @@
    1.10  
    1.11  void main()
    1.12  {
    1.13 -	mat4 mvp = matrix_projection * matrix_modelview;
    1.14 -	gl_Position = mvp * attr_vertex;
    1.15 +	//mat4 mvp = matrix_projection * matrix_modelview;
    1.16 +	gl_Position = /*mvp */ attr_vertex;
    1.17  	var_color = attr_color;
    1.18  }

     2.1 --- a/src/istereo.c	Wed Sep 07 08:22:18 2011 +0300
     2.2 +++ b/src/istereo.c	Wed Sep 07 08:25:56 2011 +0300
     2.3 @@ -35,9 +35,9 @@
     2.4  
     2.5  	bind_program(prog);
     2.6  
     2.7 -	gl_matrix_mode(GL_MODELVIEW);
     2.8 +	/*gl_matrix_mode(GL_MODELVIEW);
     2.9  	gl_load_identity();
    2.10 -	gl_translatef(0, 0, -8);
    2.11 +	gl_translatef(0, 0, -8);*/
    2.12  
    2.13  	dbg_draw();
    2.14  
    2.15 @@ -106,10 +106,11 @@
    2.16  
    2.17      glUseProgram(prog);
    2.18  
    2.19 -	gl_apply_xform(prog);
    2.20 +	/*gl_apply_xform(prog);*/
    2.21  
    2.22 -	vloc = 0;//glGetAttribLocation(prog, "attr_vertex");
    2.23 -	cloc = 1;//glGetAttribLocation(prog, "attr_color");
    2.24 +
    2.25 +	vloc = 0;/*glGetAttribLocation(prog, "attr_vertex");*/
    2.26 +	cloc = 1;/*glGetAttribLocation(prog, "attr_color");*/
    2.27  	assert(vloc >= 0 && cloc >= 0);
    2.28  
    2.29      glVertexAttribPointer(vloc, 2, GL_FLOAT, 0, 0, squareVertices);