X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=ab96c884b582b1995ef2e2bfcd1e9af3e33d018e;hp=445e0cd87525b4d1f2d057f8a79c1cc636874dd7;hb=2a9451d5c45eda1d68677b519784bd9756f72260;hpb=7664cdd0015a7d16ea6fdb0b06fca1a23586f0c1

diff --git a/helper.c b/helper.c
index 445e0cd..ab96c88 100644
--- a/helper.c
+++ b/helper.c
@@ -207,21 +207,46 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
 }
 
 /**
- * Draw a floor by calling the drawSquare recursion
+ * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
-	glBegin(GL_QUADS);
+  if ( currentGroundTexture == 0 ) {
+    getTexture(1);
+    glBindTexture(GL_TEXTURE_2D, 1);
+  } else {
+    getTexture(currentGroundTexture);
+    glBindTexture(GL_TEXTURE_2D, currentGroundTexture);
+  }
+
+	glBegin(GL_QUADS);  
+
     for ( int x = -floorSize; x < floorSize; x++ ) {
-      for ( int y = -floorSize; y < floorSize; y++ ) {
+      for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
-        glVertex2f(     x*squareSize,     y*squareSize );
-        glVertex2f( (x+1)*squareSize,     y*squareSize );
-        glVertex2f( (x+1)*squareSize, (y+1)*squareSize );
-        glVertex2f(     x*squareSize, (y+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);
+  }
 }
 
 /**
@@ -266,4 +291,29 @@ void drawAxisLines() {
   glDisable(GL_BLEND);
   glEnable(GL_LIGHTING);
   glEnable(GL_TEXTURE_2D);
+}
+
+int addSceneObject(int id) {
+  // **NOTE: Currently only adds the teapot
+
+  curObject = nObjects;
+
+  sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh
+  sceneObjs[nObjects].texture.id = -1; // No texture
+  sceneObjs[nObjects].texture.scale = 1;
+  sceneObjs[nObjects].x = 0;
+  sceneObjs[nObjects].y = 0;
+  sceneObjs[nObjects].z = 0;
+
+  sceneObjs[nObjects].scale[0] = 1;
+  sceneObjs[nObjects].scale[1] = 1;
+  sceneObjs[nObjects].scale[2] = 1;
+
+  sceneObjs[nObjects].rotation.x = 0;
+  sceneObjs[nObjects].rotation.y = 0;
+  sceneObjs[nObjects].rotation.z = 0;
+
+  nObjects += 1; // New object in scene
+
+  return nObjects;
 }
\ No newline at end of file