X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2FFractals_random%2Ffractals_random.c;h=8992d1e553b8b320454c3f58ec9799b4ef3b943f;hb=017c50018bb3c3f36179d7b97ab0e6f7545fc78e;hp=a935adcd77f74410c51e328054ee720920c304b8;hpb=2c01bd6cfd78f2cbb562144b39358b55d5e5c07d;p=freeglut

diff --git a/progs/demos/Fractals_random/fractals_random.c b/progs/demos/Fractals_random/fractals_random.c
index a935adc..8992d1e 100644
--- a/progs/demos/Fractals_random/fractals_random.c
+++ b/progs/demos/Fractals_random/fractals_random.c
@@ -50,6 +50,9 @@ float scale_factor = 1.0 ;
 /* The current point */
 float current_x = 0.0, current_y = 0.0 ;
 
+/* Signals when a glClear is needed */
+static GLboolean needClear = GL_TRUE;
+
 static void draw_level ( int num, double m00, double m01, double m10, double m11, double n0, double n1 )
 {
   /* Draw a fractal transformed by "M", "N" as passed in */
@@ -57,7 +60,7 @@ static void draw_level ( int num, double m00, double m01, double m10, double m11
 
   for ( i = 0; i < 10; i++ )
   {
-    int random = rand () * num_trans / RAND_MAX ;
+    int random = (rand() >> 10) % num_trans;
     float new_x = affine[random].a00 * current_x + affine[random].a01 * current_y + affine[random].b0 ;
     float new_y = affine[random].a10 * current_x + affine[random].a11 * current_y + affine[random].b1 ;
 
@@ -70,6 +73,11 @@ static void draw_level ( int num, double m00, double m01, double m10, double m11
 static void 
 Display(void)
 {
+  if (needClear) {
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    needClear = GL_FALSE;
+  }
+
   /* the curve */
   glPushMatrix();
   glScalef(2.5, 2.5, 2.5);
@@ -80,6 +88,8 @@ Display(void)
   glEnd () ;
 
   glPopMatrix();
+
+  glFlush();
   glutPostRedisplay();  /* Needed so that this function will be called again */
 }
 
@@ -97,6 +107,7 @@ Reshape(int width, int height)
   xwin = -1.0 ;
   ywin =  0.0 ;
   glTranslatef(xwin, ywin, -5.0);
+  needClear = GL_TRUE;
 }
 
 static void 
@@ -117,7 +128,7 @@ Key(unsigned char key, int x, int y)
     break ;
   }
 
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  needClear = GL_TRUE;
 
   glutPostRedisplay();
 }
@@ -167,7 +178,7 @@ Special(int key, int x, int y)
     break ;
   }
 
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  needClear = GL_TRUE;
 
   glutPostRedisplay();
 }
@@ -186,7 +197,12 @@ void readConfigFile ( char *fnme )
 
   /* Read the window title */
   fgets ( inputline, 256, fptr ) ;
-  sscanf ( inputline, "%s", window_title ) ;
+  /* We assume here that this line will not exceed 79 characters plus a 
+     newline (window_title is 80 characters long). That'll cause a buffer 
+     overflow. For a simple program like  this, though, we're letting it 
+     slide! 
+  */
+  sscanf ( inputline, "%[a-zA-Z0-9!@#$%^&*()+=/\\_-\" ]", window_title ) ;
 
   /* Read a comment line */
   fgets ( inputline, 256, fptr ) ;
@@ -249,8 +265,6 @@ main(int argc, char *argv[])
 
   glClearColor(1.0, 1.0, 1.0, 1.0);
 
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
   glutReshapeFunc(Reshape);
   glutKeyboardFunc(Key);
   glutSpecialFunc(Special);