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

diff --git a/scene.c b/scene.c
index 73e04ee..7ca67fa 100644
--- a/scene.c
+++ b/scene.c
@@ -593,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) {
@@ -630,7 +613,7 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
   gluLookAt(
-    0.0, 0.0, 60.0,  /* eye is at (x,y,z) */
+    0.0, 0.0, 30.0,  /* eye is at (x,y,z) */
     0.0, 0.0,  0.0,  /* center is at (x,y,z) */
     0.0, 1.0,  0.0   /* up is in postivie Y direction */
     );
@@ -644,7 +627,7 @@ void display() {
   glPushMatrix();
       /* Perform scene rotations based on user mouse input. */
     glRotatef(angle2, 1.0, 0.0, 0.0);
-    glRotatef(angle, 0.0, 1.0, 0.0);
+    //glRotatef(angle, 0.0, 1.0, 0.0);
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);