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

diff --git a/scene.c b/scene.c
index 0dae69f..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(25);
-    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();
+  }
+
 }
 
 /**
@@ -583,7 +610,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,39 +619,10 @@ drawSquare(0, -1000, -1000, 1000, 1000);
   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, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
-
-  
-
-  if ( drawFloorRecurse != recurseLevel ) {
-    printf("Recurse level %d\n", recurseLevel);
-    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);
-      glVertex3f(x1, 0.0, y1);
-      glVertex3f(x1, 0.0, y2);
-      glVertex3f(x2, 0.0, y2);
-      glVertex3f(x2, 0.0, y1);
-    glEnd();
-  }
-
-}
-
 /**
  * Display function
  */