(no commit message)

[atyndall/cits2231.git] / globals.h

diff --git a/globals.h b/globals.h
index c7d62d2..f2cdd0d 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -13,6 +13,10 @@
 #define NTEXTURE 30     // The number of textures (in the models-textures dir)
 #define MAXOBJECTS 256
 
 #define NTEXTURE 30     // The number of textures (in the models-textures dir)
 #define MAXOBJECTS 256
 

+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+

 // Meshes and textures arrays
 extern mesh* meshes[];
 extern texture* textures[];
 // Meshes and textures arrays
 extern mesh* meshes[];
 extern texture* textures[];


@@ -78,13 +82,15 @@ extern GLfloat shine;
 extern GLfloat glightmodel[];
 extern GLfloat emission[];
 
 extern GLfloat glightmodel[];
 extern GLfloat emission[];
 

+extern GLfloat lightBallSize
+

 /* Beginning width, height */
 extern int width, height;
 
 /* Zoom and rotate tracking */
 extern GLfloat zoom, rotate, camAngle;
 /* Beginning width, height */
 extern int width, height;
 
 /* Zoom and rotate tracking */
 extern GLfloat zoom, rotate, camAngle;

-extern GLfloat zoomFactor, rotateFactor, camAngleFactor;
-extern GLfloat leftrightFactor, nearfarFactor, bigsmallFactor, updownFactor;
+extern GLfloat zoomFactor, camRotateFactor, camAngleFactor;
+extern GLfloat leftrightFactor, nearfarFactor, bigsmallFactor, updownFactor, rotateFactor, texscaleFactor;

 
 /* Texture state tracking */
 extern int currentGroundTexture, currentMeshTexture;
 
 /* Texture state tracking */
 extern int currentGroundTexture, currentMeshTexture;