Replaced some debugging structure David inadvertantly removed.

[flightgear.git] / src / Objects / newmat.cxx

diff --git a/src/Objects/newmat.cxx b/src/Objects/newmat.cxx
index aad28e558b1c40a5dfd257f78a78f87126df4bdb..dab03e1ebda06dc851dcea8a5e7ecbb64cc673aa 100644 (file)
--- a/src/Objects/newmat.cxx
+++ b/src/Objects/newmat.cxx
@@ -76,9 +76,10 @@ FGNewMat::FGNewMat (const SGPropertyNode * props)
     build_ssg_state(false);
 }
 
-FGNewMat::FGNewMat (const string &texture_path)
+FGNewMat::FGNewMat (const string &texpath)
 {
     init();
+    texture_path = texpath;
     build_ssg_state(true);
 }
 
@@ -172,11 +173,7 @@ FGNewMat::load_texture ()
     return false;
   } else {
     SG_LOG( SG_GENERAL, SG_INFO, "Loading deferred texture " << texture_path );
-#ifdef PLIB_1_2_X
-    textured->setTexture((char *)texture_path.c_str(), wrapu, wrapv );
-#else
     textured->setTexture((char *)texture_path.c_str(), wrapu, wrapv, mipmap );
-#endif
     texture_loaded = true;
     return true;
   }
@@ -206,6 +203,15 @@ FGNewMat::build_ssg_state (bool defer_tex_load)
     textured->enable( GL_TEXTURE_2D );
     textured->disable( GL_BLEND );
     textured->disable( GL_ALPHA_TEST );
+#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
     if ( !defer_tex_load ) {
        textured->setTexture( (char *)texture_path.c_str(), wrapu, wrapv );
        texture_loaded = true;