X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=abdc56ee28b5843f283252f7ac24e26e5f6577c6;hp=904fa6f90e2e6b042f573ec0cb394f0d3390f07c;hb=600240b234c1a3e01560332b6b0f230fbcf48ac3;hpb=99b8ed1808c4e8b7d6826edaeb946c7e37509d9a

diff --git a/helper.c b/helper.c
index 904fa6f..abdc56e 100644
--- a/helper.c
+++ b/helper.c
@@ -210,19 +210,77 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
-	glBegin(GL_QUADS);
-    getTexture(2);
-    glBindTexture(GL_TEXTURE_2D, 2);
+  if ( currentGroundTexture == 0 ) {
+    getTexture(1);
+    glBindTexture(GL_TEXTURE_2D, 1);
+  } else {
+    getTexture(currentGroundTexture);
+    glBindTexture(GL_TEXTURE_2D, currentGroundTexture);
+  }
+
+	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 <= 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+tx, 0.0, (z+1)*subTileWidth+tz );
+
+          glTexCoord2f( tx+textureTileSize, tz );
+          glVertex3f  ( (x+1)*subTileWidth+tx, 0.0,     z*subTileWidth+tz );
+
+          glTexCoord2f( tx, tz );
+          glVertex3f  (     x*subTileWidth+tx, 0.0,     z*subTileWidth+tz );
+
+          glTexCoord2f( tx, tz+textureTileSize );
+          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 );
-        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 );
+
+        glNormal3i( 0, 1, 0 );
+        glTexCoord2f( 1.0, 1.0 );
+        glVertex3f  ( (x+1)*squareSize, 0.0, (z+1)*squareSize );
+
+        glNormal3i( 0, 1, 0 );
+        glTexCoord2f( 1.0, 0.0 );
+        glVertex3f  ( (x+1)*squareSize, 0.0,     z*squareSize );
+
+        glNormal3i( 0, 1, 0 );
+        glTexCoord2f( 0.0, 0.0 );
+        glVertex3f  (     x*squareSize, 0.0,     z*squareSize );
+
+        glNormal3i( 0, 1, 0 );
+        glTexCoord2f( 0.0, 1.0 );
+        glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }
     }
+
 	glEnd();
+
+  if ( currentGroundTexture != 0 ) {
+    glBindTexture(GL_TEXTURE_2D, 0);
+  }
 }
 
 /**
@@ -267,4 +325,21 @@ void drawAxisLines() {
   glDisable(GL_BLEND);
   glEnable(GL_LIGHTING);
   glEnable(GL_TEXTURE_2D);
+}
+
+void addSceneObject(int id) {
+  // **NOTE: Currently only adds the teapot
+
+  nObjects += 1; // New object in scene
+
+  sceneObjs[nObjects].mesh = -1;
+  sceneObjs[nObjects].texture = -1;
+  sceneObjs[nObjects].x = 0;
+  sceneObjs[nObjects].y = 0;
+  sceneObjs[nObjects].z = 0;
+
+  sceneObjs[nObjects].scale = (vector*)calloc( 3, sizeof(vector[0]) );
+
+  sceneObjs[nObjects].rotation.parameter = 0;
+  sceneObjs[nObjects].rotation.vect = (vector*)calloc( 3, sizeof(vector[0]) );
 }
\ No newline at end of file