X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=ceb7c1529c59ca2aa26d038b60102887e7a5a0c2;hp=9da70fe9ec4298e29a9cafd793d4ba60701d414c;hb=42f7093208bb77a0973435339f4e4361f402eb13;hpb=29aa2161a1326899a63dbd8e5d99772b45461826;ds=sidebyside diff --git a/helper.c b/helper.c index 9da70fe..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,22 +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? - - if ( (x1 - x2) / (z1 - z2)) { - printf("(%f, %f), (%f, %f) is not square!\n", x1, z1, x2, z2); - } - - //printf("Drawing square (%f, %f), (%f, %f), (%f, %f), (%f, %f)\n", x1, z1, x1, z2, x2, z2, x2, z1); + // **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(); } - } /** @@ -262,24 +255,25 @@ 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 ); + + glBegin(GL_LINES); glVertex3i( lineLength, 0.0, 0.0 ); glVertex3i( -lineLength, 0.0, 0.0 ); - glEnd(); + glEnd(); - glBegin(GL_LINES); + glBegin(GL_LINES); glVertex3i( 0.0, 0.0, lineLength ); glVertex3i( 0.0, 0.0, -lineLength ); - glEnd(); + 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