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

Allows to load submodels with path relative to current model path.

Browse Source 
Submodel path must be prefixed by ./ otherwise path is relative to fg_root ( current behavior )
This commit is contained in:
fredb
2008-04-02 22:25:12 +00:00
parent 09fb51189e
commit bb3b606820
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGReaderWriterXML.cxx
+9 -2
View File
@@ -214,10 +214,17 @@ sgLoad3DModel_internal(const string &path,
for (unsigned i = 0; i < model_nodes.size(); i++) { for (unsigned i = 0; i < model_nodes.size(); i++) {
SGPropertyNode_ptr sub_props = model_nodes[i]; SGPropertyNode_ptr sub_props = model_nodes[i];
SGPath submodelpath;
osg::ref_ptr<osg::Node> submodel; osg::ref_ptr<osg::Node> submodel;
const char* submodelFileName = sub_props->getStringValue("path"); string submodelFileName = sub_props->getStringValue("path");
if ( submodelFileName.size() > 2 && submodelFileName.substr( 0, 2 ) == "./" ) {
submodelpath = modelpath.dir();
submodelpath.append( submodelFileName.substr( 2 ) );
} else {
submodelpath = submodelFileName;
}
try { try {
submodel = sgLoad3DModel_internal(submodelFileName, prop_root, 0, load_panel); submodel = sgLoad3DModel_internal(submodelpath.str(), prop_root, 0, load_panel);
} catch (const sg_throwable &t) { } catch (const sg_throwable &t) {
SG_LOG(SG_INPUT, SG_ALERT, "Failed to load submodel: " << t.getFormattedMessage()); SG_LOG(SG_INPUT, SG_ALERT, "Failed to load submodel: " << t.getFormattedMessage());
throw; throw;