From: Ash Tyndall <git@atyndall.net>
Date: Fri, 21 Oct 2011 07:36:21 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=b0ef6c70f800b0e987e088084d8b104a133e9644;p=atyndall%2Fcits2231.git

---

diff --git a/helper.c b/helper.c
index e72c64e..d7b1058 100644
--- a/helper.c
+++ b/helper.c
@@ -215,7 +215,10 @@ void drawFloor() {
     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;
@@ -227,7 +230,9 @@ void drawFloor() {
         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);
+          printf("Creating a subtile.\n");
+          printf("Texture box is: (%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)\n",(x+1)*subTileWidth, (z+1)*subTileWidth ,(x+1)*subTileWidth, z*subTileWidth, x*subTileWidth, z*subTileWidth, x*subTileWidth, (z+1)*subTileWidth);
 
           glTexCoord2f( tx+textureTileSize, tz+textureTileSize );
           glVertex3f  ( (x+1)*subTileWidth, 0.0, (z+1)*subTileWidth );
@@ -245,28 +250,7 @@ void drawFloor() {
     }
   }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  /*
+/*
     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
@@ -284,6 +268,7 @@ void drawFloor() {
         glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
     }*/
+
 	glEnd();
 
   if ( currentGroundTexture != 0 ) {