X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=fa17c1f0bee7e32b0efdead44b83789fa745fb18;hp=0841edd9dbc2ae1b0143199c8180500d16bc20a4;hb=700ecfcbbc4af70d352426d9ef65e02673ffefbb;hpb=741e1b28cd622388927419ba40da12a6e066fae3

diff --git a/scene.c b/scene.c
index 0841edd..fa17c1f 100644
--- a/scene.c
+++ b/scene.c
@@ -581,9 +581,9 @@ void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
   } else {
     glBegin(GL_QUADS);
       glVertex3f(x1, 0.0, y1);
-      glVertex3f(x1, 0.0, y2);
-      glVertex3f(x2, 0.0, y2);
       glVertex3f(x2, 0.0, y1);
+      glVertex3f(x2, 0.0, y2);
+      glVertex3f(x1, 0.0, y2);
     glEnd();
   }
 
@@ -674,11 +674,17 @@ void init() {
      far   /* Z far */
     );    
 
-  glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
-  glLightfv(GL_LIGHT0, GL_AMBIENT|GL_SPECULAR|GL_DIFFUSE, lightColor);
-  glLightf(GL_LIGHT0, GL_CONSTANT_ATTENUATION, 0.1);
-  glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
-  glEnable(GL_LIGHT0);
+
+GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};
+
+glEnable(GL_LIGHT0);
+glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
+glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
+glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
+glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
   glEnable(GL_LIGHTING);
 
   glMatrixMode(GL_MODELVIEW);