X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=aed5e9a818ccafb7500d712ce07032ae2e7491c7;hp=29eae69b5b66e8242d261008aa3ac8c699869c3e;hb=b3a3d7099dce9e51d7163d724106e2e2fd8d9973;hpb=c3d286211e4f462930b4640150e619faf4787c31

diff --git a/helper.c b/helper.c
index 29eae69..aed5e9a 100644
--- a/helper.c
+++ b/helper.c
@@ -210,17 +210,83 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
+  if ( currentGroundTexture != 0 ) {
+    getTexture(currentGroundTexture);
+    glBindTexture(GL_TEXTURE_2D, currentGroundTexture);
+  }
+
 	glBegin(GL_QUADS);
+
+  int textureTileSize = 50;
+  int divisions = 2;
+
+  for ( int tx = -floorSize; tx <= floorSize; tx += textureTileSize ) {
+    for ( int tz = -floorSize; tz <= floorSize; tz += textureTileSize ) {
+      int subTileWidth = textureTileSize / divisions;
+      for ( int x = 0; x <= textureTileSize; x += subTileWidth ) {
+        for ( int z = 0; z <= textureTileSize; z += subTileWidth ) {
+          glColor3f( 1.0, 1.0, 1.0 );
+
+          glTexCoord2f( tx+textureTileSize, tz+textureTileSize );
+          glVertex3f  ( (x+1)*subTileWidth, 0.0, (z+1)*subTileWidth );
+
+          glTexCoord2f( tx+textureTileSize, tz );
+          glVertex3f  ( (x+1)*subTileWidth, 0.0,     z*subTileWidth );
+
+          glTexCoord2f( tx, tz );
+          glVertex3f  (     x*subTileWidth, 0.0,     z*subTileWidth );
+
+          glTexCoord2f( tx, tz+textureTileSize );
+          glVertex3f  (     x*subTileWidth, 0.0, (z+1)*subTileWidth );
+        }
+      }
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /*
     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
-        glVertex3f( (x+1)*squareSize, 0.0, (z+1)*squareSize );
-        glVertex3f( (x+1)*squareSize, 0.0,     z*squareSize );
-        glVertex3f(     x*squareSize, 0.0,     z*squareSize );
-        glVertex3f(     x*squareSize, 0.0, (z+1)*squareSize );
+        
+        glTexCoord2f( 1.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);
+  }
 }
 
 /**