FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ability to override existing model files with .osg files.

Browse Source 
This enables off-line optimization of models and other special effects.
This commit is contained in:
timoore
2007-10-12 22:46:35 +00:00
parent a91b2629d3
commit af75c0ca0c
1 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/model.cxx
+38 -24
View File
@@ -217,7 +217,18 @@ public:
if (osgDB::equalCaseInsensitive(osgDB::getFileExtension(fileName), "btg")) { if (osgDB::equalCaseInsensitive(osgDB::getFileExtension(fileName), "btg")) {
return registry->readNodeImplementation(fileName, opt); return registry->readNodeImplementation(fileName, opt);
} }
std::string absFileName = osgDB::findDataFile(fileName); // First, look for a file with the same name, and the extension
// ".osg" and, if it exists, load it instead. This allows for
// substitution of optimized models for ones named in the scenery.
bool optimizeModel = true;
std::string fileSansExtension = osgDB::getNameLessExtension(fileName);
std::string osgFileName = fileSansExtension + ".osg";
std::string absFileName = osgDB::findDataFile(osgFileName);
if (osgDB::fileExists(absFileName)) {
optimizeModel = false;
} else {
absFileName = osgDB::findDataFile(fileName);
}
if (!osgDB::fileExists(absFileName)) { if (!osgDB::fileExists(absFileName)) {
SG_LOG(SG_IO, SG_ALERT, "Cannot find model file \"" SG_LOG(SG_IO, SG_ALERT, "Cannot find model file \""
<< fileName << "\""); << fileName << "\"");
@@ -236,7 +247,7 @@ public:
return res; return res;
bool needTristrip = true; bool needTristrip = true;
if (osgDB::getLowerCaseFileExtension(absFileName) == "ac") { if (osgDB::getLowerCaseFileExtension(fileName) == "ac") {
// we get optimal geometry from the loader. // we get optimal geometry from the loader.
needTristrip = false; needTristrip = false;
osg::Matrix m(1, 0, 0, 0, osg::Matrix m(1, 0, 0, 0,
@@ -253,10 +264,12 @@ public:
transform->addChild(res.getNode()); transform->addChild(res.getNode());
res = osgDB::ReaderWriter::ReadResult(0); res = osgDB::ReaderWriter::ReadResult(0);
osgUtil::Optimizer optimizer; if (optimizeModel) {
unsigned opts = osgUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS; osgUtil::Optimizer optimizer;
optimizer.optimize(root.get(), opts); unsigned opts = osgUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS;
optimizer.optimize(root.get(), opts);
}
// strip away unneeded groups // strip away unneeded groups
if (root->getNumChildren() == 1 && root->getName().empty()) { if (root->getNumChildren() == 1 && root->getName().empty()) {
@@ -275,26 +288,27 @@ public:
SGAcMaterialCrippleVisitor matCriple; SGAcMaterialCrippleVisitor matCriple;
res.getNode()->accept(matCriple); res.getNode()->accept(matCriple);
} }
osgUtil::Optimizer optimizer;
unsigned opts = 0;
// Don't use this one. It will break animation names ...
// opts |= osgUtil::Optimizer::REMOVE_REDUNDANT_NODES;
// opts |= osgUtil::Optimizer::REMOVE_LOADED_PROXY_NODES; if (optimizeModel) {
// opts |= osgUtil::Optimizer::COMBINE_ADJACENT_LODS; osgUtil::Optimizer optimizer;
// opts |= osgUtil::Optimizer::SHARE_DUPLICATE_STATE; unsigned opts = 0;
opts |= osgUtil::Optimizer::MERGE_GEOMETRY; // Don't use this one. It will break animation names ...
// opts |= osgUtil::Optimizer::CHECK_GEOMETRY; // opts |= osgUtil::Optimizer::REMOVE_REDUNDANT_NODES;
// opts |= osgUtil::Optimizer::SPATIALIZE_GROUPS;
// opts |= osgUtil::Optimizer::COPY_SHARED_NODES;
opts |= osgUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS;
if (needTristrip)
opts |= osgUtil::Optimizer::TRISTRIP_GEOMETRY;
// opts |= osgUtil::Optimizer::TESSELATE_GEOMETRY;
// opts |= osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS;
optimizer.optimize(res.getNode(), opts);
// opts |= osgUtil::Optimizer::REMOVE_LOADED_PROXY_NODES;
// opts |= osgUtil::Optimizer::COMBINE_ADJACENT_LODS;
// opts |= osgUtil::Optimizer::SHARE_DUPLICATE_STATE;
opts |= osgUtil::Optimizer::MERGE_GEOMETRY;
// opts |= osgUtil::Optimizer::CHECK_GEOMETRY;
// opts |= osgUtil::Optimizer::SPATIALIZE_GROUPS;
// opts |= osgUtil::Optimizer::COPY_SHARED_NODES;
opts |= osgUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS;
if (needTristrip)
opts |= osgUtil::Optimizer::TRISTRIP_GEOMETRY;
// opts |= osgUtil::Optimizer::TESSELATE_GEOMETRY;
// opts |= osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS;
optimizer.optimize(res.getNode(), opts);
}
// Make sure the data variance of sharable objects is set to STATIC ... // Make sure the data variance of sharable objects is set to STATIC ...
SGTexDataVarianceVisitor dataVarianceVisitor; SGTexDataVarianceVisitor dataVarianceVisitor;
res.getNode()->accept(dataVarianceVisitor); res.getNode()->accept(dataVarianceVisitor);