X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=167d42cbbaf1fe60bcf8dd7013638a7789b80aaf;hp=499b5c75c89587fa99abb9cf8409a1c517c10c86;hb=35fb03fca913e98a903e9dc5b179e941505235ee;hpb=4614b336e97233a3cea7ade9ac8c474bc46952e8

diff --git a/helper.c b/helper.c
index 499b5c7..167d42c 100644
--- a/helper.c
+++ b/helper.c
@@ -207,17 +207,27 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
 }
 
 /**
- * Draw a floor by calling the drawSquare recursion
+ * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
+  getTexture(2);
 	glBegin(GL_QUADS);
     for ( int x = -floorSize; x < floorSize; x++ ) {
-      for ( int y = -floorSize; y < floorSize; y++ ) {
+      for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
-        glVertex3f( (x+1)*squareSize, 0.0, (y+1)*squareSize );
-        glVertex3f(     x*squareSize, 0.0, (y+1)*squareSize );
-        glVertex3f(     x*squareSize, 0.0,    y*squareSize );
-        glVertex3f( (x+1)*squareSize, 0.0,     y*squareSize );
+        glNormal3d(0, 0, 1);
+        
+        glTexCoord2f( (x+1)*squareSize,      (z+1)*squareSize );
+        glVertex3f  ( (x+1)*squareSize, 0.0, (z+1)*squareSize );
+
+        glTexCoord2f( (x+1)*squareSize,          z*squareSize );
+        glVertex3f  ( (x+1)*squareSize, 0.0,     z*squareSize );
+
+        glTexCoord2f(     x*squareSize,          z*squareSize );
+        glVertex3f  (     x*squareSize, 0.0,     z*squareSize );
+
+        glTexCoord2f(     x*squareSize,      (z+1)*squareSize );
+        glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
     }
 	glEnd();