X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=a849e05ea9178b03f7693c4f483fd348c2586bb4;hp=8601a4ba2b533ba3e9b70815d1e9bdfc00dd45dc;hb=ed454e61276dbd1e2c6051589b1203698259f1a4;hpb=9a7035519ce904b75c676fbe2db696ec65d8d32b

diff --git a/globals.h b/globals.h
index 8601a4b..a849e05 100644
--- a/globals.h
+++ b/globals.h
@@ -9,10 +9,16 @@
 #define	GLOBALS_H
 
 // Defined values
-#define NMESH 54       // The number of meshes (in the models-textures dir)
+#define NMESH 54        // The number of meshes (in the models-textures dir)
 #define NTEXTURE 30     // The number of textures (in the models-textures dir)
 #define MAXOBJECTS 256
 
+#define LIGHTS 2        // Number of lights in program
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 // Meshes and textures arrays
 extern mesh* meshes[];
 extern texture* textures[];
@@ -24,6 +30,33 @@ extern const char *objectMenuEntries[];
 // Scene object arrays
 extern SceneObject sceneObjs[];
 extern int nObjects;
+extern int curObject;
+extern int buttonSelected;
+extern int manipulateState;
+
+/* Light object arrays and default values */
+extern LightObject lightObjs[];
+
+extern GLfloat defaultPosition[];
+
+extern GLfloat defaultAmbient[];
+extern GLfloat defaultDiffuse[];
+extern GLfloat defaultSpecular[];
+extern GLfloat defaultDirection[];
+
+extern GLfloat defaultCutoff;
+extern GLfloat defaultExponent;
+
+/* Material types */
+extern GLfloat materialAmbient[];
+extern GLfloat materialDiffuse[];
+extern GLfloat materialSpecular[];
+
+/* Light parameters */
+extern GLfloat lightShine;
+extern GLfloat lightGlobalModel[];
+extern GLfloat lightGlobalEmission[];
+extern GLfloat lightBallSize;
 
 // Directories containing models
 extern char *dirDefault1;
@@ -32,27 +65,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;
@@ -61,41 +78,15 @@ extern GLfloat factor;
 /* Length of axis lines */
 extern GLfloat lineLength;
 
-/* Light 0 parameters */
-extern GLfloat diffuse0[];
-extern GLfloat ambient0[];
-extern GLfloat specular0[];
-extern GLfloat direction0[];
-
-extern GLfloat lightPosition0[];
-
-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;
-extern GLfloat zoomFactor, rotateFactor;
+extern GLfloat zoom, rotate, camAngle;
+extern GLfloat zoomFactor, camRotateFactor, camAngleFactor;
+extern GLfloat leftrightFactor, nearfarFactor, bigsmallFactor, updownFactor, rotateFactor, texscaleFactor;
+
+/* Texture state tracking */
+extern int currentGroundTexture, currentMeshTexture;
 
 #endif	/* GLOBALS_H */
\ No newline at end of file