X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=f2cdd0d7dbeb7f09c721883e9c56a67d79e931cb;hp=c7d62d214751eedfc25aa6df3b627da42a06231b;hb=78ee002d22bec0b0084d791e6f5146be4400bac0;hpb=94605c9ba4cad948d4488cb87cb8134240adf8c2 diff --git a/globals.h b/globals.h index c7d62d2..f2cdd0d 100644 --- 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 +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + // 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 lightBallSize + /* 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;