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
2fa97d5
..
8696125
100644
(file)
--- a/
globals.c
+++ b/
globals.c
@@
-49,7
+49,7
@@
int moving, startx, starty;
int drawFloorRecurse = 8;
/* Size of floor, from -n to n, floorSize must be divisible by squareSize */
int drawFloorRecurse = 8;
/* Size of floor, from -n to n, floorSize must be divisible by squareSize */
-int floorSize =
3
00;
+int floorSize =
2
00;
float squareSize = 2;
/* Current camera x, y, z coords */
float squareSize = 2;
/* Current camera x, y, z coords */
@@
-82,7
+82,7
@@
float lightAngle1 = 360.0, lightHeight1 = 5;
int lightMoving1 = 0, lightStartX1, lightStartY1;
/* Material types */
int lightMoving1 = 0, lightStartX1, lightStartY1;
/* Material types */
-GLfloat ambient[] = {0.
2, 0.2, 0.2
, 1.0};
+GLfloat ambient[] = {0.
5, 0.5, 0.5
, 1.0};
GLfloat diffuse[] = {1.0, 0.8, 0.0, 1.0};
GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
GLfloat shine = 100.0;
GLfloat diffuse[] = {1.0, 0.8, 0.0, 1.0};
GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
GLfloat shine = 100.0;
@@
-94,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