X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=e72c64eb2f9780e4c546847a9f1a0d83ea3cf146;hp=ec880e8cee252dece82e89613737d706c3e0f262;hb=7456b4bf1856019e4fc84d1e896007497a31b0cf;hpb=70f41c4285f311732a9e0511f41f35a0c9199586

diff --git a/helper.c b/helper.c
index ec880e8..e72c64e 100644
--- a/helper.c
+++ b/helper.c
@@ -210,9 +210,63 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
-  getTexture(2);
-  glBindTexture(GL_TEXTURE_2D, 2);
+  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 );
+
+          printf("Creating a subtile. Width: %d, x: %d, z: %d, tx: %d, tz: %d\n", subTileWidth, x, z, tx, tz);
+
+          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 );
@@ -229,9 +283,12 @@ void drawFloor() {
         glTexCoord2f( 0.0, 1.0 );
         glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
-    }
+    }*/
 	glEnd();
-  glBindTexture(GL_TEXTURE_2D, 0);
+
+  if ( currentGroundTexture != 0 ) {
+    glBindTexture(GL_TEXTURE_2D, 0);
+  }
 }
 
 /**