(no commit message)

[atyndall/cits2231.git] / globals.h

diff --git a/globals.h b/globals.h
index 640c323..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;
+extern int curObject;
+extern int buttonSelected;
+extern int manipulateState;
 
 // Directories containing models
 extern char *dirDefault1;
@@ -32,27 +35,11 @@ extern char *dirDefault2;
 // Stores the directory name for the meshes and textures.
 extern char dataDir[];
 
-extern int moving, startx, starty;
-
-/* Time varying or user-controled variables. */
-extern float jump;
-extern float lightAngle, lightHeight;
-extern GLfloat angle;
-extern GLfloat angle2;
-
-/* Near and far parameters - calculates scene size */
-extern GLfloat near;
-extern GLfloat far;
-
-/* Near and far clipping planes - calculates clipping planes */
-extern GLfloat nearClip;
-extern GLfloat farClip;
-
-/* Recursion level for floor drawing */
-extern int drawFloorRecurse;
+extern int startx, starty;
 
 /* Size of floor, from -n to n */
 extern int floorSize;
+extern float squareSize;
 
 /* Current camera position */
 extern GLfloat camx, camy, camz, keyrot;
@@ -67,7 +54,6 @@ extern GLfloat ambient0[];
 extern GLfloat specular0[];
 extern GLfloat direction0[];
 
-extern GLfloat lightColor0[];
 extern GLfloat lightPosition0[];
 
 extern float lightAngle0, lightHeight0;
@@ -79,7 +65,6 @@ extern GLfloat ambient1[];
 extern GLfloat specular1[];
 extern GLfloat direction1[];
 
-extern GLfloat lightColor1[];
 extern GLfloat lightPosition1[];
 
 extern float lightAngle1, lightHeight1;
@@ -97,7 +82,11 @@ extern GLfloat emission[];
 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;
 
 #endif /* GLOBALS_H */
\ No newline at end of file