Added second light, tidied up global variables, renamed drawLine() to drawAxisLines()

* Adjusted lighting parameters to try and get specular lighting to work; no success yet

diff --git a/globals.c b/globals.c
index d01c1f5..87a439d 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -45,17 +45,6 @@ char dataDir[200];  // Stores the directory name for the meshes and textures.
 
 int moving, startx, starty;
 
 
 int moving, startx, starty;
 

-/* Time varying or user-controled variables. */
-float jump = 0.0;
-
-/* Near and far parameters - calculates scene size */
-GLfloat near = -30;
-GLfloat far = 30;
-
-/* Near and far clipping planes - calculates clipping planes */
-GLfloat nearClip = -200;
-GLfloat farClip = 200;
-

 /* Recursion level for floor drawing */
 int drawFloorRecurse = 8;
 
 /* Recursion level for floor drawing */
 int drawFloorRecurse = 8;
 

diff --git a/globals.h b/globals.h
index 8601a4b..5a2b641 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -34,20 +34,6 @@ extern char dataDir[];
 
 extern int moving, startx, starty;
 
 
 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;
 
 /* Recursion level for floor drawing */
 extern int drawFloorRecurse;