X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=98838f3a29f416389ed60c783e3906f3ec299d5f;hp=1b5aa4447d241fc09b2e11b104d20d5094ab6287;hb=e0e2b5308a29d1111291bbd17d519154e46c8fd4;hpb=24e6e08e4ec1d955b25741af0276857ef0a853a5

diff --git a/helper.c b/helper.c
index 1b5aa44..98838f3 100644
--- a/helper.c
+++ b/helper.c
@@ -210,23 +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 );
-        glNormal3d(0, 0, 1);
-        glTexCoord2f(0, 0);
-        glVertex3f( (x+1)*squareSize, 0.0, (z+1)*squareSize );
-        glTexCoord2f(1, 0);
-        glVertex3f( (x+1)*squareSize, 0.0,     z*squareSize );
-        glTexCoord2f(1, 1);
-        glVertex3f(     x*squareSize, 0.0,     z*squareSize );
-        glTexCoord2f(0, 1);
-        glVertex3f(     x*squareSize, 0.0, (z+1)*squareSize );
+        
+        glTexCoord2f( 6.0, 1.0 );
+        glVertex3f  ( (x+1)*squareSize, 0.0, (z+1)*squareSize );
+
+        glTexCoord2f( 1.0, 0.0 );
+        glVertex3f  ( (x+1)*squareSize, 0.0,     z*squareSize );
+
+        glTexCoord2f( 0.0, 0.0 );
+        glVertex3f  (     x*squareSize, 0.0,     z*squareSize );
+
+        glTexCoord2f( 0.0, 1.0 );
+        glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
     }
 	glEnd();
+
+  if ( currentGroundTexture != 0 ) {
+    glBindTexture(GL_TEXTURE_2D, 0);
+  }
 }
 
 /**