X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=a74a6df231cb8a11b06be9b8b81854841baa84df;hp=66c7e1d9d1398e5dc375005c1f8548284ba5034e;hb=4b12fdcf72bcba1edd1b30a8c5aa66def470aec5;hpb=0e3edb12fed934c0d041563c98c2d04088ee3ae5

diff --git a/scene.c b/scene.c
index 66c7e1d..a74a6df 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 = -100.0;
+  GLdouble far = 100.0;
 
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
   glMatrixMode(GL_PROJECTION);
@@ -509,7 +509,7 @@ void windowReshape(int w, int h) {
  */
 /*void mouse(int btn, int state, int x, int y) {
   
-}*//*
+}*/
 static void
 mouse(int button, int state, int x, int y)
 {
@@ -552,7 +552,7 @@ motion(int x, int y)
     lightStartY = y;
     glutPostRedisplay();
   }
-}*/
+}
 
 void idle() {
   angle = (int)(angle + 10) % 360;
@@ -613,9 +613,9 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
   gluLookAt(
-    043.0, 52.0, 80.0,  /* eye is at (x,y,z) */
-    04.0, 456.0,  480,  /* center is at (x,y,z) */
-    04.0, 1.0,  60.0   /* up is in postivie Y direction */
+    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);
@@ -641,7 +641,7 @@ void display() {
     glPushMatrix();
     
       //glTranslatef(0.0, 0.0, 0.0);
-      glutWireTeapot(30); // Draw teapot for test
+      glutWireTeapot(1); // Draw teapot for test
     glPopMatrix();
 
     glPushMatrix();
@@ -723,9 +723,9 @@ int main(int argc, char **argv) {
 
   glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
-  //glutMouseFunc(mouse);
-  //glutMotionFunc(motion);
-  glutIdleFunc(idle);
+  glutMouseFunc(mouse);
+  glutMotionFunc(motion);
+  //glutIdleFunc(idle);
 
   makeMenu();