FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduced typedef's to make the code more readble and maintanable

Browse Source
This commit is contained in:
Robert Osfield 2013-06-24 09:02:32 +00:00
parent 4044fd5a74
commit 48020eed9e
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgDB/InputStream
View File

@ -186,7 +186,8 @@ protected:
ArrayMap _arrayMap; ArrayMap _arrayMap;
IdentifierMap _identifierMap; IdentifierMap _identifierMap;
std::map<std::string, int> _domainVersionMap; typedef std::map<std::string, int> VersionMap;
VersionMap _domainVersionMap;
int _fileVersion; int _fileVersion;
bool _useSchemaData; bool _useSchemaData;
bool _forceReadingImage; bool _forceReadingImage;

10
include/osgDB/OutputStream
View File

@ -188,10 +188,14 @@ protected:
ArrayMap _arrayMap; ArrayMap _arrayMap;
ObjectMap _objectMap; ObjectMap _objectMap;
std::map<std::string, int> _domainVersionMap; typedef std::map<std::string, int> VersionMap;
VersionMap _domainVersionMap;
WriteImageHint _writeImageHint; WriteImageHint _writeImageHint;
bool _useSchemaData, _useRobustBinaryFormat; bool _useSchemaData;
std::map<std::string, std::string> _inbuiltSchemaMap; bool _useRobustBinaryFormat;
typedef std::map<std::string, std::string> SchemaMap;
SchemaMap _inbuiltSchemaMap;
std::vector<std::string> _fields; std::vector<std::string> _fields;
std::string _schemaName; std::string _schemaName;
std::string _compressorName; std::string _compressorName;

2
src/osgDB/InputStream.cpp
View File

@ -76,7 +76,7 @@ InputStream::~InputStream()
int InputStream::getFileVersion( const std::string& d ) const int InputStream::getFileVersion( const std::string& d ) const
{ {
if ( d.empty() ) return _fileVersion; if ( d.empty() ) return _fileVersion;
std::map<std::string, int>::const_iterator itr = _domainVersionMap.find(d); VersionMap::const_iterator itr = _domainVersionMap.find(d);
return itr==_domainVersionMap.end() ? 0 : itr->second; return itr==_domainVersionMap.end() ? 0 : itr->second;
} }

12
src/osgDB/OutputStream.cpp
View File

@ -68,7 +68,7 @@ OutputStream::~OutputStream()
int OutputStream::getFileVersion( const std::string& d ) const int OutputStream::getFileVersion( const std::string& d ) const
{ {
if ( d.empty() ) return OPENSCENEGRAPH_SOVERSION; if ( d.empty() ) return OPENSCENEGRAPH_SOVERSION;
std::map<std::string, int>::const_iterator itr = _domainVersionMap.find(d); VersionMap::const_iterator itr = _domainVersionMap.find(d);
return itr==_domainVersionMap.end() ? 0 : itr->second; return itr==_domainVersionMap.end() ? 0 : itr->second;
} }
@ -563,14 +563,14 @@ void OutputStream::start( OutputIterator* outIterator, OutputStream::WriteType t
unsigned int attributes = 0; unsigned int attributes = 0;
// From SOVERSION 98, start to support custom wrapper domains, enabling the attribute bit // From SOVERSION 98, start to support custom wrapper domains, enabling the attribute bit
if ( _domainVersionMap.size()>0 ) attributes |= 0x1; if ( _domainVersionMap.size()>0 ) attributes |= 0x1;
if ( _useSchemaData ) if ( _useSchemaData )
{ {
attributes |= 0x2; // Record if we use inbuilt schema data or not attributes |= 0x2; // Record if we use inbuilt schema data or not
useCompressSource = true; useCompressSource = true;
} }
// From SOVERSION 98, start to support binary begin/end brackets so we can easily ignore // From SOVERSION 98, start to support binary begin/end brackets so we can easily ignore
// errors and unsupport classes, enabling the attribute bit // errors and unsupport classes, enabling the attribute bit
if ( _useRobustBinaryFormat ) if ( _useRobustBinaryFormat )
@ -585,7 +585,7 @@ void OutputStream::start( OutputIterator* outIterator, OutputStream::WriteType t
{ {
unsigned int numDomains = _domainVersionMap.size(); unsigned int numDomains = _domainVersionMap.size();
*this << numDomains; *this << numDomains;
for ( std::map<std::string, int>::iterator itr=_domainVersionMap.begin(); for ( VersionMap::iterator itr=_domainVersionMap.begin();
itr!=_domainVersionMap.end(); ++itr ) itr!=_domainVersionMap.end(); ++itr )
{ {
*this << itr->first << itr->second; *this << itr->first << itr->second;
@ -633,7 +633,7 @@ void OutputStream::start( OutputIterator* outIterator, OutputStream::WriteType t
<< std::string(osgGetVersion()) << std::endl; << std::string(osgGetVersion()) << std::endl;
if ( _domainVersionMap.size()>0 ) if ( _domainVersionMap.size()>0 )
{ {
for ( std::map<std::string, int>::iterator itr=_domainVersionMap.begin(); for ( VersionMap::iterator itr=_domainVersionMap.begin();
itr!=_domainVersionMap.end(); ++itr ) itr!=_domainVersionMap.end(); ++itr )
{ {
*this << PROPERTY("#CustomDomain") << itr->first << itr->second << std::endl; *this << PROPERTY("#CustomDomain") << itr->first << itr->second << std::endl;
@ -655,7 +655,7 @@ void OutputStream::compress( std::ostream* ostream )
_fields.push_back( "SchemaData" ); _fields.push_back( "SchemaData" );
std::string schemaData; std::string schemaData;
for ( std::map<std::string, std::string>::iterator itr=_inbuiltSchemaMap.begin(); for ( SchemaMap::iterator itr=_inbuiltSchemaMap.begin();
itr!=_inbuiltSchemaMap.end(); ++itr ) itr!=_inbuiltSchemaMap.end(); ++itr )
{ {
schemaData += itr->first + '='; schemaData += itr->first + '=';