X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=aed5e9a818ccafb7500d712ce07032ae2e7491c7;hp=a5eb30cb8262a4400749e82a315fd187eca48acd;hb=b3a3d7099dce9e51d7163d724106e2e2fd8d9973;hpb=a54caedf9a742fc205361ef49e50e83f1bc9d41e

diff --git a/helper.c b/helper.c
index a5eb30c..aed5e9a 100644
--- a/helper.c
+++ b/helper.c
@@ -207,72 +207,128 @@ int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSiz
 }
 
 /**
- * Recursive function to draw a square by drawing smaller and smaller
- * divisions of the square, determined by drawFloorRecurse.
- * @param recurseLevel Current level of recursion, only pass 0
- * @param x1 top-left x
- * @param z1 top-left z
- * @param x2 bottom-left x
- * @param z2 bottom-left z
+ * Draw a floor by looping over the floorSize and squareSize variables
  */
-void drawSquare(int recurseLevel, float x1, float z1, float x2, float z2) {
-
-  if ( drawFloorRecurse != recurseLevel ) {
-    // Calculate middle points
-    float xm = (x1 + x2) / 2.0;
-    float zm = (z1 + z2) / 2.0;
-
-    // Increment recursion level
-    int rnew = recurseLevel + 1;
-
-    // Split into four sub-quads
-    drawSquare(rnew, x1, z1, xm, zm);
-    drawSquare(rnew, x1, zm, xm, z2);
-    drawSquare(rnew, xm, zm, x2, z2);
-    drawSquare(rnew, xm, z1, x2, zm);
-
-  } else {
-    // Draw square.
-    // **NOTE: Is the polygon facing in the right direction?
-    glBegin(GL_QUADS);
-      glVertex3f(x1, 0.0, z1);
-      glVertex3f(x1, 0.0, z2);
-      glVertex3f(x2, 0.0, z2);
-      glVertex3f(x2, 0.0, z1);
-    glEnd();
+void drawFloor() {
+  if ( currentGroundTexture != 0 ) {
+    getTexture(currentGroundTexture);
+    glBindTexture(GL_TEXTURE_2D, currentGroundTexture);
   }
 
-}
+	glBegin(GL_QUADS);
 
-/**
- * Draw a floor by calling the drawSquare recursion
- */
-void drawFloor() {
-  drawSquare(0, -floorSize, -floorSize, floorSize, floorSize);
+  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)*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 );
+        }
+      }
+    }
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  /*
+    for ( int x = -floorSize; x < floorSize; x++ ) {
+      for ( int z = -floorSize; z < floorSize; z++ ) {
+        glColor3f( 1.0, 1.0, 1.0 );
+        
+        glTexCoord2f( 1.0, 1.0 );
+        glVertex3f  ( (x+1)*squareSize, 0.0, (z+1)*squareSize );
+
+        glTexCoord2f( 1.0, 0.0 );
+        glVertex3f  ( (x+1)*squareSize, 0.0,     z*squareSize );
+
+        glTexCoord2f( 0.0, 0.0 );
+        glVertex3f  (     x*squareSize, 0.0,     z*squareSize );
+
+        glTexCoord2f( 0.0, 1.0 );
+        glVertex3f  (     x*squareSize, 0.0, (z+1)*squareSize );
+      }
+    }*/
+	glEnd();
+
+  if ( currentGroundTexture != 0 ) {
+    glBindTexture(GL_TEXTURE_2D, 0);
+  }
 }
 
 /**
  * Draw x, z axis on floor
  */
-void drawLine() {
-    // **NOTE: fix function
-    glDisable(GL_TEXTURE_2D);
-    glDisable(GL_LIGHTING);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    glColor4ub( 0.0, 0.0, 0.0, 0.0 );
-
-    glBegin(GL_LINES);
-    glVertex3i(  lineLength, 1.0, 0.0 );
-    glVertex3i( -lineLength, 1.0, 0.0 );
-    glEnd();
-
-    glBegin(GL_LINES);
-    glVertex3i( 0.0, 1.0,  lineLength );
-    glVertex3i( 0.0, 1.0, -lineLength );
-    glEnd();
-
-    glDisable(GL_BLEND);
-    glEnable(GL_LIGHTING);
-    glEnable(GL_TEXTURE_2D);
+void drawAxisLines() {
+  // **NOTE: Function does not currently draw arrow-heads
+
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_LIGHTING);
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glEnable(GL_LINE_SMOOTH);
+  glColor3f( 0.0, 0.0, 0.0 );
+
+  float arrowLength = 1.0;
+
+  glBegin(GL_LINES);
+    // x arrow
+    glVertex3i(  lineLength, 0.0, 0.0 );
+    glVertex3i( -lineLength, 0.0, 0.0 );
+    
+    // x arrowheads
+    glVertex3i(  lineLength, 0.0, 0.0 );
+    glVertex3i(  lineLength - arrowLength, 0.0,  1.0 );
+
+    glVertex3i(  lineLength, 0.0, 0.0 );
+    glVertex3i(  lineLength - arrowLength, 0.0, -1.0 );
+
+    // z arrow
+    glVertex3i(  0.0, 0.0,  lineLength );
+    glVertex3i(  0.0, 0.0, -lineLength );
+
+    // z arrowheads
+    glVertex3i(  0.0, 0.0,  lineLength );
+    glVertex3i(  1.0, 0.0,  lineLength - arrowLength );
+
+    glVertex3i(  0.0, 0.0,  lineLength );
+    glVertex3i( -1.0, 0.0,  lineLength - arrowLength );
+  glEnd();
+
+  glDisable(GL_BLEND);
+  glEnable(GL_LIGHTING);
+  glEnable(GL_TEXTURE_2D);
 }
\ No newline at end of file