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

diff --git a/scene.c b/scene.c
index 73e04ee..b46f24f 100644
--- a/scene.c
+++ b/scene.c
@@ -125,7 +125,7 @@ int lightMoving = 0, lightStartX, lightStartY;
 
 /* Time varying or user-controled variables. */
 static float jump = 0.0;
-static float lightAngle = 0.0, lightHeight = 20;
+static float lightAngle = 0.0, lightHeight = 40;
 GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */
 
@@ -484,8 +484,8 @@ void makeMenu() {
  * @param h New height
  */
 void windowReshape(int w, int h) {
-  GLdouble near = -1000.0;
-  GLdouble far = 1000.0;
+  GLdouble near = -200.0;
+  GLdouble far = 200.0;
 
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
   glMatrixMode(GL_PROJECTION);
@@ -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,11 +613,13 @@ 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, 80.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 */
     );
 
+  glRotatef(30.0, 1.0, 0.0, 0.0);
+
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
   lightPosition[1] = lightHeight;
@@ -643,7 +628,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);
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);