X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=0b5a8790ddb9ccd33f96b68f084232329b68c947;hp=9eebe5096eca3a456274e93242eea0996b8aaa59;hb=4f5489c9ff0a0c37cc7c89c412b1a1079272337d;hpb=71b87df2449904293bd13f31891a483c2a0d17e1

diff --git a/helper.c b/helper.c
index 9eebe50..0b5a879 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,42 +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?
-
-    float xm = (x1 + x2) / 2.0;
-    drawSquare(recurseLevel, )
-
+    // **NOTE: We're drawing large strips, instead of squares, which might cause a lighting problem
     glBegin(GL_QUADS);
-      glNormal3f(0,1,0);
+      //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();
-  }*/
-
- unsigned int GridSizeX = 16;
-	unsigned int GridSizeY = 16;
-	unsigned int SizeX = 8;
-	unsigned int SizeY = 8;
-
-  
-	for (unsigned int x =0;x<GridSizeX;++x)
-		for (unsigned int y =0;y<GridSizeY;++y)
-		{
-			if ((x+y)%2) //modulo 2
-				glColor3f(1.0f,1.0f,1.0f); //white
-			else
-				glColor3f(0.0f,0.0f,0.0f); //black
-glBegin(GL_QUADS);
-			glVertex3f(    x*SizeX,0.0,     y*SizeY);
-			glVertex3f((x+1)*SizeX,0.0,     y*SizeY);
-			glVertex3f((x+1)*SizeX,0.0, (y+1)*SizeY);
-			glVertex3f(    x*SizeX,0.0, (y+1)*SizeY);
-glEnd();
-		}
-	
-
+  }
 }
 
 /**
@@ -282,24 +255,41 @@ void drawFloor() {
  * Draw x, z axis on floor
  */
 void drawLine() {
-    // **NOTE: fix function
-    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);
+  // **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 );
+
+  float arrowLength = 0.1;
+
+  glBegin(GL_LINES);
+    // x arrow
     glVertex3i(  lineLength, 0.0, 0.0 );
     glVertex3i( -lineLength, 0.0, 0.0 );
-    glEnd();
+    
+    // x arrowheads
+    glVertex3i(  lineLength, 0.0, 0.0 );
+    glVertex3i(  lineLength - arrowLength, 0.0,  1.0 );
 
-    glBegin(GL_LINES);
-    glVertex3i( 0.0, 0.0,  lineLength );
-    glVertex3i( 0.0, 0.0, -lineLength );
-    glEnd();
+    glVertex3i(  lineLength, 0.0, 0.0 );
+    glVertex3i(  lineLength - arrowLength, 0.0, -1.0 );
+
+    // z arrow
+    glVertex3i(  0.0, 0.0,  lineLength );
+    glVertex3i(  0.0, 0.0, -lineLength );
+
+    // z arrowheads
+    glVertex3i(  0.0, 0.0,  lineLength );
+    glVertex3i(  1.0, 0.0,  lineLength - arrowLength );
+
+    glVertex3i(  0.0, 0.0,  lineLength );
+    glVertex3i( -1.0, 0.0,  lineLength - arrowLength );
+  glEnd();
 
-    //glDisable(GL_BLEND);
-    glEnable(GL_LIGHTING);
-    glEnable(GL_TEXTURE_2D);
+  glDisable(GL_BLEND);
+  glEnable(GL_LIGHTING);
+  glEnable(GL_TEXTURE_2D);
 }
\ No newline at end of file