(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index bc532de..5e492e5 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -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
@@ -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,12 +670,12 @@ 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
+    -100.0,  /* Z near */\r
+     100.0   /* Z far */\r
     );    \r
 \r
   glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);\r
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);\r
+  glLightfv(GL_LIGHT0, GL_AMBIENT|GL_SPECULAR|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