X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Fmaterial%2Fmat.cxx;h=8d53f86195a9bb0d0e7d8b61b56ab89b94568943;hb=542124e90cf467e590c4493774210f1e025cdc96;hp=b8af8091faacf0a8f878a9466bb4909a4ab3918a;hpb=f79906bf16592b1ff081ac9e26f0ab6cfb43b11c;p=simgear.git diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx index b8af8091..8d53f861 100644 --- a/simgear/scene/material/mat.cxx +++ b/simgear/scene/material/mat.cxx @@ -29,103 +29,150 @@ #include #include -SG_USING_STD(map); +#include +#include -#include +#include +#include "mat.hxx" -#ifdef SG_MATH_EXCEPTION_CLASH -# include -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include -#include "mat.hxx" +#include "Effect.hxx" +#include "Technique.hxx" +#include "Pass.hxx" -static map _tex_cache; -static map::iterator _tex_cache_iter; +using std::map; +using std::string; +using namespace simgear; //////////////////////////////////////////////////////////////////////// // Constructors and destructor. //////////////////////////////////////////////////////////////////////// - -SGMaterial::SGMaterial( const string &fg_root, const SGPropertyNode *props, const char *season ) +SGMaterial::_internal_state::_internal_state(Effect *e, bool l, + const SGReaderWriterXMLOptions* o) + : effect(e), effect_realized(l), options(o) { - init(); - read_properties( fg_root, props, season ); - build_ssg_state( false ); } -SGMaterial::SGMaterial( const string &texpath ) +SGMaterial::_internal_state::_internal_state(Effect *e, const string &t, bool l, + const SGReaderWriterXMLOptions* o) + : effect(e), effect_realized(l), options(o) { - init(); + texture_paths.push_back(std::make_pair(t,0)); +} - _internal_state st( NULL, texpath, false ); - _status.push_back( st ); +void SGMaterial::_internal_state::add_texture(const std::string &t, int i) +{ + texture_paths.push_back(std::make_pair(t,i)); +} - build_ssg_state( true ); +SGMaterial::SGMaterial( const SGReaderWriterXMLOptions* options, + const SGPropertyNode *props ) +{ + init(); + read_properties( options, props ); + buildEffectProperties(options); } -SGMaterial::SGMaterial( ssgSimpleState *s ) +SGMaterial::SGMaterial( const osgDB::ReaderWriter::Options* options, + const SGPropertyNode *props ) { + osg::ref_ptr sgOptions; + if (options) + sgOptions = new SGReaderWriterXMLOptions(*options); init(); - set_ssg_state( s ); + read_properties( sgOptions.get(), props ); + buildEffectProperties(sgOptions.get()); } SGMaterial::~SGMaterial (void) { } - //////////////////////////////////////////////////////////////////////// // Public methods. //////////////////////////////////////////////////////////////////////// void -SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props, const char *season ) +SGMaterial::read_properties(const SGReaderWriterXMLOptions* options, + const SGPropertyNode *props) { // Gather the path(s) to the texture(s) vector textures = props->getChildren("texture"); for (unsigned int i = 0; i < textures.size(); i++) { string tname = textures[i]->getStringValue(); - string otname = tname; - if (season && strncmp(season, "summer", 6)) - { - if (tname.substr(0,7) == "Terrain") - tname.insert(7,"."+string(season)); + 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); } - if (tname == "") { - tname = "unknown.rgb"; + if (!fullTexPath.empty() ) { + _internal_state st( NULL, fullTexPath, false, options ); + _status.push_back( st ); } + } - SGPath tpath( fg_root ); - tpath.append("Textures.high"); - tpath.append(tname); - if ( !ulFileExists(tpath.c_str()) ) { - tpath = SGPath( fg_root ); - tpath.append("Textures"); + vector texturesets = props->getChildren("texture-set"); + for (unsigned int i = 0; i < texturesets.size(); i++) + { + _internal_state st( NULL, false, options ); + vector 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 ( ulFileExists(tpath.c_str()) ) { - _internal_state st( NULL, tpath.str(), false ); + if (!st.texture_paths.empty() ) { _status.push_back( st ); } } - if (textures.size() == 0) { - string tname = "unknown.rgb"; - SGPath tpath( fg_root ); - tpath.append("Textures"); + if (textures.size() == 0 && texturesets.size() == 0) { + SGPath tpath("Textures"); tpath.append("Terrain"); - tpath.append(tname); - _internal_state st( NULL, tpath.str(), true ); + tpath.append("unknown.rgb"); + _internal_state st( NULL, tpath.str(), true, options ); _status.push_back( st ); } @@ -135,13 +182,26 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props wrapv = props->getBoolValue("wrapv", true); 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 = osgDB::findDataFile(treeTexPath, options); + } // surface values for use with ground reactions solid = props->getBoolValue("solid", true); friction_factor = props->getDoubleValue("friction-factor", 1.0); rolling_friction = props->getDoubleValue("rolling-friction", 0.02); bumpiness = props->getDoubleValue("bumpiness", 0.0); - load_resistence = props->getDoubleValue("load-resistence", 1e30); + load_resistance = props->getDoubleValue("load-resistance", 1e30); // Taken from default values as used in ac3d ambient[0] = props->getDoubleValue("ambient/r", 0.2); @@ -166,6 +226,9 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props shininess = props->getDoubleValue("shininess", 1.0); + if (props->hasChild("effect")) + effect = props->getStringValue("effect"); + vector object_group_nodes = ((SGPropertyNode *)props)->getChildren("object-group"); for (unsigned int i = 0; i < object_group_nodes.size(); i++) @@ -203,7 +266,7 @@ SGMaterial::init () friction_factor = 1; rolling_friction = 0.02; bumpiness = 0; - load_resistence = 1e30; + load_resistance = 1e30; shininess = 1.0; for (int i = 0; i < 4; i++) { @@ -212,111 +275,70 @@ SGMaterial::init () diffuse[i] = (i < 3) ? 0.8 : 1.0; emission[i] = (i < 3) ? 0.0 : 1.0; } + effect = "Effects/terrain-default"; } -bool -SGMaterial::load_texture ( int n ) -{ - int i = (n >= 0) ? n : 0 ; - int end = (n >= 0) ? n+1 : _status.size(); - - for (; i < end; i++) - { - if ( !_status[i].texture_loaded ) { - SG_LOG( SG_GENERAL, SG_INFO, "Loading deferred texture " - << _status[i].texture_path ); - assignTexture(_status[i].state, _status[i].texture_path, - wrapu, wrapv, mipmap ); - _status[i].texture_loaded = true; - } - } - return true; -} - -ssgSimpleState * -SGMaterial::get_state (int n) const +Effect* SGMaterial::get_effect(int n) { if (_status.size() == 0) { - SG_LOG( SG_GENERAL, SG_WARN, "No state available."); - return NULL; + SG_LOG( SG_GENERAL, SG_WARN, "No effect available."); + return 0; } - - ssgSimpleState *st = (n >= 0) ? _status[n].state - : _status[_current_ptr].state; - ((SGMaterial *)this)->_current_ptr += 1; - if (_current_ptr >= _status.size()) - ((SGMaterial *)this)->_current_ptr = 0; - - return st; + 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; + } + // 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::build_ssg_state( bool defer_tex_load ) +void SGMaterial::buildEffectProperties(const SGReaderWriterXMLOptions* options) { - GLenum shade_model = GL_SMOOTH; - - for (unsigned int i = 0; i < _status.size(); i++) + using namespace osg; + ref_ptr xmlOptions; + if (options) + xmlOptions = new SGReaderWriterXMLOptions(*options); + ref_ptr user = new SGMaterialUserData(this); + SGPropertyNode_ptr propRoot = new SGPropertyNode(); + makeChild(propRoot, "inherits-from")->setStringValue(effect); + SGPropertyNode* paramProp = makeChild(propRoot, "parameters"); + SGPropertyNode* materialProp = makeChild(paramProp, "material"); + makeChild(materialProp, "ambient")->setValue(SGVec4d(ambient)); + makeChild(materialProp, "diffuse")->setValue(SGVec4d(diffuse)); + makeChild(materialProp, "specular")->setValue(SGVec4d(specular)); + makeChild(materialProp, "emissive")->setValue(SGVec4d(emission)); + makeChild(materialProp, "shininess")->setFloatValue(shininess); + if (ambient[3] < 1 || diffuse[3] < 1 || + specular[3] < 1 || emission[3] < 1) { + makeChild(paramProp, "transparent")->setBoolValue(true); + SGPropertyNode* binProp = makeChild(paramProp, "render-bin"); + makeChild(binProp, "bin-number")->setIntValue(TRANSPARENT_BIN); + makeChild(binProp, "bin-name")->setStringValue("DepthSortedBin"); + } + BOOST_FOREACH(_internal_state& matState, _status) { - ssgSimpleState *state = new ssgSimpleState(); - - // Set up the textured state - state->setShadeModel( shade_model ); - state->enable( GL_LIGHTING ); - state->enable ( GL_CULL_FACE ) ; - state->enable( GL_TEXTURE_2D ); - state->disable( GL_BLEND ); - state->disable( GL_ALPHA_TEST ); - - if ( !defer_tex_load ) { - SG_LOG(SG_INPUT, SG_INFO, " " << _status[i].texture_path ); - assignTexture( state, _status[i].texture_path, wrapu, wrapv ); - _status[i].texture_loaded = true; - } else { - _status[i].texture_loaded = false; + SGPropertyNode_ptr effectProp = new SGPropertyNode(); + copyProperties(propRoot, effectProp); + SGPropertyNode* effectParamProp = effectProp->getChild("parameters", 0); + 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"); } - - state->enable( GL_COLOR_MATERIAL ); - state->setMaterial ( GL_AMBIENT, - ambient[0], ambient[1], - ambient[2], ambient[3] ) ; - state->setMaterial ( GL_DIFFUSE, - diffuse[0], diffuse[1], - diffuse[2], diffuse[3] ) ; - state->setMaterial ( GL_SPECULAR, - specular[0], specular[1], - specular[2], specular[3] ) ; - state->setMaterial ( GL_EMISSION, - emission[0], emission[1], - emission[2], emission[3] ) ; - state->setShininess ( shininess ); - - _status[i].state = state; + matState.effect = makeEffect(effectProp, false, xmlOptions.get()); + matState.effect->setUserData(user.get()); } } - -void SGMaterial::set_ssg_state( ssgSimpleState *s ) -{ - _status.push_back( _internal_state( s, "", true ) ); -} - -void SGMaterial::assignTexture( ssgSimpleState *state, string &fname, - int _wrapu, int _wrapv, int _mipmap ) -{ - _tex_cache_iter = _tex_cache.find(fname); - if (_tex_cache_iter == _tex_cache.end()) - { - state->setTexture((char *)fname.c_str(), _wrapu, _wrapv, _mipmap); - _tex_cache[fname] = state->getTexture(); - } - else - { - state->setTexture(_tex_cache_iter->second); - // cout << "Cache hit: " << fname << endl; - } -} - SGMaterialGlyph* SGMaterial::get_glyph (const string& name) const { map >::const_iterator it; @@ -338,5 +360,12 @@ SGMaterialGlyph::SGMaterialGlyph(SGPropertyNode *p) : { } +void +SGSetTextureFilter( int max) { + SGSceneFeatures::instance()->setTextureFilter( max); +} -// end of mat.cxx +int +SGGetTextureFilter() { + return SGSceneFeatures::instance()->getTextureFilter(); +}