(no commit message)

[atyndall/cits2231.git] / helper.c

diff --git a/helper.c b/helper.c
index 471555b..b13e8f9 100644 (file)
--- a/helper.c
+++ b/helper.c
@@ -210,7 +210,10 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
-  if ( currentGroundTexture != 0 ) {
+  if ( currentGroundTexture == 0 ) {
+    getTexture(1);
+    glBindTexture(GL_TEXTURE_2D, 1);
+  } else {
     getTexture(currentGroundTexture);
     glBindTexture(GL_TEXTURE_2D, currentGroundTexture);
   }
@@ -218,8 +221,8 @@ void drawFloor() {
        glBegin(GL_QUADS);  
 
 
-  // **NOTE: Code under development to solve the texture-is-larger than square problem
-
+  // **NOTE: Code under development to solve the texture-is-larger-than-square problem
+/*
   int textureTileSize = 50;
   int divisions = 2;
 
@@ -249,8 +252,8 @@ void drawFloor() {
       }
     }
   }
+*/
 
-/*
     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
@@ -267,7 +270,7 @@ void drawFloor() {
         glTexCoord2f( 0.0, 1.0 );
         glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
-    }*/
+    }
 
        glEnd();