X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=33799d5f43de2458204aeb2953c0665dea62c2a2;hp=a5eb30cb8262a4400749e82a315fd187eca48acd;hb=9971a6affb8e7135bd4cf146097042f22aa64689;hpb=a54caedf9a742fc205361ef49e50e83f1bc9d41e diff --git a/helper.c b/helper.c index a5eb30c..33799d5 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; @@ -234,14 +233,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, which might be a lighting problem + glBegin(GL_QUADS); + glNormal3f(0,1,0); glVertex3f(x1, 0.0, z1); glVertex3f(x1, 0.0, z2); glVertex3f(x2, 0.0, z2); glVertex3f(x2, 0.0, z1); glEnd(); } - } /** @@ -258,21 +259,21 @@ void drawLine() { // **NOTE: fix function glDisable(GL_TEXTURE_2D); glDisable(GL_LIGHTING); - glEnable(GL_BLEND); + //glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glColor4ub( 0.0, 0.0, 0.0, 0.0 ); + glColor3f( 0.0, 0.0, 0.0 ); glBegin(GL_LINES); - glVertex3i( lineLength, 1.0, 0.0 ); - glVertex3i( -lineLength, 1.0, 0.0 ); + glVertex3i( lineLength, 0.0, 0.0 ); + glVertex3i( -lineLength, 0.0, 0.0 ); glEnd(); glBegin(GL_LINES); - glVertex3i( 0.0, 1.0, lineLength ); - glVertex3i( 0.0, 1.0, -lineLength ); + glVertex3i( 0.0, 0.0, lineLength ); + glVertex3i( 0.0, 0.0, -lineLength ); glEnd(); - glDisable(GL_BLEND); + //glDisable(GL_BLEND); glEnable(GL_LIGHTING); glEnable(GL_TEXTURE_2D); } \ No newline at end of file