X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=ceb7c1529c59ca2aa26d038b60102887e7a5a0c2;hp=4d8f96e6386ae0a963765f3e0110f5bcc6c98928;hb=42f7093208bb77a0973435339f4e4361f402eb13;hpb=9bdefd94a0ad55f745e4723119294fb22896b6ba;ds=sidebyside

diff --git a/helper.c b/helper.c
index 4d8f96e..ceb7c15 100644
--- a/helper.c
+++ b/helper.c
@@ -216,7 +216,6 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * @param z2 bottom-left z
  */
 void drawSquare(int recurseLevel, float x1, float z1, float x2, float z2) {
-
   if ( drawFloorRecurse != recurseLevel ) {
     // Calculate middle points
     float xm = (x1 + x2) / 2.0;
@@ -233,15 +232,16 @@ void drawSquare(int recurseLevel, float x1, float z1, float x2, float z2) {
 
   } else {
     // Draw square.
-    // **NOTE: Is the polygon facing in the right direction?
+    // **NOTE: We're drawing large strips, instead of squares, which might cause a lighting problem
     glBegin(GL_QUADS);
+      //glNormal3f(0,1,0);
+      glColor3f(1.0, 1.0, 1.0);
       glVertex3f(x1, 0.0, z1);
       glVertex3f(x1, 0.0, z2);
       glVertex3f(x2, 0.0, z2);
       glVertex3f(x2, 0.0, z1);
     glEnd();
   }
-
 }
 
 /**
@@ -255,22 +255,25 @@ void drawFloor() {
  * Draw x, z axis on floor
  */
 void drawLine() {
-    // **NOTE: fix function
-    glDisable(GL_TEXTURE_2D);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glColor4ub( 0.0, 0.0, 0.0, 0.0 );
-
-    glBegin(GL_LINES);
-    glVertex3i(  lineLength, 1.0, 0.0 );
-    glVertex3i( -lineLength, 1.0, 0.0 );
-    glEnd();
-
-    glBegin(GL_LINES);
-    glVertex3i( 0.0, 1.0,  lineLength );
-    glVertex3i( 0.0, 1.0, -lineLength );
-    glEnd();
-
-    glDisable(GL_BLEND);
-    glEnable(GL_TEXTURE_2D);
+  // **NOTE: Function does not currently draw arrow-heads
+
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_LIGHTING);
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glColor3f( 0.0, 0.0, 0.0 );
+
+  glBegin(GL_LINES);
+    glVertex3i(  lineLength, 0.0, 0.0 );
+    glVertex3i( -lineLength, 0.0, 0.0 );
+  glEnd();
+
+  glBegin(GL_LINES);
+    glVertex3i( 0.0, 0.0,  lineLength );
+    glVertex3i( 0.0, 0.0, -lineLength );
+  glEnd();
+
+  glDisable(GL_BLEND);
+  glEnable(GL_LIGHTING);
+  glEnable(GL_TEXTURE_2D);
 }
\ No newline at end of file