X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=ab96c884b582b1995ef2e2bfcd1e9af3e33d018e;hp=8218e4913d4f75dc0f28ff38502f06839e8a9aa7;hb=f62aef4de83dd13677a8e436597abbc139d06ea3;hpb=97544a3f032847e912e6a42380cda28c99a1a66c;ds=sidebyside

diff --git a/helper.c b/helper.c
index 8218e49..ab96c88 100644
--- a/helper.c
+++ b/helper.c
@@ -210,78 +210,38 @@ 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);
-
-  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 );
-
-          glTexCoord2f( tx+textureTileSize, tz+textureTileSize );
-          glVertex3f  ( (x+1)*squareSize, 0.0, (z+1)*squareSize );
-
-          glTexCoord2f( tx+textureTileSize, tz );
-          glVertex3f  ( (x+1)*squareSize, 0.0,     z*squareSize );
-
-          glTexCoord2f( tx, tz );
-          glVertex3f  (     x*squareSize, 0.0,     z*squareSize );
-
-          glTexCoord2f( tx, tz+textureTileSize );
-          glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
-        }
-      }
-    }
-  }
-
-
-
-
-
-
-
-
-
-
-
+	glBegin(GL_QUADS);  
 
-
-
-
-
-
-
-
-
-
-
-  /*
     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
-        
+
+        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 ) {
@@ -331,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