Remove a possible glut dependency and do some code cleaning

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 3e82eb7ab08659db61ed32fc4e53f4f8c93adc66..a4675a8ae0660aaff9fa0216e24e0d9e50a928b5 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -101,16 +101,9 @@
 #include "splash.hxx"
 #include "fg_commands.hxx"
 #include "fg_io.hxx"
-
-
-glPointParameterfProc glPointParameterfPtr = 0;
-glPointParameterfvProc glPointParameterfvPtr = 0;
-bool glPointParameterIsSupported = false;
+#include "main.hxx"
 
 float default_attenuation[3] = {1.0, 0.0, 0.0};
-//Required for using GL_extensions
-void fgLoadDCS (void);
-void fgUpdateDCS (void);
 ssgSelector *ship_sel=NULL;
 // upto 32 instances of a same object can be loaded.
 ssgTransform *ship_pos[32];
@@ -127,6 +120,10 @@ float scene_farplane = 120000.0f;
 
 static double delta_time_sec = 0.0;
 
+glPointParameterfProc glPointParameterfPtr = 0;
+glPointParameterfvProc glPointParameterfvPtr = 0;
+bool glPointParameterIsSupported = false;
+
 
 #ifdef FG_WEATHERCM
 #  include <WeatherCM/FGLocalWeatherDatabase.h>

diff --git a/src/Main/main.hxx b/src/Main/main.hxx
index 7050224302641a1ea2a1e0a813dda1b75b5f4272..9169771d15a968107b2a4502dff1bd2a3cb115ba 100644 (file)
--- a/src/Main/main.hxx
+++ b/src/Main/main.hxx
@@ -2,10 +2,15 @@
 #ifndef __FG_MAIN_HXX
 #define __FG_MAIN_HXX 1
 
-class SGSky;
+#include <simgear/screen/extensions.hxx>
 
+class SGSky;
 extern SGSky *thesky;
 
+extern glPointParameterfProc glPointParameterfPtr;
+extern glPointParameterfvProc glPointParameterfvPtr;
+extern bool glPointParameterIsSupported;
+
 void fgLoadDCS (void);
 void fgUpdateDCS (void);
 void fgBuildRenderStates( void );
@@ -14,8 +19,6 @@ void fgRenderFrame();
 void fgUpdateTimeDepCalcs();
 void fgInitTimeDepCalcs( void );
 void fgReshape( int width, int height );
-void fgLoadDCS(void);
-void fgUpdateDCS (void);
 
 bool fgMainInit( int argc, char **argv );
 

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index c92cd52e1d60492dfaba77386b33cb0bd514b73a..deed1aa4981a9633581a778b4a0095807185689e 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -27,6 +27,9 @@
 
 #include <simgear/compiler.h>
 
+#include <Main/main.hxx>
+
+
 #include STL_STRING
 
 #include <simgear/bucket/newbucket.hxx>
@@ -448,28 +451,24 @@ void FGTileEntry::prep_ssg_node( const Point3D& p, sgVec3 up, float vis) {
 // Set up lights rendering call backs
 static int fgLightsPredraw( ssgEntity *e ) {
 #if 0
-#ifdef GL_EXT_point_parameters
-    if (glutExtensionSupported("GL_EXT_point_parameters")) {
+    if (glPointParameterIsSupported) {
         static float quadratic[3] = {1.0, 0.01, 0.0001};
         glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, quadratic);
         glPointParameterfEXT(GL_POINT_SIZE_MIN_EXT, 1.0); 
         glPointSize(4.0);
     }
-#endif
 #endif
     return true;
 }
 
 static int fgLightsPostdraw( ssgEntity *e ) {
 #if 0
-#ifdef GL_EXT_point_parameters
-    if (glutExtensionSupported("GL_EXT_point_parameters")) {
+    if (glPointParameterIsSupported) {
         static float default_attenuation[3] = {1.0, 0.0, 0.0};
         glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT,
                               default_attenuation);
         glPointSize(1.0);
     }
-#endif
 #endif
     return true;
 }