X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=scene.c;h=8a3174282096fe9416b6b58448d0965f7f5e0cce;hb=b021d54a5b5d5035424ab9a6ccbc4e32d1a16eca;hp=b6caf7047a02a567776389c4a21b2d9cb0f7a68d;hpb=9df67797af48c1d4da43225909a51d9ad277037e;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index b6caf70..8a31742 100644
--- a/scene.c
+++ b/scene.c
@@ -556,24 +556,21 @@ 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(0.5);
-    glutPostRedisplay();
+  //angle2 = (int)(angle2 + 10) % 360;
+  printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
+  sleep(1);
+  glutPostRedisplay();
 }
 
 
-int drawFloorRecurse = 4;
+int drawFloorRecurse = 6;
 
 void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
 
-  printf("%d, %d, %d, %d\n", x1, y2, x2, y2);
-
   if ( drawFloorRecurse != recurseLevel ) {
     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);
@@ -582,7 +579,6 @@ void drawSquare(int recurseLevel, float x1, float y1, float x2, float 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);
@@ -597,30 +593,13 @@ void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
  * 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.0, -1000.0, 1000.0, 1000.0);
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
   }*/
 
-  glEnable(GL_LIGHTING);
 }
 
 /*void drawSquare(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) {