Merge branch 'zan/stencil'

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

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 3a9e96738bebe338f0d6e51a3bb8ee72a15888cb..2fc7e9c84c3573c09a958419fbff39ca08e21c5a 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -131,11 +131,14 @@ SGMaterial::read_properties(const osgDB::ReaderWriter::Options* options,
   wrapv = props->getBoolValue("wrapv", true);
   mipmap = props->getBoolValue("mipmap", true);
   light_coverage = props->getDoubleValue("light-coverage", 0.0);
-  tree_coverage = props->getDoubleValue("tree-coverage", 0.0);
+  wood_coverage = props->getDoubleValue("wood-coverage", 0.0);
+  wood_size = props->getDoubleValue("wood-size", 0.0);
+  tree_density = props->getDoubleValue("tree-density", 1.0);
   tree_height = props->getDoubleValue("tree-height-m", 0.0);
   tree_width = props->getDoubleValue("tree-width-m", 0.0);
   tree_range = props->getDoubleValue("tree-range-m", 0.0);
   tree_varieties = props->getIntValue("tree-varieties", 1);
+
   const SGPropertyNode* treeTexNode = props->getChild("tree-texture");
   if (treeTexNode) {
     string treeTexPath = props->getStringValue("tree-texture");
@@ -246,6 +249,7 @@ void SGMaterial::buildEffectProperties(const osgDB::ReaderWriter::Options*
                                        options)
 {
     using namespace osg;
+    ref_ptr<SGMaterialUserData> user = new SGMaterialUserData(this);
     SGPropertyNode_ptr propRoot = new SGPropertyNode();
     makeChild(propRoot, "inherits-from")->setStringValue(effect);
     SGPropertyNode* paramProp = makeChild(propRoot, "parameters");
@@ -268,15 +272,15 @@ void SGMaterial::buildEffectProperties(const osgDB::ReaderWriter::Options*
         copyProperties(propRoot, effectProp);
         SGPropertyNode* effectParamProp = effectProp->getChild("parameters", 0);
         SGPropertyNode* texProp = makeChild(effectParamProp, "texture");
-        SGPropertyNode* tex2dProp = makeChild(texProp, "texture2d");
-        makeChild(tex2dProp, "image")->setStringValue(matState.texture_path);
-        makeChild(tex2dProp, "filter")
+        makeChild(texProp, "image")->setStringValue(matState.texture_path);
+        makeChild(texProp, "filter")
             ->setStringValue(mipmap ? "linear-mipmap-linear" : "nearest");
-        makeChild(tex2dProp, "wrap-s")
+        makeChild(texProp, "wrap-s")
             ->setStringValue(wrapu ? "repeat" : "clamp");
-        makeChild(tex2dProp, "wrap-t")
+        makeChild(texProp, "wrap-t")
             ->setStringValue(wrapv ? "repeat" : "clamp");
         matState.effect = makeEffect(effectProp, false, options);
+        matState.effect->setUserData(user.get());
     }
 }