X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=790fa841cc7998cbac0238d9ebf9d717da0c8343;hp=64fcdb5959a2086e94a5fd7ce9b181894c6d51cb;hb=3b3e32d2dc375c39617769440c43a3ce04ea1503;hpb=a452fcff3f30b458535e11d3d241d363bfc993b4

diff --git a/scene.c b/scene.c
index 64fcdb5..790fa84 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(2);
+    sleep(25);
     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.
  */
@@ -583,7 +614,7 @@ void drawFloor() {
     glVertex3fv(floorVertices[3]);
   glEnd();*/
 
-drawSquare(0, -1000, -1000, 1000, 1000);
+drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
@@ -592,35 +623,10 @@ drawSquare(0, -1000, -1000, 1000, 1000);
   glEnable(GL_LIGHTING);
 }
 
-int drawFloorRecurse = 10;
 /*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
   drawSquare(0, x1, y1, x2, y2);
 }*/
 
-void drawSquare(int recurseLevel, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
-
-  printf("Recurse level %d", recurseLevel);
-
-  if ( drawFloorRecurse != recurseLevel ) {
-    GLfloat xm = (x2 - x1) / 2.0;
-    if ( x1 > x2 ) {
-      xm = (x1 - x2) / 2.0;
-    }
-
-    drawSquare(recurseLevel + 1, x1, y1, xm, y2);
-    drawSquare(recurseLevel + 1, xm, y1, x2, y2);
-  } else {
-    printf("Drawing (%f, %f) -> (%f, %f)\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
  */