(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 4467e7d..fa17c1f 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -125,10 +125,13 @@ int lightMoving = 0, lightStartX, lightStartY;
 \r
 /* Time varying or user-controled variables. */\r
 static float jump = 0.0;\r
-static float lightAngle = 0.0, lightHeight = 40;\r
+static float lightAngle = 0.0, lightHeight = 5;\r
 GLfloat angle = -150;   /* in degrees */\r
 GLfloat angle2 = 30;   /* in degrees */\r
 \r
+GLfloat near = -10;\r
+GLfloat far = 10;\r
+\r
 /**\r
  * Prints out error message when file cannot be read\r
  * @param fileName Name of file that could not be read\r
@@ -484,9 +487,6 @@ void makeMenu() {
  * @param h New height\r
  */\r
 void windowReshape(int w, int h) {\r
-  GLdouble near = -50.0;\r
-  GLdouble far = 50.0;\r
-\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
@@ -509,7 +509,7 @@ void windowReshape(int w, int h) {
  */\r
 /*void mouse(int btn, int state, int x, int y) {\r
   \r
-}*//*\r
+}*/\r
 static void\r
 mouse(int button, int state, int x, int y)\r
 {\r
@@ -552,7 +552,7 @@ motion(int x, int y)
     lightStartY = y;\r
     glutPostRedisplay();\r
   }\r
-}*/\r
+}\r
 \r
 void idle() {\r
   angle = (int)(angle + 10) % 360;\r
@@ -581,9 +581,9 @@ void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
   } else {\r
     glBegin(GL_QUADS);\r
       glVertex3f(x1, 0.0, y1);\r
-      glVertex3f(x1, 0.0, y2);\r
-      glVertex3f(x2, 0.0, y2);\r
       glVertex3f(x2, 0.0, y1);\r
+      glVertex3f(x2, 0.0, y2);\r
+      glVertex3f(x1, 0.0, y2);\r
     glEnd();\r
   }\r
 \r
@@ -594,7 +594,7 @@ void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
  */\r
 void drawFloor() {\r
  \r
-drawSquare(0, -1000.0, -1000.0, 1000.0, 1000.0);\r
+drawSquare(0, -100.0, -100.0, 100.0, 100.0);\r
 \r
   /*if (useTexture) {\r
     glDisable(GL_TEXTURE_2D);\r
@@ -613,7 +613,7 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
   glLoadIdentity();\r
   gluLookAt(\r
-    0.0, 0.0, 80.0,  /* eye is at (x,y,z) */\r
+    0.0, 0.0, 10.0,  /* eye is at (x,y,z) */\r
     0.0, 0.0,  0.0,  /* center is at (x,y,z) */\r
     0.0, 1.0,  0.0   /* up is in postivie Y direction */\r
     );\r
@@ -640,7 +640,7 @@ void display() {
 \r
     glPushMatrix();\r
     \r
-      //glTranslatef(0.0, 0.0, 0.0);\r
+      glTranslatef(0.0, 1.0, 0.0);\r
       glutWireTeapot(1); // Draw teapot for test\r
     glPopMatrix();\r
 \r
@@ -650,7 +650,7 @@ void display() {
 \r
       /* Draw a yellow ball at the light source. */\r
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);\r
-      glutSolidSphere(1.0, 5, 5);\r
+      glutSolidSphere(1.0, 50, 50);\r
 \r
       glEnable(GL_LIGHTING);\r
     glPopMatrix();\r
@@ -670,15 +670,21 @@ void init() {
   gluPerspective(\r
        60.0,  /* field of view in degree */\r
         1.0,  /* aspect ratio */\r
-    -1000.0,  /* Z near */\r
-     1000.0   /* Z far */\r
+     near,  /* Z near */\r
+     far   /* Z far */\r
     );    \r
 \r
-  glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);\r
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);\r
-  glLightf(GL_LIGHT0, GL_CONSTANT_ATTENUATION, 0.1);\r
-  glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);\r
-  glEnable(GL_LIGHT0);\r
+\r
+GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};\r
+GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};\r
+GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};\r
+GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};\r
+\r
+glEnable(GL_LIGHT0);\r
+glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r
+glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
+glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
+glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
   glEnable(GL_LIGHTING);\r
 \r
   glMatrixMode(GL_MODELVIEW);\r
@@ -723,9 +729,9 @@ int main(int argc, char **argv) {
 \r
   glutReshapeFunc(windowReshape);\r
   glutDisplayFunc(display);\r
-  //glutMouseFunc(mouse);\r
-  //glutMotionFunc(motion);\r
-  glutIdleFunc(idle);\r
+  glutMouseFunc(mouse);\r
+  glutMotionFunc(motion);\r
+  //glutIdleFunc(idle);\r
 \r
   makeMenu();\r
 \r