git.ucc.asn.au
/
atyndall
/
cits2231.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[atyndall/cits2231.git]
/
globals.c
diff --git
a/globals.c
b/globals.c
index
87a439d
..
0124faf
100644
(file)
--- a/
globals.c
+++ b/
globals.c
@@
-48,8
+48,9
@@
int moving, startx, starty;
/* Recursion level for floor drawing */
int drawFloorRecurse = 8;
/* 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;
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;
/* 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 */
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
UCC
git Repository :: git.ucc.asn.au