Ran script to remove trailing spaces and tabs
This commit is contained in:
@@ -43,10 +43,10 @@ public:
|
||||
_field += " ";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const std::string& getField() const { return _field; }
|
||||
const std::string& getError() const { return _error; }
|
||||
|
||||
|
||||
protected:
|
||||
std::string _field;
|
||||
std::string _error;
|
||||
@@ -57,7 +57,7 @@ class OSGDB_EXPORT InputStream
|
||||
public:
|
||||
typedef std::map< unsigned int, osg::ref_ptr<osg::Array> > ArrayMap;
|
||||
typedef std::map< unsigned int, osg::ref_ptr<osg::Object> > IdentifierMap;
|
||||
|
||||
|
||||
enum ReadType
|
||||
{
|
||||
READ_UNKNOWN = 0,
|
||||
@@ -65,14 +65,14 @@ public:
|
||||
READ_IMAGE,
|
||||
READ_OBJECT
|
||||
};
|
||||
|
||||
|
||||
InputStream( const osgDB::Options* options );
|
||||
virtual ~InputStream();
|
||||
|
||||
|
||||
bool isBinary() const { return _in->isBinary(); }
|
||||
int getFileVersion() const { return _fileVersion; }
|
||||
const osgDB::Options* getOptions() const { return _options.get(); }
|
||||
|
||||
|
||||
// Serialization related functions
|
||||
InputStream& operator>>( bool& b ) { _in->readBool(b); checkStream(); return *this; }
|
||||
InputStream& operator>>( char& c ) { _in->readChar(c); checkStream(); return *this; }
|
||||
@@ -89,11 +89,11 @@ public:
|
||||
InputStream& operator>>( std::string& s ) { _in->readString(s); checkStream(); return *this; }
|
||||
InputStream& operator>>( std::istream& (*fn)(std::istream&) ) { _in->readStream(fn); checkStream(); return *this; }
|
||||
InputStream& operator>>( std::ios_base& (*fn)(std::ios_base&) ) { _in->readBase(fn); checkStream(); return *this; }
|
||||
|
||||
|
||||
InputStream& operator>>( ObjectGLenum& value ) { _in->readGLenum(value); checkStream(); return *this; }
|
||||
InputStream& operator>>( ObjectProperty& prop ) { _in->readProperty(prop); checkStream(); return *this; }
|
||||
InputStream& operator>>( ObjectMark& mark ) { _in->readMark(mark); checkStream(); return *this; }
|
||||
|
||||
|
||||
InputStream& operator>>( osg::Vec2b& v );
|
||||
InputStream& operator>>( osg::Vec3b& v );
|
||||
InputStream& operator>>( osg::Vec4b& v );
|
||||
@@ -111,19 +111,19 @@ public:
|
||||
InputStream& operator>>( osg::Plane& p );
|
||||
InputStream& operator>>( osg::Matrixf& mat );
|
||||
InputStream& operator>>( osg::Matrixd& mat );
|
||||
|
||||
|
||||
InputStream& operator>>( osg::Array*& a ) { a = readArray(); return *this; }
|
||||
InputStream& operator>>( osg::Image*& img ) { img = readImage(); return *this; }
|
||||
InputStream& operator>>( osg::PrimitiveSet*& p ) { p = readPrimitiveSet(); return *this; }
|
||||
InputStream& operator>>( osg::Object*& obj ) { obj = readObject(); return *this; }
|
||||
|
||||
|
||||
InputStream& operator>>( osg::ref_ptr<osg::Array>& ptr ) { ptr = readArray(); return *this; }
|
||||
InputStream& operator>>( osg::ref_ptr<osg::Image>& ptr ) { ptr = readImage(); return *this; }
|
||||
InputStream& operator>>( osg::ref_ptr<osg::PrimitiveSet>& ptr ) { ptr = readPrimitiveSet(); return *this; }
|
||||
|
||||
|
||||
template<typename T> InputStream& operator>>( osg::ref_ptr<T>& ptr )
|
||||
{ ptr = static_cast<T*>(readObject()); return *this; }
|
||||
|
||||
|
||||
// Convenient methods for reading
|
||||
bool matchString( const std::string& str ) { return _in->matchString(str); }
|
||||
void advanceToCurrentEndBracket() { _in->advanceToCurrentEndBracket(); }
|
||||
@@ -148,25 +148,25 @@ public:
|
||||
ReadType start( InputIterator* );
|
||||
|
||||
void decompress();
|
||||
|
||||
|
||||
// Schema handlers
|
||||
void readSchema( std::istream& fin );
|
||||
void resetSchema();
|
||||
|
||||
|
||||
// Exception handlers
|
||||
inline void throwException( const std::string& msg );
|
||||
const InputException* getException() const { return _exception.get(); }
|
||||
|
||||
|
||||
protected:
|
||||
inline void checkStream();
|
||||
void setWrapperSchema( const std::string& name, const std::string& properties );
|
||||
|
||||
|
||||
template<typename T>
|
||||
void readArrayImplementation( T* a, unsigned int numComponentsPerElements, unsigned int componentSizeInBytes );
|
||||
|
||||
|
||||
ArrayMap _arrayMap;
|
||||
IdentifierMap _identifierMap;
|
||||
|
||||
|
||||
int _fileVersion;
|
||||
bool _useSchemaData;
|
||||
bool _forceReadingImage;
|
||||
|
||||
Reference in New Issue
Block a user