X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=73e04ee54289719aea1130d1fd9e3d174eb38408;hp=a9a5d6b221e63d2e039ef16f53b3ac22706fc3bd;hb=306ea5fbd16870427a441b947c4d700f3a7147de;hpb=a56d2d3830d709d792cdb5a54386988bca4206e0

diff --git a/scene.c b/scene.c
index a9a5d6b..73e04ee 100644
--- a/scene.c
+++ b/scene.c
@@ -556,10 +556,37 @@ motion(int x, int y)
 
 void idle() {
   angle = (int)(angle + 10) % 360;
-    //angle2 = (int)(angle2 + 10) % 360;
-    printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
-    sleep(2);
-    glutPostRedisplay();
+  //angle2 = (int)(angle2 + 10) % 360;
+  printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
+  sleep(1);
+  glutPostRedisplay();
+}
+
+
+int drawFloorRecurse = 5;
+
+void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
+
+  if ( drawFloorRecurse != recurseLevel ) {
+    float xm = (x1 + x2) / 2.0;
+    float 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 {
+    glBegin(GL_QUADS);
+      glVertex3f(x1, 0.0, y1);
+      glVertex3f(x1, 0.0, y2);
+      glVertex3f(x2, 0.0, y2);
+      glVertex3f(x2, 0.0, y1);
+    glEnd();
+  }
+
 }
 
 /**
@@ -572,7 +599,7 @@ void drawFloor() {
   //  glEnable(GL_TEXTURE_2D);
   //}
 
-  glBegin(GL_QUADS);
+  /*glBegin(GL_QUADS);
     glTexCoord2f(0.0, 0.0);
     glVertex3fv(floorVertices[0]);
     glTexCoord2f(0.0, 16.0);
@@ -581,7 +608,9 @@ void drawFloor() {
     glVertex3fv(floorVertices[2]);
     glTexCoord2f(16.0, 0.0);
     glVertex3fv(floorVertices[3]);
-  glEnd();
+  glEnd();*/
+
+drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
@@ -590,6 +619,10 @@ void drawFloor() {
   glEnable(GL_LIGHTING);
 }
 
+/*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
+  drawSquare(0, x1, y1, x2, y2);
+}*/
+
 /**
  * Display function
  */