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.h
diff --git
a/globals.h
b/globals.h
index
b3d0d6b
..
c7d62d2
100644
(file)
--- a/
globals.h
+++ b/
globals.h
@@
-24,6
+24,9
@@
extern const char *objectMenuEntries[];
// Scene object arrays
extern SceneObject sceneObjs[];
extern int nObjects;
// Scene object arrays
extern SceneObject sceneObjs[];
extern int nObjects;
+extern int curObject;
+extern int buttonSelected;
+extern int manipulateState;
// Directories containing models
extern char *dirDefault1;
// Directories containing models
extern char *dirDefault1;
@@
-32,10
+35,7
@@
extern char *dirDefault2;
// Stores the directory name for the meshes and textures.
extern char dataDir[];
// Stores the directory name for the meshes and textures.
extern char dataDir[];
-extern int moving, startx, starty;
-
-/* Recursion level for floor drawing */
-extern int drawFloorRecurse;
+extern int startx, starty;
/* Size of floor, from -n to n */
extern int floorSize;
/* Size of floor, from -n to n */
extern int floorSize;
@@
-82,8
+82,9
@@
extern GLfloat emission[];
extern int width, height;
/* Zoom and rotate tracking */
extern int width, height;
/* Zoom and rotate tracking */
-extern GLfloat zoom, rotate;
-extern GLfloat zoomFactor, rotateFactor;
+extern GLfloat zoom, rotate, camAngle;
+extern GLfloat zoomFactor, rotateFactor, camAngleFactor;
+extern GLfloat leftrightFactor, nearfarFactor, bigsmallFactor, updownFactor;
/* Texture state tracking */
extern int currentGroundTexture, currentMeshTexture;
/* Texture state tracking */
extern int currentGroundTexture, currentMeshTexture;
UCC
git Repository :: git.ucc.asn.au