#endif
#include <GL/glut.h>
-#include <simgear/xgl.h>
+#include <GL/gl.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 *sky_tbl;
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];