X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=72ce8d3d99f301dd29c1a6fd9e68837e63eaff7f;hp=22598df15001a74dc2b9aacf1c03c074e3e804a8;hb=931b31d79c7a6a33c8eac86fab2e7f20fc668d3d;hpb=d5375f57e65b258c22c6d625c10c81c7f228350e

diff --git a/scene.c b/scene.c
index 22598df..72ce8d3 100644
--- a/scene.c
+++ b/scene.c
@@ -556,66 +556,29 @@ 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();
 }
 
-/**
- * Draw a floor.
- */
-void drawFloor() {
-  glDisable(GL_LIGHTING);
-
-  //if (useTexture) {
-  //  glEnable(GL_TEXTURE_2D);
-  //}
-
-  /*glBegin(GL_QUADS);
-    glTexCoord2f(0.0, 0.0);
-    glVertex3fv(floorVertices[0]);
-    glTexCoord2f(0.0, 16.0);
-    glVertex3fv(floorVertices[1]);
-    glTexCoord2f(16.0, 16.0);
-    glVertex3fv(floorVertices[2]);
-    glTexCoord2f(16.0, 0.0);
-    glVertex3fv(floorVertices[3]);
-  glEnd();*/
 
-drawSquare(0, -1000, -1000, 1000, 1000);
+int drawFloorRecurse = 5;
 
-  /*if (useTexture) {
-    glDisable(GL_TEXTURE_2D);
-  }*/
-
-  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) {
-
-  
+void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
 
   if ( drawFloorRecurse != recurseLevel ) {
-    printf("Drawing (%.10f, %.10f) -> (%.10f, %.10f)\n", x1, y2, x2, y2);
-    GLfloat xm = (x1 + x2) / 2.0;
-    GLfloat ym = (y1 + y2) / 2.0;
+    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);
@@ -626,6 +589,23 @@ void drawSquare(int recurseLevel, GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2
 
 }
 
+/**
+ * Draw a floor.
+ */
+void drawFloor() {
+ 
+drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);
+
+  /*if (useTexture) {
+    glDisable(GL_TEXTURE_2D);
+  }*/
+
+}
+
+/*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {
+  drawSquare(0, x1, y1, x2, y2);
+}*/
+
 /**
  * Display function
  */