index bb57603..4040947 100644 (file)
--- a/helper.c
+++ b/helper.c
* @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,43 +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
-      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 = 100;
-       unsigned int GridSizeY = 100;
-       unsigned int SizeX = 2;
-       unsigned int SizeY = 2;
-
-
-       for (unsigned int x =-GridSizeX;x<GridSizeX;++x)
-               for (unsigned int y =-GridSizeY;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
-
-                       glVertex3f((x+1)*SizeX,0.0, (y+1)*SizeY);
-                       glVertex3f(    x*SizeX,0.0, (y+1)*SizeY);
-      glVertex3f(    x*SizeX,0.0,     y*SizeY);
-                       glVertex3f((x+1)*SizeX,0.0,     y*SizeY);
-glEnd();
-               }
-
-
+  }
}

/**
@@ -283,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 = 1.0;
+
+  glBegin(GL_LINES);
+    // x arrow
glVertex3i(  lineLength, 0.0, 0.0 );
glVertex3i( -lineLength, 0.0, 0.0 );
-    glEnd();
+
+    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 );
+
+    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

UCC git Repository :: git.ucc.asn.au