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

diff --git a/scene.c b/scene.c
index 64fcdb5..be5f938 100644
--- a/scene.c
+++ b/scene.c
@@ -558,7 +558,7 @@ 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();
 }
 
@@ -592,23 +592,26 @@ drawSquare(0, -1000, -1000, 1000, 1000);
   glEnable(GL_LIGHTING);
 }
 
-int drawFloorRecurse = 10;
+int drawFloorRecurse = 3;
 /*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);
+  printf("Recurse level %d\n", 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);
+    GLfloat xm = (x1 + x2) / 2.0;
+    GLfloat ym = (y1 + y2) / 2.0;
+    int rnew = recurseLevel + 1;
+
+    // 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 (%f, %f) -> (%f, %f)\n", x1, y2, x2, y2);
     glBegin(GL_QUADS);