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

diff --git a/helper.c b/helper.c
index aed5e9a..b13e8f9 100644
--- a/helper.c
+++ b/helper.c
@@ -210,61 +210,50 @@ 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);
   }
 
-	glBegin(GL_QUADS);
+	glBegin(GL_QUADS);  
+
 
+  // **NOTE: Code under development to solve the texture-is-larger-than-square problem
+/*
   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 ) {
+      for ( int x = 0; x <= divisions * 2; x++ ) {
+        for ( int z = 0; z <= divisions * 2; z++ ) {
           glColor3f( 1.0, 1.0, 1.0 );
 
+          printf("Creating a subtile.\n");
+          printf("Texture box is: (%d, %d), (%d, %d), (%d, %d), (%d, %d)\n",tx+textureTileSize, tz+textureTileSize,tx+textureTileSize, tz,tx, tz, tx, tz+textureTileSize );
+          printf("Polygon box is: (%d, %d), (%d, %d), (%d, %d), (%d, %d)\n",(x+1)*subTileWidth+tx, (z+1)*subTileWidth+tz ,(x+1)*subTileWidth+tx, z*subTileWidth+tz, x*subTileWidth+tx, z*subTileWidth+tz, x*subTileWidth+tx, (z+1)*subTileWidth+tz);
+
           glTexCoord2f( tx+textureTileSize, tz+textureTileSize );
-          glVertex3f  ( (x+1)*subTileWidth, 0.0, (z+1)*subTileWidth );
+          glVertex3f  ( (x+1)*subTileWidth+tx, 0.0, (z+1)*subTileWidth+tz );
 
           glTexCoord2f( tx+textureTileSize, tz );
-          glVertex3f  ( (x+1)*subTileWidth, 0.0,     z*subTileWidth );
+          glVertex3f  ( (x+1)*subTileWidth+tx, 0.0,     z*subTileWidth+tz );
 
           glTexCoord2f( tx, tz );
-          glVertex3f  (     x*subTileWidth, 0.0,     z*subTileWidth );
+          glVertex3f  (     x*subTileWidth+tx, 0.0,     z*subTileWidth+tz );
 
           glTexCoord2f( tx, tz+textureTileSize );
-          glVertex3f  (     x*subTileWidth, 0.0, (z+1)*subTileWidth );
+          glVertex3f  (     x*subTileWidth+tx, 0.0, (z+1)*subTileWidth+tz );
         }
       }
     }
   }
+*/
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  /*
     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
@@ -281,7 +270,8 @@ void drawFloor() {
         glTexCoord2f( 0.0, 1.0 );
         glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
-    }*/
+    }
+
 	glEnd();
 
   if ( currentGroundTexture != 0 ) {