- Timestamp:
- 03/21/12 18:36:20 (15 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgWrappers/serializers/osg/ProxyNode.cpp
r12947 r13041 63 63 dynamicLoadedSize++; 64 64 } 65 65 66 66 unsigned int realSize = size-dynamicLoadedSize; os << realSize; 67 67 if ( realSize>0 ) … … 105 105 { 106 106 osg::ProxyNode& proxyNode = static_cast<osg::ProxyNode&>(obj); 107 107 108 108 if (proxyNode.getLoadingExternalReferenceMode() == osg::ProxyNode::LOAD_IMMEDIATELY) 109 109 { … … 111 111 { 112 112 if(i >= proxyNode.getNumChildren() && !proxyNode.getFileName(i).empty()) 113 { 113 { 114 114 osgDB::FilePathList& fpl = ((osgDB::ReaderWriter::Options*)is.getOptions())->getDatabasePathList(); 115 115 fpl.push_front( fpl.empty() ? osgDB::getFilePath(proxyNode.getFileName(i)) : fpl.front()+'/'+ osgDB::getFilePath(proxyNode.getFileName(i))); … … 130 130 { 131 131 // Note: osg::Group is not in the list to prevent recording dynamic loaded children 132 132 133 133 ADD_USER_SERIALIZER( FileNames ); // _filenameList 134 134 ADD_USER_SERIALIZER( Children ); // _children (which are not loaded from external) 135 135 ADD_STRING_SERIALIZER( DatabasePath, "" ); // _databasePath 136 136 137 137 BEGIN_ENUM_SERIALIZER( LoadingExternalReferenceMode, LOAD_IMMEDIATELY ); 138 138 ADD_ENUM_VALUE( LOAD_IMMEDIATELY ); … … 140 140 ADD_ENUM_VALUE( NO_AUTOMATIC_LOADING ); 141 141 END_ENUM_SERIALIZER(); // _loadingExtReference 142 142 143 143 BEGIN_ENUM_SERIALIZER( CenterMode, USE_BOUNDING_SPHERE_CENTER ); 144 144 ADD_ENUM_VALUE( USE_BOUNDING_SPHERE_CENTER ); … … 146 146 ADD_ENUM_VALUE( UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED ); 147 147 END_ENUM_SERIALIZER(); // _centerMode 148 148 149 149 ADD_USER_SERIALIZER( UserCenter ); // _userDefinedCenter, _radius 150 150
