(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 0841edd..fa17c1f 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -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
@@ -674,11 +674,17 @@ void init() {
      far   /* Z far */\r
     );    \r
 \r
-  glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);\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
+\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