materials.xml format update

[simgear.git] / simgear / scene / material / mat.cxx

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 2fc7e9c84c3573c09a958419fbff39ca08e21c5a..8d53f86195a9bb0d0e7d8b61b56ab89b94568943 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -49,6 +49,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sgstream.hxx>
+#include <simgear/scene/model/SGReaderWriterXMLOptions.hxx>
 #include <simgear/props/props_io.hxx>
 #include <simgear/scene/model/model.hxx>
 #include <simgear/scene/util/RenderConstants.hxx>
@@ -67,13 +68,25 @@ using namespace simgear;
 // Constructors and destructor.
 ////////////////////////////////////////////////////////////////////////
 
+SGMaterial::_internal_state::_internal_state(Effect *e, bool l,
+                                             const SGReaderWriterXMLOptions* o)
+    : effect(e), effect_realized(l), options(o)
+{
+}
+
 SGMaterial::_internal_state::_internal_state(Effect *e, const string &t, bool l,
-                                             const osgDB::ReaderWriter::Options* o ) :
-  effect(e), texture_path(t), effect_realized(l), options(o)
+                                             const SGReaderWriterXMLOptions* o)
+    : effect(e), effect_realized(l), options(o)
 {
+    texture_paths.push_back(std::make_pair(t,0));
 }
 
-SGMaterial::SGMaterial( const osgDB::ReaderWriter::Options* options,
+void SGMaterial::_internal_state::add_texture(const std::string &t, int i)
+{
+    texture_paths.push_back(std::make_pair(t,i));
+}
+
+SGMaterial::SGMaterial( const SGReaderWriterXMLOptions* options,
                         const SGPropertyNode *props )
 {
     init();
@@ -81,6 +94,17 @@ SGMaterial::SGMaterial( const osgDB::ReaderWriter::Options* options,
     buildEffectProperties(options);
 }
 
+SGMaterial::SGMaterial( const osgDB::ReaderWriter::Options* options,
+                        const SGPropertyNode *props )
+{
+    osg::ref_ptr<const SGReaderWriterXMLOptions> sgOptions;
+    if (options)
+        sgOptions = new SGReaderWriterXMLOptions(*options);
+    init();
+    read_properties( sgOptions.get(), props );
+    buildEffectProperties(sgOptions.get());
+}
+
 SGMaterial::~SGMaterial (void)
 {
 }
@@ -91,7 +115,7 @@ SGMaterial::~SGMaterial (void)
 ////////////////////////////////////////////////////////////////////////
 
 void
-SGMaterial::read_properties(const osgDB::ReaderWriter::Options* options,
+SGMaterial::read_properties(const SGReaderWriterXMLOptions* options,
                             const SGPropertyNode *props)
 {
                                // Gather the path(s) to the texture(s)
@@ -117,7 +141,34 @@ SGMaterial::read_properties(const osgDB::ReaderWriter::Options* options,
     }
   }
 
-  if (textures.size() == 0) {
+  vector<SGPropertyNode_ptr> texturesets = props->getChildren("texture-set");
+  for (unsigned int i = 0; i < texturesets.size(); i++)
+  {
+    _internal_state st( NULL, false, options );
+    vector<SGPropertyNode_ptr> textures = texturesets[i]->getChildren("texture");
+    for (unsigned int j = 0; j < textures.size(); j++)
+    {
+      string tname = textures[j]->getStringValue();
+      if (tname.empty()) {
+          tname = "unknown.rgb";
+      }
+      SGPath tpath("Textures.high");
+      tpath.append(tname);
+      string fullTexPath = osgDB::findDataFile(tpath.str(), options);
+      if (fullTexPath.empty()) {
+        tpath = SGPath("Textures");
+        tpath.append(tname);
+        fullTexPath = osgDB::findDataFile(tpath.str(), options);
+      }
+      st.add_texture(fullTexPath, textures[j]->getIndex());
+    }
+
+    if (!st.texture_paths.empty() ) {
+      _status.push_back( st );
+    }
+  }
+
+  if (textures.size() == 0 && texturesets.size() == 0) {
     SGPath tpath("Textures");
     tpath.append("Terrain");
     tpath.append("unknown.rgb");
@@ -245,10 +296,12 @@ Effect* SGMaterial::get_effect(int n)
     return _status[i].effect.get();
 }
 
-void SGMaterial::buildEffectProperties(const osgDB::ReaderWriter::Options*
-                                       options)
+void SGMaterial::buildEffectProperties(const SGReaderWriterXMLOptions* options)
 {
     using namespace osg;
+    ref_ptr<SGReaderWriterXMLOptions> xmlOptions;
+    if (options)
+        xmlOptions = new SGReaderWriterXMLOptions(*options);
     ref_ptr<SGMaterialUserData> user = new SGMaterialUserData(this);
     SGPropertyNode_ptr propRoot = new SGPropertyNode();
     makeChild(propRoot, "inherits-from")->setStringValue(effect);
@@ -271,15 +324,17 @@ void SGMaterial::buildEffectProperties(const osgDB::ReaderWriter::Options*
         SGPropertyNode_ptr effectProp = new SGPropertyNode();
         copyProperties(propRoot, effectProp);
         SGPropertyNode* effectParamProp = effectProp->getChild("parameters", 0);
-        SGPropertyNode* texProp = makeChild(effectParamProp, "texture");
-        makeChild(texProp, "image")->setStringValue(matState.texture_path);
-        makeChild(texProp, "filter")
-            ->setStringValue(mipmap ? "linear-mipmap-linear" : "nearest");
-        makeChild(texProp, "wrap-s")
-            ->setStringValue(wrapu ? "repeat" : "clamp");
-        makeChild(texProp, "wrap-t")
-            ->setStringValue(wrapv ? "repeat" : "clamp");
-        matState.effect = makeEffect(effectProp, false, options);
+        for (unsigned int i = 0; i < matState.texture_paths.size(); i++) {
+            SGPropertyNode* texProp = makeChild(effectParamProp, "texture", matState.texture_paths[i].second);
+            makeChild(texProp, "image")->setStringValue(matState.texture_paths[i].first);
+            makeChild(texProp, "filter")
+                ->setStringValue(mipmap ? "linear-mipmap-linear" : "nearest");
+            makeChild(texProp, "wrap-s")
+                ->setStringValue(wrapu ? "repeat" : "clamp");
+            makeChild(texProp, "wrap-t")
+                ->setStringValue(wrapv ? "repeat" : "clamp");
+        }
+        matState.effect = makeEffect(effectProp, false, xmlOptions.get());
         matState.effect->setUserData(user.get());
     }
 }