X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=b6caf7047a02a567776389c4a21b2d9cb0f7a68d;hp=8a007f962b852cb631dab611f12c82f1008fa142;hb=9df67797af48c1d4da43225909a51d9ad277037e;hpb=7a107daa482e61c8145b5d1049e2dd2f3b499155

diff --git a/scene.c b/scene.c
index 8a007f9..b6caf70 100644
--- a/scene.c
+++ b/scene.c
@@ -558,10 +558,41 @@ void idle() {
   angle = (int)(angle + 10) % 360;
     //angle2 = (int)(angle2 + 10) % 360;
     printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
-    sleep(25);
+    sleep(0.5);
     glutPostRedisplay();
 }
 
+
+int drawFloorRecurse = 4;
+
+void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
+
+  printf("%d, %d, %d, %d\n", x1, y2, x2, y2);
+
+  if ( drawFloorRecurse != recurseLevel ) {
+    float xm = (x1 + x2) / 2.0;
+    float ym = (y1 + y2) / 2.0;
+    int rnew = recurseLevel + 1;
+    printf("Recursing to level %d\n", rnew);
+
+    // Split into four sub-quads
+    drawSquare(rnew, x1, y1, xm, ym);
+    drawSquare(rnew, x1, ym, xm, y2);
+    drawSquare(rnew, xm, ym, x2, y2);
+    drawSquare(rnew, xm, y1, x2, ym);
+
+  } else {
+    printf("Drawing (%.10f, %.10f) -> (%.10f, %.10f)\n", x1, y2, x2, y2);
+    glBegin(GL_QUADS);
+      glVertex3f(x1, 0.0, y1);
+      glVertex3f(x1, 0.0, y2);
+      glVertex3f(x2, 0.0, y2);
+      glVertex3f(x2, 0.0, y1);
+    glEnd();
+  }
+
+}
+
 /**
  * Draw a floor.
  */
@@ -592,39 +623,10 @@ drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);
   glEnable(GL_LIGHTING);
 }
 
-int drawFloorRecurse = 2;
 /*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
   drawSquare(0, x1, y1, x2, y2);
 }*/
 
-void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
-
-  printf("%d, %d, %d, %d\n", x1, y2, x2, y2);
-
-  if ( drawFloorRecurse != recurseLevel ) {
-    float xm = (x1 + x2) / 2.0;
-    float ym = (y1 + y2) / 2.0;
-    int rnew = recurseLevel + 1;
-    printf("Recursing to level %d\n", rnew);
-
-    // Split into four sub-quads
-    drawSquare(rnew, x1, y1, xm, ym);
-    drawSquare(rnew, x1, ym, xm, y2);
-    drawSquare(rnew, xm, ym, x2, y2);
-    drawSquare(rnew, xm, y1, x2, ym);
-    
-  } else {
-    printf("Drawing (%.10f, %.10f) -> (%.10f, %.10f)\n", x1, y2, x2, y2);
-    glBegin(GL_QUADS);
-      glVertex3f(x1, 0.0, y1);
-      glVertex3f(x1, 0.0, y2);
-      glVertex3f(x2, 0.0, y2);
-      glVertex3f(x2, 0.0, y1);
-    glEnd();
-  }
-
-}
-
 /**
  * Display function
  */