X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=5dd4300ff9b752da63fcab86cd4f3b098ad43679;hp=6f6a6262173daad58293c4625724e66fb0635b2c;hb=7862999a5314cfc2b287d719e3d2dde05df21ae8;hpb=84eea711e741871dfb6cc595a0989e1369998d7f

diff --git a/globals.h b/globals.h
index 6f6a626..5dd4300 100644
--- 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,38 +35,15 @@ extern char *dirDefault2;
 // Stores the directory name for the meshes and textures.
 extern char dataDir[];
 
-// Lighting
-extern GLfloat lightColor[];
-extern GLfloat lightPosition[];
-
-extern int moving, startx, starty;
-extern int lightMoving, lightStartX, lightStartY;
-
-/* 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;
-
-/* Zoom factor for mouse movements */
-extern GLfloat zoomFactor;
-
-/* 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, rot;
+extern GLfloat camx, camy, camz, keyrot;
+extern GLfloat factor;
 
 /* Length of axis lines */
 extern GLfloat lineLength;
@@ -72,19 +52,41 @@ extern GLfloat lineLength;
 extern GLfloat diffuse0[];
 extern GLfloat ambient0[];
 extern GLfloat specular0[];
-extern GLfloat emission0[];
-
 extern GLfloat direction0[];
-extern GLfloat light0_pos[];
 
-extern GLfloat shine;
+extern GLfloat lightPosition0[];
 
-extern GLfloat glightmodel[];
+extern float lightAngle0, lightHeight0;
+extern int lightMoving0, lightStartX0, lightStartY0;
+
+/* Light 1 parameters */
+extern GLfloat diffuse1[];
+extern GLfloat ambient1[];
+extern GLfloat specular1[];
+extern GLfloat direction1[];
+
+extern GLfloat lightPosition1[];
+
+extern float lightAngle1, lightHeight1;
+extern int lightMoving1, lightStartX1, lightStartY1;
 
 /* Material types */
 extern GLfloat ambient[];
 extern GLfloat diffuse[];
 extern GLfloat specular[];
+extern GLfloat shine;
+extern GLfloat glightmodel[];
+extern GLfloat emission[];
+
+/* Beginning width, height */
+extern int width, height;
+
+/* Zoom and rotate tracking */
+extern GLfloat zoom, rotate, camAngle;
+extern GLfloat zoomFactor, camRotateFactor, camAngleFactor;
+extern GLfloat leftrightFactor, nearfarFactor, bigsmallFactor, updownFactor, rotateFactor, texscaleFactor;
 
-#endif	/* GLOBALS_H */
+/* Texture state tracking */
+extern int currentGroundTexture, currentMeshTexture;
 
+#endif	/* GLOBALS_H */
\ No newline at end of file