X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fshapes%2Fshapes.c;h=ebac795fcebeb05e2f13b830834d623b393b800b;hb=9721970dce1ebac6b6bb3c7b0b84fdada7216270;hp=520a209d0a495db9141e30e0c0b0b2ecc1b47f0d;hpb=ff7ec6ed2620d67541b5a29dab54c5459e5183c3;p=freeglut diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c index 520a209..ebac795 100644 --- a/progs/demos/shapes/shapes.c +++ b/progs/demos/shapes/shapes.c @@ -690,6 +690,7 @@ static void display(void) gl_UseProgram (program); glutSetVertexAttribCoord3(attribute_fg_coord); glutSetVertexAttribNormal(attribute_fg_normal); + /* There is also a glutSetVertexAttribTexCoord2, which is used only when drawing the teapot, teacup or teaspoon */ gl_matrix_mode(GL_PROJECTION); gl_load_identity(); @@ -851,10 +852,12 @@ static void special (int key, int x, int y) /* Cuboctahedron can't be shown when in shader mode, skip it */ if (useShader && NUMBEROF (table)-1 == ( unsigned )function_index) + { if (key==GLUT_KEY_PAGE_UP) function_index = 0; else function_index -= 1; + } }