X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=aaa8ba1cdb05bfee5b9eb3de2969f7b1795ecf46;hp=cc96c000b02175c00ea79f6ea6da46dcf7d1632d;hb=af9b671dec267f3f349302a81f5484a75e43fd21;hpb=9288707184d4d55b5302ebdb0dd6055cf883cd15

diff --git a/scene.c b/scene.c
index cc96c00..aaa8ba1 100644
--- a/scene.c
+++ b/scene.c
@@ -592,25 +592,30 @@ drawSquare(0, -1000, -1000, 1000, 1000);
   glEnable(GL_LIGHTING);
 }
 
-int drawFloorRecurse = 10;
+int drawFloorRecurse = 2;
 /*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) {
+void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
 
-  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);
+    printf("Drawing (%.10f, %.10f) -> (%.10f, %.10f)\n", x1, y2, x2, y2);
+    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 (%f, %f) -> (%f, %f)\n", x1, y2, x2, y2);
+    printf("Drawing (%.10f, %.10f) -> (%.10f, %.10f)\n", x1, y2, x2, y2);
     glBegin(GL_QUADS);
       glVertex3f(x1, 0.0, y1);
       glVertex3f(x1, 0.0, y2);