X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fmaterial%2Fmatlib.cxx;h=5de7e01c75d9e227d8fb989370f7049a2b7e5272;hb=675c86582d8b25270897db0a36d0e02388f09bf4;hp=484e0783b3ade1a220f3e1cf7e12ee9e06242dd8;hpb=90c58087e8ebfbeee6c2688bc0b2f34479ca18d6;p=simgear.git

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 484e0783..5de7e01c 100644
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -25,10 +25,6 @@
 #  include <simgear_config.h>
 #endif
 
-#if defined ( __CYGWIN__ )
-#include <ieeefp.h>
-#endif
-
 #include <simgear/compiler.h>
 #include <simgear/constants.h>
 #include <simgear/structure/exception.hxx>
@@ -36,18 +32,7 @@
 #include <string.h>
 #include <string>
 
-#include <osg/AlphaFunc>
-#include <osg/BlendFunc>
-#include <osg/CullFace>
-#include <osg/Material>
-#include <osg/Point>
-#include <osg/PointSprite>
-#include <osg/PolygonMode>
-#include <osg/PolygonOffset>
-#include <osg/StateSet>
-#include <osg/TexEnv>
-#include <osg/TexGen>
-#include <osg/Texture2D>
+#include <osgDB/Registry>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
@@ -58,6 +43,8 @@
 
 #include "mat.hxx"
 
+#include "Effect.hxx"
+#include "Technique.hxx"
 #include "matlib.hxx"
 
 using std::string;
@@ -67,7 +54,7 @@ SGMaterialLib::SGMaterialLib ( void ) {
 }
 
 // Load a library of material properties
-bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char *season,
+bool SGMaterialLib::load( const string &fg_root, const string& mpath,
         SGPropertyNode *prop_root )
 {
     SGPropertyNode materials;
@@ -80,7 +67,10 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char
                 << ex.getMessage() );
         throw;
     }
-
+    osg::ref_ptr<osgDB::ReaderWriter::Options> options
+        = new osgDB::ReaderWriter::Options;
+    options->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_ALL);
+    options->setDatabasePath(fg_root);
     int nMaterials = materials.nChildren();
     for (int i = 0; i < nMaterials; i++) {
         const SGPropertyNode *node = materials.getChild(i);
@@ -95,7 +85,7 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char
                 }
             }
 
-            SGSharedPtr<SGMaterial> m = new SGMaterial(fg_root, node, season);
+            SGSharedPtr<SGMaterial> m = new SGMaterial(options.get(), node);
 
             vector<SGPropertyNode_ptr>names = node->getChildren("name");
             for ( unsigned int j = 0; j < names.size(); j++ ) {
@@ -103,7 +93,7 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char
                 // cerr << "Material " << name << endl;
                 matlib[name] = m;
                 m->add_name(name);
-                SG_LOG( SG_TERRAIN, SG_INFO, "  Loading material "
+                SG_LOG( SG_TERRAIN, SG_DEBUG, "  Loading material "
                         << names[j]->getStringValue() );
             }
         } else {
@@ -115,48 +105,6 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char
     return true;
 }
 
-
-// Load a library of material properties
-bool SGMaterialLib::add_item ( const string &tex_path )
-{
-    string material_name = tex_path;
-    int pos = tex_path.rfind( "/" );
-    material_name = material_name.substr( pos + 1 );
-
-    return add_item( material_name, tex_path );
-}
-
-
-// Load a library of material properties
-bool SGMaterialLib::add_item ( const string &mat_name, const string &full_path )
-{
-    int pos = full_path.rfind( "/" );
-    string tex_name = full_path.substr( pos + 1 );
-    string tex_path = full_path.substr( 0, pos );
-
-    SG_LOG( SG_TERRAIN, SG_INFO, "  Loading material " 
-	    << mat_name << " (" << full_path << ")");
-
-    matlib[mat_name] = new SGMaterial( full_path );
-    matlib[mat_name]->add_name(mat_name);
-
-    return true;
-}
-
-
-// Load a library of material properties
-bool SGMaterialLib::add_item ( const string &mat_name, osg::StateSet *state )
-{
-    matlib[mat_name] = new SGMaterial( state );
-    matlib[mat_name]->add_name(mat_name);
-
-    SG_LOG( SG_TERRAIN, SG_INFO, "  Loading material given a premade "
-	    << "osg::StateSet = " << mat_name );
-
-    return true;
-}
-
-
 // find a material record by material name
 SGMaterial *SGMaterialLib::find( const string& material ) {
     SGMaterial *result = NULL;
@@ -175,19 +123,20 @@ SGMaterialLib::~SGMaterialLib ( void ) {
 }
 
 const SGMaterial*
-SGMaterialLib::findMaterial(const osg::StateSet* stateSet)
+SGMaterialLib::findMaterial(const osg::Geode* geode)
 {
-  if (!stateSet)
-    return 0;
-  
-  const osg::Referenced* base = stateSet->getUserData();
-  if (!base)
-    return 0;
-
-  const SGMaterialUserData* matUserData
-    = dynamic_cast<const SGMaterialUserData*>(base);
-  if (!matUserData)
-    return 0;
-
-  return matUserData->getMaterial();
+    if (!geode)
+        return 0;
+    const simgear::EffectGeode* effectGeode;
+    effectGeode = dynamic_cast<const simgear::EffectGeode*>(geode);
+    if (!effectGeode)
+        return 0;
+    const simgear::Effect* effect = effectGeode->getEffect();
+    if (!effect)
+        return 0;
+    const SGMaterialUserData* userData;
+    userData = dynamic_cast<const SGMaterialUserData*>(effect->getUserData());
+    if (!userData)
+        return 0;
+    return userData->getMaterial();
 }