Latest JSBSim changes, mostly to support yaw and roll trim.

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

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index f378ff183e961e63dc74bc9775ee37209664fda2..b1dd41ab853912197fe253ab9a774ff059267b94 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -39,21 +39,21 @@
 #endif
 
 #include <GL/glut.h>
-#include <XGL/xgl.h>
+#include <GL/gl.h>
 
 #include <plib/sg.h>                   // plib include
 
-#include <Math/interpolater.hxx>
-#include <Math/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 *sky_tbl;
 
 public:
 
@@ -113,10 +113,10 @@ public:
     // Derived lighting values
 
     // ambient component
-    GLfloat scene_ambient[3];
+    GLfloat scene_ambient[4];
 
     // diffuse component
-    GLfloat scene_diffuse[3];
+    GLfloat scene_diffuse[4];
 
     // fog color
     GLfloat fog_color[4];
@@ -149,5 +149,3 @@ extern fgLIGHT cur_light_params;
 
 
 #endif // _LIGHT_HXX
-
-