Remove demos that have moved to git+ssh://git.freedesktop.org/git/mesa/demos.

The remaining programs are ones I've had difficulty finding a build
environment for to make the build system or are unit tests that should
probably live next to their code instead.  Hopefully people can bring
over the build for remaining pieces they care about.

1 files changed, 0 insertions, 1014 deletions

diff --git a/progs/samples/sphere.c b/progs/samples/sphere.c
deleted file mode 100644
index 23d4fe32c0..0000000000
--- a/progs/samples/sphere.c
+++ /dev/null
@@ -1,1014 +0,0 @@
-/*
- * Copyright (c) 1991, 1992, 1993 Silicon Graphics, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that (i) the above copyright notices and this permission notice appear in
- * all copies of the software and related documentation, and (ii) the name of
- * Silicon Graphics may not be used in any advertising or
- * publicity relating to the software without the specific, prior written
- * permission of Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF
- * ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * IN NO EVENT SHALL SILICON GRAPHICS BE LIABLE FOR
- * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-
-/* BEP: renamed "nearest" as "nnearest" to avoid math.h collision on AIX */
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
-#include <GL/glut.h>
-#include "readtex.h"
-
-
-#ifndef PI
-#define PI    3.14159265358979323846
-#endif
-
-
-GLenum doubleBuffer;
-int W = 400, H = 400;
-
-char *imageFileName = "../images/reflect.rgb";
-
-float *minFilter, *magFilter, *sWrapMode, *tWrapMode;
-float decal[] = {GL_DECAL};
-float modulate[] = {GL_MODULATE};
-float repeat[] = {GL_REPEAT};
-float clamp[] = {GL_CLAMP};
-float nnearest[] = {GL_NEAREST};
-float linear[] = {GL_LINEAR};
-float nearest_mipmap_nearest[] = {GL_NEAREST_MIPMAP_NEAREST};
-float nearest_mipmap_linear[] = {GL_NEAREST_MIPMAP_LINEAR};
-float linear_mipmap_nearest[] = {GL_LINEAR_MIPMAP_NEAREST};
-float linear_mipmap_linear[] = {GL_LINEAR_MIPMAP_LINEAR};
-GLint sphereMap[] = {GL_SPHERE_MAP};
-
-float xRotation = 0.0, yRotation = 0.0;
-float zTranslate = -3.0;
-GLenum autoRotate = GL_TRUE;
-GLboolean isLit = GL_TRUE;
-GLboolean isFogged = GL_FALSE;
-GLboolean doTexture = GL_TRUE;
-float *textureEnvironment = modulate;
-
-int cube, cage, cylinder, torus, genericObject;
-
-float c[6][4][4][3] = {
-    {
-	{
-	    {
-		1.0, 1.0, -1.0
-	    },
-	    {
-		0.0, 1.0, -1.0
-	    },
-	    {
-		0.0, 0.0, -1.0
-	    },
-	    {
-		1.0, 0.0, -1.0
-	    },
-	},
-	{
-	    {
-		0.0, 1.0, -1.0
-	    },
-	    {
-		-1.0, 1.0, -1.0
-	    },
-	    {
-		-1.0, 0.0, -1.0
-	    },
-	    {
-		0.0, 0.0, -1.0
-	    },
-	},
-	{
-	    {
-		0.0,  0.0, -1.0
-	    },
-	    {
-		-1.0, 0.0, -1.0
-	    },
-	    {
-		-1.0, -1.0, -1.0
-	    },
-	    {
-		0.0, -1.0, -1.0
-	    },
-	},
-	{
-	    {
-		1.0, 0.0, -1.0
-	    },
-	    {
-		0.0, 0.0, -1.0
-	    },
-	    {
-		0.0, -1.0, -1.0
-	    },
-	    {
-		1.0, -1.0, -1.0
-	    },
-	},
-    },
-    {
-	{
-	    {
-		1.0, 1.0, 1.0
-	    },
-	    {
-		1.0, 1.0, 0.0
-	    },
-	    {
-		1.0, 0.0, 0.0
-	    },
-	    {
-		1.0, 0.0, 1.0
-	    },
-	},
-	{
-	    {
-		1.0, 1.0, 0.0
-	    },
-	    {
-		1.0, 1.0, -1.0
-	    },
-	    {
-		1.0, 0.0, -1.0
-	    },
-	    {
-		1.0, 0.0, 0.0
-	    },
-	},
-	{
-	    {
-		1.0, 0.0, -1.0
-	    },
-	    {
-		1.0, -1.0, -1.0
-	    },
-	    {
-		1.0, -1.0, 0.0
-	    },
-	    {
-		1.0, 0.0, 0.0
-	    },
-	},
-	{
-	    {
-		1.0, 0.0, 0.0
-	    },
-	    {
-		1.0, -1.0, 0.0
-	    },
-	    {
-		1.0, -1.0, 1.0
-	    },
-	    {
-		1.0, 0.0, 1.0
-	    },
-	},
-    },
-    {
-	{
-	    {
-		-1.0, 1.0, 1.0
-	    },
-	    {
-		0.0, 1.0, 1.0
-	    },
-	    {
-		0.0, 0.0, 1.0
-	    },
-	    {
-		-1.0, 0.0, 1.0
-	    },
-	},
-	{
-	    {
-		0.0, 1.0, 1.0
-	    },
-	    {
-		1.0, 1.0, 1.0
-	    },
-	    {
-		1.0, 0.0, 1.0
-	    },
-	    {
-		0.0, 0.0, 1.0
-	    },
-	},
-	{
-	    {
-		1.0, 0.0, 1.0
-	    },
-	    {
-		1.0, -1.0, 1.0
-	    },
-	    {
-		0.0, -1.0, 1.0
-	    },
-	    {
-		0.0, 0.0, 1.0
-	    },
-	},
-	{
-	    {
-		0.0, -1.0, 1.0
-	    },
-	    {
-		-1.0, -1.0, 1.0
-	    },
-	    {
-		-1.0, 0.0, 1.0
-	    },
-	    {
-		0.0, 0.0, 1.0
-	    },
-	},
-    },
-    {
-	{
-	    {
-		-1.0, 1.0, -1.0
-	    },
-	    {
-		-1.0, 1.0, 0.0
-	    },
-	    {
-		-1.0, 0.0, 0.0
-	    },
-	    {
-		-1.0, 0.0, -1.0
-	    },
-	},
-	{
-	    {
-		-1.0, 1.0, 0.0
-	    },
-	    {
-		-1.0, 1.0, 1.0
-	    },
-	    {
-		-1.0, 0.0, 1.0
-	    },
-	    {
-		-1.0, 0.0, 0.0
-	    },
-	},
-	{
-	    {
-		-1.0, 0.0, 1.0
-	    },
-	    {
-		-1.0, -1.0, 1.0
-	    },
-	    {
-		-1.0, -1.0, 0.0
-	    },
-	    {
-		-1.0, 0.0, 0.0
-	    },
-	},
-	{
-	    {
-		-1.0, -1.0, 0.0
-	    },
-	    {
-		-1.0, -1.0, -1.0
-	    },
-	    {
-		-1.0, 0.0, -1.0
-	    },
-	    {
-		-1.0, 0.0, 0.0
-	    },
-	},
-    },
-    {
-	{
-	    {
-		-1.0, 1.0, 1.0
-	    },
-	    {
-		-1.0, 1.0, 0.0
-	    },
-	    {
-		0.0, 1.0, 0.0
-	    },
-	    {
-		0.0, 1.0, 1.0
-	    },
-	},
-	{
-	    {
-		-1.0, 1.0, 0.0
-	    },
-	    {
-		-1.0, 1.0, -1.0
-	    },
-	    {
-		0.0, 1.0, -1.0
-	    },
-	    {
-		0.0, 1.0, 0.0
-	    },
-	},
-	{
-	    {
-		0.0, 1.0, -1.0
-	    },
-	    {
-		1.0, 1.0, -1.0
-	    },
-	    {
-		1.0, 1.0, 0.0
-	    },
-	    {
-		0.0, 1.0, 0.0
-	    },
-	},
-	{
-	    {
-		1.0, 1.0, 0.0
-	    },
-	    {
-		1.0, 1.0, 1.0
-	    },
-	    {
-		0.0, 1.0, 1.0
-	    },
-	    {
-		0.0, 1.0, 0.0
-	    },
-	},
-    },
-    {
-	{
-	    {
-		-1.0, -1.0, -1.0
-	    },
-	    {
-		-1.0, -1.0, 0.0
-	    },
-	    {
-		0.0, -1.0, 0.0
-	    },
-	    {
-		0.0, -1.0, -1.0
-	    },
-	},
-	{
-	    {
-		-1.0, -1.0, 0.0
-	    },
-	    {
-		-1.0, -1.0, 1.0
-	    },
-	    {
-		0.0, -1.0, 1.0
-	    },
-	    {
-		0.0, -1.0, 0.0
-	    },
-	},
-	{
-	    {
-		0.0, -1.0, 1.0
-	    },
-	    {
-		1.0, -1.0, 1.0
-	    },
-	    {
-		1.0, -1.0, 0.0
-	    },
-	    {
-		0.0, -1.0, 0.0
-	    },
-	},
-	{
-	    {
-		1.0, -1.0, 0.0
-	    },
-	    {
-		1.0, -1.0, -1.0
-	    },
-	    {
-		0.0, -1.0, -1.0
-	    },
-	    {
-		0.0, -1.0, 0.0
-	    },
-	},
-    }
-};
-
-float n[6][3] = {
-    {
-	0.0, 0.0, -1.0
-    },
-    {
-	1.0, 0.0, 0.0
-    },
-    {
-	0.0, 0.0, 1.0
-    },
-    {
-	-1.0, 0.0, 0.0
-    },
-    {
-	0.0, 1.0, 0.0
-    },
-    {
-	0.0, -1.0, 0.0
-    }
-};
-
-GLfloat identity[16] = {
-    1, 0, 0, 0,
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1,
-};
-
-
-static void BuildCylinder(int numEdges)
-{
-    int i, top = 1.0, bottom = -1.0;
-    float x[100], y[100], angle;
-
-    for (i = 0; i <= numEdges; i++) {
-	angle = i * 2.0 * PI / numEdges;
-	x[i] = cos(angle);   /* was cosf() */
-	y[i] = sin(angle);   /* was sinf() */
-    }
-
-    glNewList(cylinder, GL_COMPILE);
-    glBegin(GL_TRIANGLE_STRIP);
-	for (i = 0; i <= numEdges; i++) {
-	    glNormal3f(x[i], y[i], 0.0);
-	    glVertex3f(x[i], y[i], bottom);
-	    glVertex3f(x[i], y[i], top);
-	}
-    glEnd();
-    glBegin(GL_TRIANGLE_FAN);
-	glNormal3f(0.0, 0.0, 1.0);
-	glVertex3f(0.0, 0.0, top);
-	for (i = 0; i <= numEdges; i++) {
-	    glVertex3f(x[i], -y[i], top);
-	}
-    glEnd();
-    glBegin(GL_TRIANGLE_FAN);
-	glNormal3f(0.0, 0.0, -1.0);
-	glVertex3f(0.0, 0.0, bottom);
-	for (i = 0; i <= numEdges; i++) {
-	    glVertex3f(x[i], y[i], bottom);
-	}
-    glEnd();
-    glEndList();
-}
-
-static void BuildTorus(float rc, int numc, float rt, int numt)
-{
-    int i, j, k;
-    double s, t;
-    double x, y, z;
-    double pi, twopi;
-
-    pi = 3.14159265358979323846;
-    twopi = 2.0 * pi;
-
-    glNewList(torus, GL_COMPILE);
-    for (i = 0; i < numc; i++) {
-	glBegin(GL_QUAD_STRIP);
-        for (j = 0; j <= numt; j++) {
-	    for (k = 0; k <= 1; k++) {
-		s = (i + k) % numc + 0.5;
-		t = j % numt;
-
-		x = cos(t*twopi/numt) * cos(s*twopi/numc);
-		y = sin(t*twopi/numt) * cos(s*twopi/numc);
-		z = sin(s*twopi/numc);
-		glNormal3f(x, y, z);
-
-		x = (rt + rc * cos(s*twopi/numc)) * cos(t*twopi/numt);
-		y = (rt + rc * cos(s*twopi/numc)) * sin(t*twopi/numt);
-		z = rc * sin(s*twopi/numc);
-		glVertex3f(x, y, z);
-	    }
-        }
-	glEnd();
-    }
-    glEndList();
-}
-
-static void BuildCage(void)
-{
-    int i;
-    float inc;
-    float right, left, top, bottom, front, back;
-
-    front  = 0.0;
-    back   = -8.0;
-
-    left   = -4.0;
-    bottom = -4.0;
-    right  = 4.0;
-    top    = 4.0;
-
-    inc = 2.0 * 4.0 * 0.1;
-
-    glNewList(cage, GL_COMPILE);
-    for (i = 0; i < 10; i++) {
-
-	/*
-	** Back
-	*/
-	glBegin(GL_LINES);
-	    glVertex3f(left+i*inc, top,    back);
-	    glVertex3f(left+i*inc, bottom, back);
-	glEnd();
-	glBegin(GL_LINES);
-	    glVertex3f(right, bottom+i*inc, back);
-	    glVertex3f(left,  bottom+i*inc, back);
-	glEnd();
-
-	/*
-	** Front
-	*/
-	glBegin(GL_LINES);
-	    glVertex3f(left+i*inc, top,    front);
-	    glVertex3f(left+i*inc, bottom, front);
-	glEnd();
-	glBegin(GL_LINES);
-	    glVertex3f(right, bottom+i*inc, front);
-	    glVertex3f(left,  bottom+i*inc, front);
-	glEnd();
-
-	/*
-	** Left
-	*/
-	glBegin(GL_LINES);
-	    glVertex3f(left, bottom+i*inc, front);
-	    glVertex3f(left, bottom+i*inc, back);
-	glEnd();
-	glBegin(GL_LINES);
-	    glVertex3f(left, top,    back+i*inc);
-	    glVertex3f(left, bottom, back+i*inc);
-	glEnd();
-
-	/*
-	** Right
-	*/
-	glBegin(GL_LINES);
-	    glVertex3f(right, top-i*inc, front);
-	    glVertex3f(right, top-i*inc, back);
-	glEnd();
-	glBegin(GL_LINES);
-	    glVertex3f(right, top,    back+i*inc);
-	    glVertex3f(right, bottom, back+i*inc);
-	glEnd();
-
-	/*
-	** Top
-	*/
-	glBegin(GL_LINES);
-	    glVertex3f(left+i*inc, top, front);
-	    glVertex3f(left+i*inc, top, back);
-	glEnd();
-	glBegin(GL_LINES);
-	    glVertex3f(right, top, back+i*inc);
-	    glVertex3f(left,  top, back+i*inc);
-	glEnd();
-
-	/*
-	** Bottom
-	*/
-	glBegin(GL_LINES);
-	    glVertex3f(right-i*inc, bottom, front);
-	    glVertex3f(right-i*inc, bottom, back);
-	glEnd();
-	glBegin(GL_LINES);
-	    glVertex3f(right, bottom, back+i*inc);
-	    glVertex3f(left,  bottom, back+i*inc);
-	glEnd();
-    }
-    glEndList();
-}
-
-static void BuildCube(void)
-{
-    int i, j;
-
-    glNewList(cube, GL_COMPILE);
-    for (i = 0; i < 6; i++) {
-	for (j = 0; j < 4; j++) {
-	    glNormal3fv(n[i]);
-	    glBegin(GL_POLYGON);
-		glVertex3fv(c[i][j][0]);
-		glVertex3fv(c[i][j][1]);
-		glVertex3fv(c[i][j][2]);
-		glVertex3fv(c[i][j][3]);
-	    glEnd();
-	}
-    }
-    glEndList();
-}
-
-static void BuildLists(void)
-{
-
-    cube = glGenLists(1);
-    BuildCube();
-
-    cage = glGenLists(2);
-    BuildCage();
-
-    cylinder = glGenLists(3);
-    BuildCylinder(60);
-
-    torus = glGenLists(4);
-    BuildTorus(0.65, 20, .85, 65);
-
-    genericObject = torus;
-}
-
-static void SetDefaultSettings(void)
-{
-
-    magFilter = nnearest;
-    minFilter = nnearest;
-    sWrapMode = repeat;
-    tWrapMode = repeat;
-    textureEnvironment = modulate;
-    autoRotate = GL_TRUE;
-}
-
-static unsigned char *AlphaPadImage(int bufSize, unsigned char *inData, int alpha)
-{
-    unsigned char *outData, *out_ptr, *in_ptr;
-    int i;
-
-    outData = (unsigned char *) malloc(bufSize * 4);
-    out_ptr = outData;
-    in_ptr = inData;
-
-    for (i = 0; i < bufSize; i++) {
-	*out_ptr++ = *in_ptr++;
-	*out_ptr++ = *in_ptr++;
-	*out_ptr++ = *in_ptr++;
-	*out_ptr++ = alpha;
-    }
-
-    free (inData);
-    return outData;
-}
-
-static void Init(void)
-{
-    float ambient[] = {0.0, 0.0, 0.0, 1.0};
-    float diffuse[] = {1.0, 1.0, 1.0, 1.0};
-    float specular[] = {1.0, 1.0, 1.0, 1.0};
-    float position[] = {0.0, 0.0,  4.0, 0.0};
-    float fog_color[] = {0.0, 0.0, 0.0, 1.0};
-    float mat_ambient[] = {0.0, 0.0, 0.0, 1.0};
-    float mat_shininess[] = {90.0};
-    float mat_specular[] = {1.0, 1.0, 1.0, 1.0};
-    float mat_diffuse[] = {0.8, 0.8, 0.8, 1.0};
-    float lmodel_ambient[] = {0.2, 0.2, 0.2, 1.0};
-    float lmodel_twoside[] = {GL_TRUE};
-    int w, h;
-    GLenum format;
-    GLubyte *image;
-
-    printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
-
-    SetDefaultSettings();
-
-    image = LoadRGBImage(imageFileName, &w, &h, &format);
-    if (!image) {
-       printf("Error: couldn't load %s\n", imageFileName);
-       exit(1);
-    }
-    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-    gluBuild2DMipmaps(GL_TEXTURE_2D, format, w, h,
-                      GL_RGB, GL_UNSIGNED_BYTE, image);
-
-    free(image);
-
-    glFogf(GL_FOG_DENSITY, 0.125);
-    glFogi(GL_FOG_MODE, GL_LINEAR);
-    glFogf(GL_FOG_START, 4.0);
-    glFogf(GL_FOG_END, 8.5);
-    glFogfv(GL_FOG_COLOR, fog_color);
-
-    glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
-    glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse);
-    glLightfv(GL_LIGHT0, GL_SPECULAR, specular);
-    glLightfv(GL_LIGHT0, GL_POSITION, position);
-    glEnable(GL_LIGHT0);
-
-    glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess);
-    glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
-    glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_diffuse);
-    glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
-
-    glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
-    glLightModelfv(GL_LIGHT_MODEL_TWO_SIDE, lmodel_twoside);
-    glShadeModel(GL_SMOOTH);
-
-
-    glClearColor(0.0, 0.0, 0.0, 0.0);
-    glEnable(GL_DEPTH_TEST);
-
-    glFrontFace(GL_CW);
-    glEnable(GL_CULL_FACE);
-    glCullFace(GL_BACK);
-
-    glTexGeniv(GL_S, GL_TEXTURE_GEN_MODE, sphereMap);
-    glTexGeniv(GL_T, GL_TEXTURE_GEN_MODE, sphereMap);
-    glEnable(GL_TEXTURE_GEN_S);
-    glEnable(GL_TEXTURE_GEN_T);
-
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, magFilter);
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minFilter);
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, sWrapMode);
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, tWrapMode);
-
-    glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, textureEnvironment);
-
-    BuildLists();
-}
-
-static void ReInit(void)
-{
-    if (genericObject == torus) {
-	glEnable(GL_DEPTH_TEST);
-    } else  {
-	glDisable(GL_DEPTH_TEST);
-    }
-	glEnable(GL_DEPTH_TEST);
-
-#if 0
-    if (isFogged) {
-	textureEnvironment = modulate;
-    }
-#endif
-
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, magFilter);
-    glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minFilter);
-    glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, textureEnvironment);
-}
-
-static void Draw(void)
-{
-    glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-
-    /* draw cage */
-    if (isFogged)
-	glEnable(GL_FOG);
-    else
-	glDisable(GL_FOG);
-    glColor3f(1, 1, 1);
-    glDisable(GL_LIGHTING);
-    glDisable(GL_TEXTURE_2D);
-    glCallList(cage);
-
-    /* draw object */
-    if (isLit)
-	glEnable(GL_LIGHTING);
-    else
-       glColor3f(1.0, 0.5, 0.2);
-    if (doTexture)
-       glEnable(GL_TEXTURE_2D);
-
-    glPushMatrix();
-        glTranslatef(0.0, 0.0, zTranslate);
-        glRotatef(xRotation, 1, 0, 0);
-        glRotatef(yRotation, 0, 1, 0);
-        glCallList(genericObject);
-    glPopMatrix();
-
-    glFlush();
-    glutSwapBuffers();
-}
-
-static void Reshape(int width, int height)
-{
-    W = width;
-    H = height;
-    ReInit();
-    glViewport( 0, 0, width, height );  /*new*/
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glFrustum(-0.2, 0.2, -0.2, 0.2, 0.15, 9.0);
-    glMatrixMode(GL_MODELVIEW);
-}
-
-static void Idle(void)
-{
-   static double t0 = -1.;
-   double t, dt;
-   t = glutGet(GLUT_ELAPSED_TIME) / 1000.;
-   if (t0 < 0.)
-      t0 = t;
-   dt = t - t0;
-   t0 = t;
-
-   xRotation += .75*60.*dt;
-   yRotation += .375*60.*dt;
-   glutPostRedisplay();
-}
-
-static void Key2(int key, int x, int y)
-{
-
-    switch (key) {
-      case GLUT_KEY_LEFT:
-	yRotation -= 0.5;
-	autoRotate = GL_FALSE;
-	ReInit();
-	break;
-      case GLUT_KEY_RIGHT:
-	yRotation += 0.5;
-	autoRotate = GL_FALSE;
-	ReInit();
-	break;
-      case GLUT_KEY_UP:
-	xRotation -= 0.5;
-	autoRotate = GL_FALSE;
-	ReInit();
-	break;
-      case GLUT_KEY_DOWN:
-	xRotation += 0.5;
-	autoRotate = GL_FALSE;
-	ReInit();
-	break;
-      default:
-	return;
-    }
-    glutPostRedisplay();
-}
-
-static void Key(unsigned char key, int x, int y)
-{
-
-    switch (key) {
-      case 27:
-         /*	free(image->data);*/
-	exit(1);
-
-      case 'a':
-	autoRotate = !autoRotate;
-        if (autoRotate)
-           glutIdleFunc(Idle);
-        else
-           glutIdleFunc(NULL);
-
-	ReInit();
-	break;
-      case 'o':
-        if (genericObject == cube) {
-          genericObject = cylinder;
-        }
-        else if (genericObject == cylinder) {
-          genericObject = torus;
-        }
-        else {
-          genericObject = cube;
-        }
-	ReInit();
-	break;
-      case 'd':
-	textureEnvironment = decal;
-	ReInit();
-	break;
-      case 'm':
-	textureEnvironment = modulate;
-	ReInit();
-	break;
-      case 'l':
-	isLit = !isLit;
-	ReInit();
-	break;
-      case 'f':
-	isFogged = !isFogged;
-	ReInit();
-	break;
-      case 't':
-        doTexture = !doTexture;
-	ReInit();
-	break;
-      case '0':
-	magFilter = nnearest;
-	ReInit();
-	break;
-      case '1':
-	magFilter = linear;
-	ReInit();
-	break;
-      case '2':
-	minFilter = nnearest;
-	ReInit();
-	break;
-      case '3':
-	minFilter = linear;
-	ReInit();
-	break;
-      case '4':
-	minFilter = nearest_mipmap_nearest;
-	ReInit();
-	break;
-      case '5':
-	minFilter = nearest_mipmap_linear;
-	ReInit();
-	break;
-      case '6':
-	minFilter = linear_mipmap_nearest;
-	ReInit();
-	break;
-      case '7':
-	minFilter = linear_mipmap_linear;
-	ReInit();
-	break;
-      default:
-	return;
-    }
-    glutPostRedisplay();
-}
-
-static GLenum Args(int argc, char **argv)
-{
-    GLint i;
-
-    doubleBuffer = GL_TRUE;
-
-    for (i = 1; i < argc; i++) {
-	if (strcmp(argv[i], "-sb") == 0) {
-	    doubleBuffer = GL_FALSE;
-	} else if (strcmp(argv[i], "-db") == 0) {
-	    doubleBuffer = GL_TRUE;
-	} else if (strcmp(argv[i], "-f") == 0) {
-	    if (i+1 >= argc || argv[i+1][0] == '-') {
-		printf("-f (No file name).\n");
-		return GL_FALSE;
-	    } else {
-		imageFileName = argv[++i];
-	    }
-	} else {
-	    printf("%s (Bad option).\n", argv[i]);
-	    return GL_FALSE;
-	}
-    }
-    return GL_TRUE;
-}
-
-int main(int argc, char **argv)
-{
-    GLenum type;
-
-    glutInit(&argc, argv);
-
-    if (Args(argc, argv) == GL_FALSE) {
-	exit(1);
-    }
-
-    if (imageFileName == 0) {
-	printf("No image file.\n");
-	exit(1);
-    }
-
-    glutInitWindowPosition(0, 0); glutInitWindowSize( W, H);
-
-    type = GLUT_RGB | GLUT_DEPTH;
-    type |= (doubleBuffer) ? GLUT_DOUBLE : GLUT_SINGLE;
-    glutInitDisplayMode(type);
-
-    if (glutCreateWindow("Texture Test") == GL_FALSE) {
-        exit(1);
-    }
-
-    Init();
-
-    glutReshapeFunc(Reshape);
-    glutKeyboardFunc(Key);
-    glutSpecialFunc(Key2);
-    glutDisplayFunc(Draw);
-    glutIdleFunc(Idle);
-
-    glutMainLoop();
-	return 0;
-}