X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2FFractals%2Ffractals.c;h=2c7fcce266362fcd418e6e311ee4380a70915879;hb=7ff5f34c5ec3b44e3bc6a022122fc101ed8f584f;hp=0852f1a9372c09d1404f5ad6e5881505b930bea2;hpb=a2e6f82b127ee038ef1994e65c25f24148c56a60;p=freeglut

diff --git a/progs/demos/Fractals/fractals.c b/progs/demos/Fractals/fractals.c
index 0852f1a..2c7fcce 100644
--- a/progs/demos/Fractals/fractals.c
+++ b/progs/demos/Fractals/fractals.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#define FGH_PI       3.14159265358979323846
 
 typedef struct
 {
@@ -33,12 +34,15 @@ typedef struct
 AffineTrans ;
 
 /* Number of levels to draw the fractal */
-static int num_levels = 0 ;
+static int num_levels = 4 ;
 
 /* The definition of the fractal */
 static int num_trans ;
 static AffineTrans *affine ;
 
+/* Flag telling us to keep executing the main loop */
+static int continue_in_main_loop = 1;
+
 /* the window title */
 char window_title [ 80 ] ;
 
@@ -125,7 +129,7 @@ Key(unsigned char key, int x, int y)
   
   switch (key) {
   case 27:  /* Escape key */
-    glutLeaveMainLoop () ;
+    continue_in_main_loop = 0 ;
     break;
 
   case '+' :
@@ -264,13 +268,20 @@ void readConfigFile ( char *fnme )
   else  /* No data file, set a default */
   {
     printf ( "ERROR opening file <%s>\n", fnme ) ;
-    strcpy ( window_title, "Cantor Dust" ) ;
-    num_trans = 2 ;
+    strcpy ( window_title, "Koch Snowflake" ) ;
+    num_trans = 4 ;
     affine = (AffineTrans *)malloc ( num_trans * sizeof(AffineTrans) ) ;
-    affine[0].a00 = 0.25 ;  affine[0].a01 = 0.00 ;  affine[0].a10 = 0.00 ;  affine[0].a11 = 0.25 ;
+    affine[0].a00 = 1/3. ;  affine[0].a01 = 0.00 ;  affine[0].a10 = 0.00 ;  affine[0].a11 = 1/3. ;
     affine[0].b0 = 0.0 ;    affine[0].b1 = 0.0 ;
-    affine[1].a00 = 0.25 ;  affine[1].a01 = 0.00 ;  affine[1].a10 = 0.00 ;  affine[1].a11 = 0.25 ;
-    affine[1].b0 = 0.5 ;    affine[1].b1 = 0.0 ;
+
+    affine[1].a00 = 1/6. ;  affine[1].a01 = -1/3.*sin(FGH_PI/3.) ;   affine[1].a10 = 1/3.*sin(FGH_PI/3.) ;   affine[1].a11 = 1/6. ;
+    affine[1].b0 = 1/3. ;   affine[1].b1 = 0.0 ;
+
+    affine[2].a00 = 1/6. ;  affine[2].a01 = -1/3.*sin(-FGH_PI/3.) ;  affine[2].a10 = 1/3.*sin(-FGH_PI/3.) ;  affine[2].a11 = 1/6. ;
+    affine[2].b0 = 0.5 ;    affine[2].b1 = sqrt(3)/6. ;
+
+    affine[3].a00 = 1/3. ;  affine[3].a01 = 0.00 ;  affine[3].a10 = 0.00 ;  affine[3].a11 = 1/3. ;
+    affine[3].b0 = 2/3. ;   affine[3].b1 = 0.0 ;
   }
 
   for ( i = 0; i < num_trans; i++ )
@@ -300,8 +311,6 @@ void readConfigFile ( char *fnme )
 int 
 main(int argc, char *argv[])
 {
-  int fractal_window ;
-
   glutInitWindowSize(500, 250);
   glutInitWindowPosition ( 140, 140 );
   glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE );
@@ -312,7 +321,7 @@ main(int argc, char *argv[])
   else
     readConfigFile ( "fractals.dat" ) ;
 
-  fractal_window = glutCreateWindow( window_title );
+  glutCreateWindow( window_title );
 
   glClearColor(1.0, 1.0, 1.0, 1.0);
 
@@ -321,7 +330,11 @@ main(int argc, char *argv[])
   glutSpecialFunc(Special);
   glutDisplayFunc(Display);
 
-  glutMainLoop();
+#ifdef WIN32
+#endif
+
+  while ( continue_in_main_loop )
+    glutMainLoopEvent();
 
   printf ( "Back from the 'freeglut' main loop\n" ) ;