(no commit message)

[atyndall/cits2231.git] / helper.c

diff --git a/helper.c b/helper.c
index 7171479..98838f3 100644 (file)
--- a/helper.c
+++ b/helper.c
@@ -210,26 +210,34 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
-  getTexture(2);
+  if ( currentGroundTexture != 0 ) {
+    getTexture(currentGroundTexture);
+    glBindTexture(GL_TEXTURE_2D, currentGroundTexture);
+  }
+
        glBegin(GL_QUADS);
     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
         
-        glTexCoord2f( (x+1)*squareSize,      (z+1)*squareSize );
+        glTexCoord2f( 6.0, 1.0 );
         glVertex3f  ( (x+1)*squareSize, 0.0, (z+1)*squareSize );
 
-        glTexCoord2f( (x+1)*squareSize,          z*squareSize );
+        glTexCoord2f( 1.0, 0.0 );
         glVertex3f  ( (x+1)*squareSize, 0.0,     z*squareSize );
 
-        glTexCoord2f(     x*squareSize,          z*squareSize );
+        glTexCoord2f( 0.0, 0.0 );
         glVertex3f  (     x*squareSize, 0.0,     z*squareSize );
 
-        glTexCoord2f(     x*squareSize,      (z+1)*squareSize );
+        glTexCoord2f( 0.0, 1.0 );
         glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
     }
        glEnd();
+
+  if ( currentGroundTexture != 0 ) {
+    glBindTexture(GL_TEXTURE_2D, 0);
+  }
 }
 
 /**