X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=0124faf6ed1170daad9d45f417ba35234190ea42;hp=87a439d812ed28921e1694487db7acf16eeccab4;hb=600240b234c1a3e01560332b6b0f230fbcf48ac3;hpb=03efe5959d1dd8ca3f254d95e1a1d399d6e41c35 diff --git a/globals.c b/globals.c index 87a439d..0124faf 100644 --- a/globals.c +++ b/globals.c @@ -48,8 +48,9 @@ int moving, startx, starty; /* Recursion level for floor drawing */ int drawFloorRecurse = 8; -/* Size of floor, from -n to n */ +/* Size of floor, from -n to n, floorSize must be divisible by squareSize */ int floorSize = 200; +float squareSize = 2; /* Current camera x, y, z coords */ GLfloat camx = 0.0, camy = 0.0, camz = 0.0, keyrot = 0.0; @@ -93,4 +94,7 @@ GLfloat zoom = 0.0, rotate = 0.0; GLfloat zoomFactor = 0.2, rotateFactor = 0.5; /* Beginning width, height */ -int width = 500, height = 500; \ No newline at end of file +int width = 500, height = 500; + +/* Texture state tracking */ +int currentGroundTexture = 0, currentMeshTexture = 0; \ No newline at end of file