X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=5ae5f23cf75507cfb626517607bfb935b7980a8c;hp=07a357e74ab00cb64973453df14e4fa5e6ce6c2e;hb=4a470149c629f3adba283d53486b4a8f78cd8262;hpb=d5b4f11a700c32f8368f6d2dc54f7c04ebcaf3cd

diff --git a/scene.c b/scene.c
index 07a357e..5ae5f23 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 = 40;
+static float lightAngle = 0.0, lightHeight = 5;
 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 = -10.0;
+  GLdouble far = 10.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;
@@ -594,7 +594,7 @@ void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
  */
 void drawFloor() {
  
-drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);
+drawSquare(0, -100.0, -100.0, 100.0, 100.0);
 
   /*if (useTexture) {
     glDisable(GL_TEXTURE_2D);
@@ -613,7 +613,7 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
   gluLookAt(
-    0.0, 0.0, 80.0,  /* eye is at (x,y,z) */
+    0.0, 0.0, 10.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 */
     );
@@ -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();
@@ -650,7 +650,7 @@ void display() {
 
       /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
-      glutSolidSphere(1.0, 5, 5);
+      glutSolidSphere(1.0, 50, 50);
 
       glEnable(GL_LIGHTING);
     glPopMatrix();
@@ -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();