- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgWrappers/deprecated-dotosg/osg/ProxyNode.cpp
r10970 r13041 56 56 else if (fr[1].matchWord("NO_AUTOMATIC_LOADING")) 57 57 proxyNode.setLoadingExternalReferenceMode(ProxyNode::NO_AUTOMATIC_LOADING); 58 58 59 59 fr+=2; 60 60 iteratorAdvanced = true; … … 72 72 { 73 73 const std::string& path = fr.getOptions()->getDatabasePathList().front(); 74 if (!path.empty()) 74 if (!path.empty()) 75 75 { 76 76 proxyNode.setDatabasePath(path); 77 77 } 78 } 78 } 79 79 80 80 bool matchFirst; … … 100 100 if (fr[0].getStr()) proxyNode.setFileName(i,fr[0].getStr()); 101 101 else proxyNode.setFileName(i,""); 102 102 103 103 ++fr; 104 104 ++i; … … 170 170 includeExternalReferences = optionsString.find("includeExternalReferences")!=std::string::npos; 171 171 bool newExternals = optionsString.find("writeExternalReferenceFiles")!=std::string::npos; 172 if (newExternals) 172 if (newExternals) 173 173 { 174 174 useOriginalExternalReferences = false; 175 175 writeExternalReferenceFiles = true; 176 } 176 } 177 177 } 178 178 const ProxyNode& proxyNode = static_cast<const ProxyNode&>(obj); … … 181 181 182 182 fw.indent() << "ExtRefMode "; 183 183 184 184 switch(proxyNode.getLoadingExternalReferenceMode()) 185 185 { … … 199 199 fw.indent() << "FileNameList "<<proxyNode.getNumFileNames()<<" {"<< std::endl; 200 200 fw.moveIn(); 201 201 202 202 unsigned int numChildrenToWriteOut = 0; 203 203 204 204 for(unsigned int i=0; i<proxyNode.getNumFileNames();++i) 205 205 { … … 209 209 ++numChildrenToWriteOut; 210 210 } 211 else 211 else 212 212 { 213 213 if(useOriginalExternalReferences)
