#include <osg/StateSet>
#include <osg/TexEnv>
#include <osg/Texture2D>
-#include <osgDB/Options>
+#include <osgDB/ReaderWriter>
#include <osgDB/ReadFile>
#include <osgDB/Registry>
#include <osgDB/FileUtils>
#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>
// 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::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));
+}
+
+void SGMaterial::_internal_state::add_texture(const std::string &t, int i)
{
+ texture_paths.push_back(std::make_pair(t,i));
}
-SGMaterial::SGMaterial( const osgDB::Options* options,
+SGMaterial::SGMaterial( const SGReaderWriterXMLOptions* options,
const SGPropertyNode *props )
{
init();
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)
{
}
////////////////////////////////////////////////////////////////////////
void
-SGMaterial::read_properties(const osgDB::Options* options,
+SGMaterial::read_properties(const SGReaderWriterXMLOptions* options,
const SGPropertyNode *props)
{
// Gather the path(s) to the texture(s)
}
SGPath tpath("Textures.high");
tpath.append(tname);
- osgDB::Registry* reg = osgDB::Registry::instance();
- string fullTexPath = reg->findDataFile(tpath.str(), options,
- osgDB::CASE_SENSITIVE);
+ string fullTexPath = osgDB::findDataFile(tpath.str(), options);
if (fullTexPath.empty()) {
tpath = SGPath("Textures");
tpath.append(tname);
- fullTexPath = reg->findDataFile(tpath.str(), options,
- osgDB::CASE_SENSITIVE);
+ fullTexPath = osgDB::findDataFile(tpath.str(), options);
}
if (!fullTexPath.empty() ) {
}
}
- 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");
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");
- tree_texture = osgDB::Registry::instance()
- ->findDataFile(treeTexPath, options, osgDB::CASE_SENSITIVE);
+ tree_texture = osgDB::findDataFile(treeTexPath, options);
}
// surface values for use with ground reactions
shininess = props->getDoubleValue("shininess", 1.0);
+ if (props->hasChild("effect"))
+ effect = props->getStringValue("effect");
+
vector<SGPropertyNode_ptr> object_group_nodes =
((SGPropertyNode *)props)->getChildren("object-group");
for (unsigned int i = 0; i < object_group_nodes.size(); i++)
diffuse[i] = (i < 3) ? 0.8 : 1.0;
emission[i] = (i < 3) ? 0.0 : 1.0;
}
+ effect = "Effects/terrain-default";
}
Effect* SGMaterial::get_effect(int n)
return _status[i].effect.get();
}
-void SGMaterial::buildEffectProperties(const osgDB::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("Effects/terrain-default");
+ makeChild(propRoot, "inherits-from")->setStringValue(effect);
SGPropertyNode* paramProp = makeChild(propRoot, "parameters");
SGPropertyNode* materialProp = makeChild(paramProp, "material");
makeChild(materialProp, "ambient")->setValue(SGVec4d(ambient));
SGPropertyNode_ptr effectProp = new SGPropertyNode();
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")
- ->setStringValue(mipmap ? "linear-mipmap-linear" : "nearest");
- makeChild(tex2dProp, "wrap-s")
- ->setStringValue(wrapu ? "repeat" : "clamp");
- makeChild(tex2dProp, "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());
}
}
projects / simgear.git / blobdiff