(no commit message)

[atyndall/cits2231.git] / helper.c

diff --git a/helper.c b/helper.c
index e72c64e..1e7c568 100644 (file)
--- a/helper.c
+++ b/helper.c
@@ -210,80 +210,38 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
  * Draw a floor by looping over the floorSize and squareSize variables
  */
 void drawFloor() {
  * 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);
   }
 
     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 );
-
-          printf("Creating a subtile. Width: %d, x: %d, z: %d, tx: %d, tz: %d\n", subTileWidth, x, z, tx, tz);
-
-          glTexCoord2f( tx+textureTileSize, tz+textureTileSize );
-          glVertex3f  ( (x+1)*subTileWidth, 0.0, (z+1)*subTileWidth );
-
-          glTexCoord2f( tx+textureTileSize, tz );
-          glVertex3f  ( (x+1)*subTileWidth, 0.0,     z*subTileWidth );
-
-          glTexCoord2f( tx, tz );
-          glVertex3f  (     x*subTileWidth, 0.0,     z*subTileWidth );
-
-          glTexCoord2f( tx, tz+textureTileSize );
-          glVertex3f  (     x*subTileWidth, 0.0, (z+1)*subTileWidth );
-        }
-      }
-    }
-  }
-
-
-
-
-
-
-
-
-
-
-
+       glBegin(GL_QUADS);  

 
 

-
-
-
-
-
-
-
-
-
-
-  /*

     for ( int x = -floorSize; x < floorSize; x++ ) {
       for ( int z = -floorSize; z < floorSize; z++ ) {
         glColor3f( 1.0, 1.0, 1.0 );
     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 );
 
         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 );
 
         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 );
 
         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 );
       }
         glTexCoord2f( 0.0, 1.0 );
         glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
       }

-    }*/
+    }
+

        glEnd();
 
   if ( currentGroundTexture != 0 ) {
        glEnd();
 
   if ( currentGroundTexture != 0 ) {


@@ -333,4 +291,28 @@ void drawAxisLines() {
   glDisable(GL_BLEND);
   glEnable(GL_LIGHTING);
   glEnable(GL_TEXTURE_2D);
   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 = -1; // No texture
+  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
 }
\ No newline at end of file