Moved some of the low level scene graph construction code over to simgear.

[flightgear.git] / src / Time / light.hxx

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index ac7449b3936a9fa6e4946de22d45383d093877e8..98a5f7dc31bfbb30012b529732e0d4760d7c66ad 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -38,22 +38,22 @@
 #  include <windows.h>
 #endif
 
-#include <GL/glut.h>
-#include <simgear/xgl.h>
+#include GLUT_H
 
 #include <plib/sg.h>                   // plib include
 
-#include <simgear/interpolater.hxx>
-#include <simgear/point3d.hxx>
+#include <simgear/math/interpolater.hxx>
+#include <simgear/math/point3d.hxx>
 
 
 // Define a structure containing the global lighting parameters
 class fgLIGHT {
 
     // Lighting look up tables (based on sun angle with local horizon)
-    fgINTERPTABLE *ambient_tbl;
-    fgINTERPTABLE *diffuse_tbl;
-    fgINTERPTABLE *sky_tbl;
+    SGInterpTable *ambient_tbl;
+    SGInterpTable *diffuse_tbl;
+    SGInterpTable *specular_tbl;
+    SGInterpTable *sky_tbl;
 
 public:
 
@@ -113,10 +113,13 @@ public:
     // Derived lighting values
 
     // ambient component
-    GLfloat scene_ambient[3];
+    GLfloat scene_ambient[4];
 
     // diffuse component
-    GLfloat scene_diffuse[3];
+    GLfloat scene_diffuse[4];
+
+    // diffuse component
+    GLfloat scene_specular[4];
 
     // fog color
     GLfloat fog_color[4];