(no commit message)

[atyndall/cits2231.git] / globals.h

diff --git a/globals.h b/globals.h
index e85ea25..6f6a626 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -39,16 +39,20 @@ extern GLfloat lightPosition[];
 extern int moving, startx, starty;
 extern int lightMoving, lightStartX, lightStartY;
 
 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;
 
 extern float jump;
 extern float lightAngle, lightHeight;
 extern GLfloat angle;
 extern GLfloat angle2;
 

-/* Near and far parameters */
+/* Near and far parameters - calculates scene size */

 extern GLfloat near;
 extern GLfloat far;
 
 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;
 
 /* Zoom factor for mouse movements */
 extern GLfloat zoomFactor;
 


@@ -58,13 +62,29 @@ extern int drawFloorRecurse;
 /* Size of floor, from -n to n */
 extern int floorSize;
 
 /* Size of floor, from -n to n */
 extern int floorSize;
 

+/* Current camera position */
+extern GLfloat camx, camy, camz, rot;
+
+/* Length of axis lines */
+extern GLfloat lineLength;
+

 /* Light 0 parameters */
 extern GLfloat diffuse0[];
 extern GLfloat ambient0[];
 extern GLfloat specular0[];
 extern GLfloat emission0[];
 /* Light 0 parameters */
 extern GLfloat diffuse0[];
 extern GLfloat ambient0[];
 extern GLfloat specular0[];
 extern GLfloat emission0[];

+
+extern GLfloat direction0[];

 extern GLfloat light0_pos[];
 extern GLfloat light0_pos[];

+
+extern GLfloat shine;
+

 extern GLfloat glightmodel[];
 
 extern GLfloat glightmodel[];
 

+/* Material types */
+extern GLfloat ambient[];
+extern GLfloat diffuse[];
+extern GLfloat specular[];
+

 #endif /* GLOBALS_H */
 
 #endif /* GLOBALS_H */