get rid of unused span->start field

[mesa.git] / progs / samples / wave.c

diff --git a/progs/samples/wave.c b/progs/samples/wave.c
index 187c590000d28a7ff14f664a07916b7a0a6cedb0..d3c4687459ebe32112355315becd10d8be76b33a 100644 (file)
--- a/progs/samples/wave.c
+++ b/progs/samples/wave.c
@@ -87,9 +87,26 @@ GLubyte contourTexture2[] = {
     255, 127, 127, 127,
 };
 
+#if !defined(GLUTCALLBACK)
+#define GLUTCALLBACK
+#endif
+
+
 void GLUTCALLBACK glut_post_redisplay_p(void)
 {
-      glutPostRedisplay();
+    static double t0 = -1.;
+    double t, dt;
+    t = glutGet(GLUT_ELAPSED_TIME) / 1000.;
+    if (t0 < 0.)
+       t0 = t;
+    dt = t - t0;
+
+    if (dt < 1./30.)
+        return;
+
+    t0 = t;
+
+    glutPostRedisplay();
 }
 
 static void Animate(void)
@@ -128,7 +145,7 @@ static void Animate(void)
                    glColor3fv(facet->color);
                } else {
                    thisColor = facet->color;
-                   glMaterialfv(GL_FRONT_AND_BACK, GL_COLOR_INDEXES, 
+                   glMaterialfv(GL_FRONT_AND_BACK, GL_COLOR_INDEXES,
                                 facet->color);
                }
            } else {
@@ -182,12 +199,12 @@ static void Animate(void)
     }
 }
 
-static void SetColorMap(void) 
+static void SetColorMap(void)
 {
     static float green[3] = {0.2, 1.0, 0.2};
     static float red[3] = {1.0, 0.2, 0.2};
-    float *color, percent;
-    GLint *indexes, entries, i, j;
+    float *color = 0, percent;
+    GLint *indexes = 0, entries, i, j;
 
     entries = glutGet(GLUT_WINDOW_COLORMAP_SIZE);
 
@@ -360,7 +377,7 @@ static void InitMaterials(void)
     glLightModelfv(GL_LIGHT_MODEL_TWO_SIDE, lmodel_twoside);
     glEnable(GL_LIGHTING);
     glEnable(GL_LIGHT0);
-    
+
     glMaterialfv(GL_FRONT, GL_SHININESS, front_mat_shininess);
     glMaterialfv(GL_FRONT, GL_SPECULAR, front_mat_specular);
     glMaterialfv(GL_FRONT, GL_DIFFUSE, front_mat_diffuse);
@@ -394,7 +411,7 @@ static void Init(void)
     glClearColor(0.0, 0.0, 0.0, 0.0);
 
     glShadeModel(GL_FLAT);
-    
+
     glFrontFace(GL_CW);
 
     glEnable(GL_DEPTH_TEST);
@@ -515,7 +532,7 @@ static GLenum Args(int argc, char **argv)
     GLint i;
 
     rgb = GL_TRUE;
-    doubleBuffer = GL_FALSE;
+    doubleBuffer = GL_TRUE;
     frames = 10;
     widthX = 10;
     widthY = 10;