X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Ftangram_shapes.c;h=283c2ba40dda58b98a856d625d0c5ae9937bd314;hp=25dec5b21f5f3defd8b3ff8c09485988f0185adb;hb=0d6b320def9180cf907ceaed56b23a972a11b757;hpb=3f438031d610c7e15fd33876a879b97e290e05fb diff --git a/hacks/glx/tangram_shapes.c b/hacks/glx/tangram_shapes.c index 25dec5b2..283c2ba4 100644 --- a/hacks/glx/tangram_shapes.c +++ b/hacks/glx/tangram_shapes.c @@ -32,33 +32,46 @@ static void tri_45_90(int wire) glNormal3f(0, 1, 0); glVertex3fv(vertices[0]); + glNormal3f(0, 1, 0); glVertex3fv(vertices[2]); + glNormal3f(0, 1, 0); glVertex3fv(vertices[1]); glNormal3f(0, -1, 0); glVertex3fv(vertices[3]); + glNormal3f(0, -1, 0); glVertex3fv(vertices[4]); + glNormal3f(0, -1, 0); glVertex3fv(vertices[5]); glEnd(); glBegin((wire) ? GL_LINE_LOOP : GL_QUADS); glNormal3f(1, 0, 1); glVertex3fv(vertices[2]); + glNormal3f(1, 0, 1); glVertex3fv(vertices[5]); + glNormal3f(1, 0, 1); glVertex3fv(vertices[4]); + glNormal3f(1, 0, 1); glVertex3fv(vertices[1]); glNormal3f(-1, 0, 0); glVertex3fv(vertices[0]); + glNormal3f(-1, 0, 0); glVertex3fv(vertices[1]); + glNormal3f(-1, 0, 0); glVertex3fv(vertices[4]); + glNormal3f(-1, 0, 0); glVertex3fv(vertices[3]); glNormal3f(0, 0, -1); - glVertex3fv(vertices[2]); - glVertex3fv(vertices[5]); - glVertex3fv(vertices[3]); glVertex3fv(vertices[0]); + glNormal3f(0, 0, -1); + glVertex3fv(vertices[3]); + glNormal3f(0, 0, -1); + glVertex3fv(vertices[5]); + glNormal3f(0, 0, -1); + glVertex3fv(vertices[2]); glEnd(); } @@ -66,11 +79,12 @@ void unit_cube(int wire) { glBegin((wire) ? GL_LINE_LOOP : GL_QUADS); - glNormal3f(0.0f, -1.0f, 0.0f); - glVertex3f(0.0f, -alpha, 0.0f); - glVertex3f(1.0f, -alpha, 0.0f); - glVertex3f(1.0f, -alpha, 1.0f); - glVertex3f(0.0f, -alpha, 1.0f); + + glNormal3f(0.0f, 1.0f, 0.0f); + glVertex3f(0.0f, alpha, 0.0f); + glVertex3f(0.0f, alpha, 1.0f); + glVertex3f(1.0f, alpha, 1.0f); + glVertex3f(1.0f, alpha, 0.0f); glNormal3f(0.0f, 0.0f, 1.0f); glVertex3f(0.0f, -alpha, 1.0f); @@ -96,11 +110,12 @@ void unit_cube(int wire) glVertex3f(0.0f, alpha, 1.0f); glVertex3f(0.0f, alpha, 0.0f); - glNormal3f(0.0f, 1.0f, 0.0f); - glVertex3f(0.0f, alpha, 0.0f); - glVertex3f(0.0f, alpha, 1.0f); - glVertex3f(1.0f, alpha, 1.0f); - glVertex3f(1.0f, alpha, 0.0f); + glNormal3f(0.0f, -1.0f, 0.0f); + glVertex3f(0.0f, -alpha, 0.0f); + glVertex3f(1.0f, -alpha, 0.0f); + glVertex3f(1.0f, -alpha, 1.0f); + glVertex3f(0.0f, -alpha, 1.0f); + glEnd(); }