(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 705c2d1..0e5ae12 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -339,12 +339,18 @@ void display() {
   lightPosition0[2] = 12*sin(lightAngle0);\r
   lightPosition0[3] = 0.0;\r
 \r
   lightPosition0[2] = 12*sin(lightAngle0);\r
   lightPosition0[3] = 0.0;\r
 \r

+  direction0[0] = lightPosition0[0];\r
+  direction0[2] = lightPosition0[2];\r
+\r

   /* Reposition the light source 1. */\r
   lightPosition1[0] = 12*cos(lightAngle1);\r
   lightPosition1[1] = lightHeight1;\r
   lightPosition1[2] = 12*sin(lightAngle1);\r
   lightPosition1[3] = 0.0;\r
 \r
   /* Reposition the light source 1. */\r
   lightPosition1[0] = 12*cos(lightAngle1);\r
   lightPosition1[1] = lightHeight1;\r
   lightPosition1[2] = 12*sin(lightAngle1);\r
   lightPosition1[3] = 0.0;\r
 \r

+  direction1[0] = lightPosition1[0];\r
+  direction1[2] = lightPosition1[2];\r
+\r

   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r


@@ -400,14 +406,14 @@ void init() {
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
   glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);\r
 \r
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
   glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);\r
 \r

-  glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);\r
+  glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 60.0);\r

 \r
   glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);\r
   glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);\r
   glLightfv(GL_LIGHT1, GL_SPECULAR, specular1);\r
   glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);\r
 \r
 \r
   glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);\r
   glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);\r
   glLightfv(GL_LIGHT1, GL_SPECULAR, specular1);\r
   glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);\r
 \r

-  glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0);\r
+  glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 60.0);\r

 \r
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
   glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);\r
 \r
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
   glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);\r