Minor texture tweaks.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 81dd78176115b76afc36260059f846dfc815bc53..f11a01b602e46fddc840bd8739d510c30eef04aa 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -53,6 +53,10 @@
 #  include <unistd.h>          // for stat()
 #endif
 
+#ifdef HAVE_LIBX11
+#  include <GL/glext.h>
+#endif
+
 #include <plib/pu.h>
 #include <plib/ssg.h>
 
@@ -1450,6 +1454,20 @@ int main( int argc, char **argv ) {
     // fonts !!!
     guiInit();
 
+#ifdef GL_EXT_texture_lod_bias
+    glTexEnvf( GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, -0.5 ) ;
+#endif
+
+#if 0
+#ifdef GL_EXT_texture_filter_anisotropic
+    float max_anisotropy;
+    glGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy );
+    glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
+                     max_anisotropy );
+    cout << "Max anisotropy = " << max_anisotropy << endl;
+#endif
+#endif
+
     // set current_options lon/lat if an airport id is specified
     // cout << "3. airport_id = " << fgGetString("/sim/startup/airport-id") << endl;
     if ( fgGetString("/sim/startup/airport-id").length() ) {

diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx
index 4fcc1bd5de79a3de4d287ec7f7098e2d2e9858c9..ac2be6b947324c9dc2168562000846a405ad965d 100644 (file)
--- a/src/Objects/matlib.cxx
+++ b/src/Objects/matlib.cxx
@@ -292,7 +292,7 @@ void FGMaterialLib::load_next_deferred() {
                 setTexture( (char *)slot.get_texture_name_c_str(), 0, 0 );
 #else
             slot.get_textured()->
-                setTexture( (char *)slot.get_texture_name_c_str(), 0, 0, 0 );
+                setTexture( (char *)slot.get_texture_name_c_str(), 0, 0, 1 );
 #endif
             slot.set_texture_loaded( true );
         }

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index 1f792db11ae508c4531f2421863634287e94fcdb..afd8107ab95334c9183e44a0dd51bdcd5c05e9e0 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -903,7 +903,7 @@ static ssgLeaf *gen_leaf( const string& path,
 
 // Load an Binary obj file
 ssgBranch *fgBinObjLoad( const string& path, FGTileEntry *t,
-                               ssgVertexArray *lights, const bool is_base)
+                         ssgVertexArray *lights, const bool is_base)
 {
     int i;