X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fmaterial%2Fmat.cxx;h=91303ac20e67f45ba0e14ef0f8a07eb25e0c5da1;hb=f66e023ea8509de4d36016f2ca093873ef5884d7;hp=f70a9a3b43341538f4c364d4be34e8d987283dd3;hpb=a0fd942048538ff046c3dd0ff335fe765dfbfbf8;p=simgear.git diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx index f70a9a3b..91303ac2 100644 --- a/simgear/scene/material/mat.cxx +++ b/simgear/scene/material/mat.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include "mat.hxx" @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -74,7 +75,7 @@ SGMaterial::_internal_state::_internal_state(Effect *e, bool l, { } -SGMaterial::_internal_state::_internal_state(Effect *e, const string &t, bool l, +SGMaterial::_internal_state::_internal_state(Effect *e, const string &t, bool l, const SGReaderWriterOptions* o) : effect(e), effect_realized(l), options(o) { @@ -87,22 +88,23 @@ void SGMaterial::_internal_state::add_texture(const std::string &t, int i) } SGMaterial::SGMaterial( const SGReaderWriterOptions* options, - const SGPropertyNode *props ) + const SGPropertyNode *props, + SGPropertyNode *prop_root ) { init(); - read_properties( options, props ); + read_properties( options, props, prop_root ); buildEffectProperties(options); } -SGMaterial::SGMaterial( const osgDB::ReaderWriter::Options* options, - const SGPropertyNode *props ) +SGMaterial::SGMaterial( const osgDB::Options* options, + const SGPropertyNode *props, + SGPropertyNode *prop_root) { - osg::ref_ptr sgOptions; - if (options) - sgOptions = new SGReaderWriterOptions(*options); + osg::ref_ptr opt; + opt = SGReaderWriterOptions::copyOrCreate(options); init(); - read_properties( sgOptions.get(), props ); - buildEffectProperties(sgOptions.get()); + read_properties(opt.get(), props, prop_root); + buildEffectProperties(opt.get()); } SGMaterial::~SGMaterial (void) @@ -116,16 +118,19 @@ SGMaterial::~SGMaterial (void) void SGMaterial::read_properties(const SGReaderWriterOptions* options, - const SGPropertyNode *props) + const SGPropertyNode *props, + SGPropertyNode *prop_root) { - // Gather the path(s) to the texture(s) + std::vector dds; std::vector textures = props->getChildren("texture"); for (unsigned int i = 0; i < textures.size(); i++) { string tname = textures[i]->getStringValue(); + if (tname.empty()) { tname = "unknown.rgb"; } + SGPath tpath("Textures.high"); tpath.append(tname); string fullTexPath = SGModelLib::findDataFile(tpath.str(), options); @@ -134,7 +139,13 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, tpath.append(tname); fullTexPath = SGModelLib::findDataFile(tpath.str(), options); } - + + if (tpath.lower_extension() == "dds") { + dds.push_back(true); + } else { + dds.push_back(false); + } + if (!fullTexPath.empty() ) { _internal_state st( NULL, fullTexPath, false, options ); _status.push_back( st ); @@ -152,6 +163,7 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, if (tname.empty()) { tname = "unknown.rgb"; } + SGPath tpath("Textures.high"); tpath.append(tname); string fullTexPath = SGModelLib::findDataFile(tpath.str(), options); @@ -160,6 +172,15 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, tpath.append(tname); fullTexPath = SGModelLib::findDataFile(tpath.str(), options); } + + if (j == 0) { + if (tpath.lower_extension() == "dds") { + dds.push_back(true); + } else { + dds.push_back(false); + } + } + st.add_texture(fullTexPath, textures[j]->getIndex()); } @@ -175,6 +196,52 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, _internal_state st( NULL, tpath.str(), true, options ); _status.push_back( st ); } + + std::vector masks = props->getChildren("object-mask"); + for (unsigned int i = 0; i < masks.size(); i++) + { + string omname = masks[i]->getStringValue(); + + if (! omname.empty()) { + SGPath ompath("Textures.high"); + ompath.append(omname); + string fullMaskPath = SGModelLib::findDataFile(ompath.str(), options); + + if (fullMaskPath.empty()) { + ompath = SGPath("Textures"); + ompath.append(omname); + fullMaskPath = SGModelLib::findDataFile(ompath.str(), options); + } + + osg::Image* image = osgDB::readImageFile(fullMaskPath, options); + if (image->valid()) + { + osg::Texture2D* object_mask = new osg::Texture2D; + + bool dds_mask = (ompath.lower_extension() == "dds"); + + if (dds[i] != dds_mask) { + // Texture format does not match mask format. This is relevant for + // the object mask, as DDS textures have an origin at the bottom + // left rather than top left, therefore we flip the object mask + // vertically. + image->flipVertical(); + } + + object_mask->setImage(image); + + // We force the filtering to be nearest, as the red channel (rotation) + // in particular, doesn't make sense to be interpolated between pixels. + object_mask->setFilter(osg::Texture::MIN_FILTER, osg::Texture::NEAREST); + object_mask->setFilter(osg::Texture::MAG_FILTER, osg::Texture::NEAREST); + + object_mask->setDataVariance(osg::Object::STATIC); + object_mask->setWrap(osg::Texture::WRAP_S, osg::Texture::REPEAT); + object_mask->setWrap(osg::Texture::WRAP_T, osg::Texture::REPEAT); + _masks.push_back(object_mask); + } + } + } xsize = props->getDoubleValue("xsize", 0.0); ysize = props->getDoubleValue("ysize", 0.0); @@ -183,19 +250,29 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, mipmap = props->getBoolValue("mipmap", true); light_coverage = props->getDoubleValue("light-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 = SGModelLib::findDataFile(treeTexPath, options); + + if (! treeTexPath.empty()) { + SGPath treePath("Textures.high"); + treePath.append(treeTexPath); + tree_texture = SGModelLib::findDataFile(treePath.str(), options); + + if (tree_texture.empty()) { + treePath = SGPath("Textures"); + treePath.append(treeTexPath); + tree_texture = SGModelLib::findDataFile(treePath.str(), options); + } + } } - + // surface values for use with ground reactions solid = props->getBoolValue("solid", true); friction_factor = props->getDoubleValue("friction-factor", 1.0); @@ -241,6 +318,14 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options, if (name) glyphs[name] = new SGMaterialGlyph(glyph_nodes[i]); } + + // Read conditions node + const SGPropertyNode *conditionNode = props->getChild("condition"); + if (conditionNode) { + condition = sgReadCondition(prop_root, conditionNode); + } + + } @@ -253,7 +338,6 @@ void SGMaterial::init () { _status.clear(); - _current_ptr = 0; xsize = 0; ysize = 0; wrapu = true; @@ -278,30 +362,52 @@ SGMaterial::init () effect = "Effects/terrain-default"; } -Effect* SGMaterial::get_effect(int n) +Effect* SGMaterial::get_effect(int i) +{ + if(!_status[i].effect_realized) { + _status[i].effect->realizeTechniques(_status[i].options.get()); + _status[i].effect_realized = true; + } + return _status[i].effect.get(); +} + +Effect* SGMaterial::get_effect(SGTexturedTriangleBin triangleBin) { if (_status.size() == 0) { SG_LOG( SG_GENERAL, SG_WARN, "No effect available."); return 0; } - int i = n >= 0 ? n : _current_ptr; - if(!_status[i].effect_realized) { - _status[i].effect->realizeTechniques(_status[i].options.get()); - _status[i].effect_realized = true; + + int i = triangleBin.getTextureIndex() % _status.size(); + return get_effect(i); +} + +Effect* SGMaterial::get_effect() +{ + return get_effect(0); +} + + +osg::Texture2D* SGMaterial::get_object_mask(SGTexturedTriangleBin triangleBin) +{ + if (_status.size() == 0) { + SG_LOG( SG_GENERAL, SG_WARN, "No mask available."); + return 0; + } + + // Note that the object mask is closely linked to the texture/effect + // so we index based on the texture index, + unsigned int i = triangleBin.getTextureIndex() % _status.size(); + if (i < _masks.size()) { + return _masks[i]; + } else { + return 0; } - // XXX This business of returning a "random" alternate texture is - // really bogus. It means that the appearance of the terrain - // depends on the order in which it is paged in! - _current_ptr = (_current_ptr + 1) % _status.size(); - return _status[i].effect.get(); } void SGMaterial::buildEffectProperties(const SGReaderWriterOptions* options) { using namespace osg; - ref_ptr xmlOptions; - if (options) - xmlOptions = new SGReaderWriterOptions(*options); ref_ptr user = new SGMaterialUserData(this); SGPropertyNode_ptr propRoot = new SGPropertyNode(); makeChild(propRoot, "inherits-from")->setStringValue(effect); @@ -339,7 +445,7 @@ void SGMaterial::buildEffectProperties(const SGReaderWriterOptions* options) makeChild(effectParamProp, "scale")->setValue(SGVec3d(xsize,ysize,0.0)); makeChild(effectParamProp, "light-coverage")->setDoubleValue(light_coverage); - matState.effect = makeEffect(effectProp, false, xmlOptions.get()); + matState.effect = makeEffect(effectProp, false, options); matState.effect->setUserData(user.get()); } }