X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=441b3c9b22bb4b75bde312ae57a0d321a34c1270;hp=bb5760358f1e312975f2cd05c5310f00fee1aa09;hb=821c28d874f5560d63a57ed73bc77b11337c3280;hpb=139101a6a30d0fdefafe6c2b5f23a80d3ae9f114 diff --git a/helper.c b/helper.c index bb57603..441b3c9 100644 --- a/helper.c +++ b/helper.c @@ -207,100 +207,160 @@ 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); - +void drawFloor() { + if ( currentGroundTexture == 0 ) { + getTexture(1); + glBindTexture(GL_TEXTURE_2D, 1); } else { - // Draw square. - // **NOTE: Is the polygon facing in the right direction? - - float xm = (x1 + x2) / 2.0; - drawSquare(recurseLevel, ) - - glBegin(GL_QUADS); - glNormal3f(0,1,0); - glVertex3f(x1, 0.0, z1); - glVertex3f(x1, 0.0, z2); - glVertex3f(x2, 0.0, z2); - glVertex3f(x2, 0.0, z1); - glEnd(); - }*/ - - unsigned int GridSizeX = 100; - unsigned int GridSizeY = 100; - unsigned int SizeX = 2; - unsigned int SizeY = 2; + getTexture(currentGroundTexture); + glBindTexture(GL_TEXTURE_2D, currentGroundTexture); + } - - for (unsigned int x =-GridSizeX;x