X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fshapes%2Fshapes.c;h=c6527fc8f30d62bc540b0c66144b0b7d4d08ac29;hb=8c9773ab36947fcaad5826eb9962d203d914c86d;hp=e984d298574f7aba395bdb531620e1b4a44bbbb7;hpb=8a58cc57b97a1aa188018d987671ed565031874d;p=freeglut

diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c
index e984d29..c6527fc 100644
--- a/progs/demos/shapes/shapes.c
+++ b/progs/demos/shapes/shapes.c
@@ -357,11 +357,11 @@ void initShader(void)
 
     gl_UseProgram (program);
 
-    attribute_fg_coord      = getAttribOrUniformLocation("fg_coord"         , program, TRUE);
-    attribute_fg_normal     = getAttribOrUniformLocation("fg_normal"        , program, TRUE);
-    uniform_m               = getAttribOrUniformLocation("m"                , program, FALSE);
-    uniform_p               = getAttribOrUniformLocation("p"                , program, FALSE);
-    uniform_m_3x3_inv_transp= getAttribOrUniformLocation("m_3x3_inv_transp" , program, FALSE);
+    attribute_fg_coord      = getAttribOrUniformLocation("fg_coord"         , program, GL_TRUE);
+    attribute_fg_normal     = getAttribOrUniformLocation("fg_normal"        , program, GL_TRUE);
+    uniform_m               = getAttribOrUniformLocation("m"                , program, GL_FALSE);
+    uniform_p               = getAttribOrUniformLocation("p"                , program, GL_FALSE);
+    uniform_m_3x3_inv_transp= getAttribOrUniformLocation("m_3x3_inv_transp" , program, GL_FALSE);
 
     gl_UseProgram (0);
 
@@ -606,7 +606,7 @@ static void display(void)
         gl_load_identity();
 
         gl_push_matrix();
-            /* Not in reverse order like normal OpenGL, matrices are multiplied in in order specified in our util library */
+            /* Not in reverse order like normal OpenGL, our util library multiplies the matrices in the order they are specified in */
             gl_rotatef((float)a,0,0,1);
             gl_rotatef((float)b,1,0,0);
             gl_translatef(0,1.2f,-6);