diff --git a/include/osgDB/Field b/include/osgDB/Field deleted file mode 100644 index 4d9c3cb5c..000000000 --- a/include/osgDB/Field +++ /dev/null @@ -1,113 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGDB_FIELD -#define OSGDB_FIELD 1 - -#include - -#include - -namespace osgDB { - -class OSGDB_EXPORT Field -{ - public: - - enum { - MIN_CACHE_SIZE = 256 - }; - - Field(); - Field(const Field& field); - virtual ~Field(); - - virtual Field& operator = (const Field& ic); - - void reset(); - void addChar(char c); - int getNoCharacters() const { return _fieldCacheSize; } - - void setWithinQuotes(bool withinQuotes=true); - bool getWithinQuotes(); - - void setNoNestedBrackets(int no); - int getNoNestedBrackets(); - - enum FieldType - { - OPEN_BRACKET, - CLOSE_BRACKET, - STRING, - WORD, - REAL, - INTEGER, - BLANK, - UNINITIALISED - }; - - FieldType getFieldType() const; - - bool isValid() const; - - bool isOpenBracket() const; - bool isCloseBracket() const; - - bool isWord() const; - bool matchWord(const char* str) const; - bool matchWord(const char* str,int noCharacters) const; - - bool isString() const; - bool matchString(const char* str) const; - bool matchString(const char* str,int noCharacters) const; - bool isQuotedString() const; - - const char* getStr() const; - char* takeStr(); - - bool isInt() const; - bool matchInt(int i) const; - bool getInt(int& i) const; - - bool isUInt() const; - bool matchUInt(unsigned int i) const; - bool getUInt(unsigned int& i) const; - - bool isFloat() const; - bool matchFloat(float f) const; - bool getFloat(float& f) const; - bool getFloat(double& f) const; - - static FieldType calculateFieldType(const char* str,bool withinQuotes=false); - - protected: - - void _init(); - void _free(); - void _copy(const Field& ic); - - int _fieldCacheCapacity; - int _fieldCacheSize; - char* _fieldCache; - - mutable FieldType _fieldType; - - bool _withinQuotes; - - int _noNestedBrackets; - -}; - -} - -#endif // __SG_FIELD_H diff --git a/include/osgDB/FieldReader b/include/osgDB/FieldReader deleted file mode 100644 index b787eb58d..000000000 --- a/include/osgDB/FieldReader +++ /dev/null @@ -1,68 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGDB_FIELDREADER -#define OSGDB_FIELDREADER 1 - -#include - -#include - -namespace osgDB { - -class Field; - -class OSGDB_EXPORT FieldReader -{ - public: - - FieldReader(); - FieldReader(const FieldReader& ic); - virtual ~FieldReader(); - - virtual FieldReader& operator = (const FieldReader& ic); - - void attach(std::istream* input); - void detach(); - - virtual bool eof() const; - - bool readField(Field& fieldPtr); - void ignoreField(); - - /** no of unmatched `{' encountered so far in file*/ - int getNoNestedBrackets() const; - - private: - - bool _readField(Field* fieldPtr); - - void _init(); - void _free(); - void _copy(const FieldReader& ic); - - std::istream* _fin; - bool _eof; - - bool findStartOfNextField(); - - int _noNestedBrackets; - - bool _delimiterEatLookUp[256]; - bool _delimiterKeepLookUp[256]; - -}; - -} - -#endif // __SG_FIELD_READER_H diff --git a/include/osgDB/FieldReaderIterator b/include/osgDB/FieldReaderIterator deleted file mode 100644 index c0f99351c..000000000 --- a/include/osgDB/FieldReaderIterator +++ /dev/null @@ -1,110 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSGDB_FIELDREADERITERATOR -#define OSGDB_FIELDREADERITERATOR 1 - -#include -#include -#include -#include -#include -#include - -#include -#include - -namespace osgDB { - - -class OSGDB_EXPORT FieldReaderIterator -{ - public: - - enum { - MINIMUM_FIELD_READER_QUEUE_SIZE = 10 - }; - - FieldReaderIterator(); - FieldReaderIterator(const FieldReaderIterator& ic); - virtual ~FieldReaderIterator(); - - FieldReaderIterator& operator = (const FieldReaderIterator& ic); - - void attach(std::istream* input); - void detach(); - - virtual bool eof() const; - - FieldReader& getFieldReader() { return _reader; } - - void insert(int pos,Field* field); - void insert(int pos,const char* str); - - Field& operator [] (int pos); - Field& field (int pos); - - FieldReaderIterator& operator ++ (); - FieldReaderIterator& operator += (int no); - - /** increments the iterator of the next simple field or - * whole block if the current field[0] is an open bracket */ - void advanceOverCurrentFieldOrBlock(); - void advanceToEndOfCurrentBlock(); - void advanceToEndOfBlock(int noNestBrackets); - - bool matchSequence(const char* str); - - bool readSequence(const char* keyword,std::string& value); - bool readSequence(const char* keyword,unsigned int& value); - bool readSequence(const char* keyword,int& value); - bool readSequence(const char* keyword,float& value); - bool readSequence(const char* keyword,osg::Vec2f& value); - bool readSequence(const char* keyword,osg::Vec3f& value); - bool readSequence(const char* keyword,osg::Vec4f& value); - bool readSequence(const char* keyword,osg::Vec2d& value); - bool readSequence(const char* keyword,osg::Vec3d& value); - bool readSequence(const char* keyword,osg::Vec4d& value); - - bool readSequence(std::string& value); - bool readSequence(unsigned int& value); - bool readSequence(int& value); - bool readSequence(float& value); - bool readSequence(osg::Vec2f& value); - bool readSequence(osg::Vec3f& value); - bool readSequence(osg::Vec4f& value); - bool readSequence(osg::Vec2d& value); - bool readSequence(osg::Vec3d& value); - bool readSequence(osg::Vec4d& value); - - private: - - void _init(); - void _free(); - void _copy(const FieldReaderIterator& ic); - - FieldReader _reader; - - Field _blank; - - Field* _previousField; - - Field** _fieldQueue; - int _fieldQueueSize; - int _fieldQueueCapacity; - -}; - -} - -#endif // __OSGDB_FIELD_READER_QUEUE_H diff --git a/include/osgDB/Input b/include/osgDB/Input index 05e504540..2337c15e3 100644 --- a/include/osgDB/Input +++ b/include/osgDB/Input @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -32,7 +31,217 @@ namespace osgDB { struct basic_type_wrapper; -/** Class for managing the reading of ASCII .osg files.*/ +/** deprecated. */ +class OSGDB_EXPORT Field +{ + public: + + enum { + MIN_CACHE_SIZE = 256 + }; + + Field(); + Field(const Field& field); + virtual ~Field(); + + virtual Field& operator = (const Field& ic); + + void reset(); + void addChar(char c); + int getNoCharacters() const { return _fieldCacheSize; } + + void setWithinQuotes(bool withinQuotes=true); + bool getWithinQuotes(); + + void setNoNestedBrackets(int no); + int getNoNestedBrackets(); + + enum FieldType + { + OPEN_BRACKET, + CLOSE_BRACKET, + STRING, + WORD, + REAL, + INTEGER, + BLANK, + UNINITIALISED + }; + + FieldType getFieldType() const; + + bool isValid() const; + + bool isOpenBracket() const; + bool isCloseBracket() const; + + bool isWord() const; + bool matchWord(const char* str) const; + bool matchWord(const char* str,int noCharacters) const; + + bool isString() const; + bool matchString(const char* str) const; + bool matchString(const char* str,int noCharacters) const; + bool isQuotedString() const; + + const char* getStr() const; + char* takeStr(); + + bool isInt() const; + bool matchInt(int i) const; + bool getInt(int& i) const; + + bool isUInt() const; + bool matchUInt(unsigned int i) const; + bool getUInt(unsigned int& i) const; + + bool isFloat() const; + bool matchFloat(float f) const; + bool getFloat(float& f) const; + bool getFloat(double& f) const; + + static FieldType calculateFieldType(const char* str,bool withinQuotes=false); + + protected: + + void _init(); + void _free(); + void _copy(const Field& ic); + + int _fieldCacheCapacity; + int _fieldCacheSize; + char* _fieldCache; + + mutable FieldType _fieldType; + + bool _withinQuotes; + + int _noNestedBrackets; + +}; + +/** deprecated. */ +class OSGDB_EXPORT FieldReader +{ + public: + + FieldReader(); + FieldReader(const FieldReader& ic); + virtual ~FieldReader(); + + virtual FieldReader& operator = (const FieldReader& ic); + + void attach(std::istream* input); + void detach(); + + virtual bool eof() const; + + bool readField(Field& fieldPtr); + void ignoreField(); + + /** no of unmatched `{' encountered so far in file*/ + int getNoNestedBrackets() const; + + private: + + bool _readField(Field* fieldPtr); + + void _init(); + void _free(); + void _copy(const FieldReader& ic); + + std::istream* _fin; + bool _eof; + + bool findStartOfNextField(); + + int _noNestedBrackets; + + bool _delimiterEatLookUp[256]; + bool _delimiterKeepLookUp[256]; + +}; + +/** deprecated. */ +class OSGDB_EXPORT FieldReaderIterator +{ + public: + + enum { + MINIMUM_FIELD_READER_QUEUE_SIZE = 10 + }; + + FieldReaderIterator(); + FieldReaderIterator(const FieldReaderIterator& ic); + virtual ~FieldReaderIterator(); + + FieldReaderIterator& operator = (const FieldReaderIterator& ic); + + void attach(std::istream* input); + void detach(); + + virtual bool eof() const; + + FieldReader& getFieldReader() { return _reader; } + + void insert(int pos,Field* field); + void insert(int pos,const char* str); + + Field& operator [] (int pos); + Field& field (int pos); + + FieldReaderIterator& operator ++ (); + FieldReaderIterator& operator += (int no); + + /** increments the iterator of the next simple field or + * whole block if the current field[0] is an open bracket */ + void advanceOverCurrentFieldOrBlock(); + void advanceToEndOfCurrentBlock(); + void advanceToEndOfBlock(int noNestBrackets); + + bool matchSequence(const char* str); + + bool readSequence(const char* keyword,std::string& value); + bool readSequence(const char* keyword,unsigned int& value); + bool readSequence(const char* keyword,int& value); + bool readSequence(const char* keyword,float& value); + bool readSequence(const char* keyword,osg::Vec2f& value); + bool readSequence(const char* keyword,osg::Vec3f& value); + bool readSequence(const char* keyword,osg::Vec4f& value); + bool readSequence(const char* keyword,osg::Vec2d& value); + bool readSequence(const char* keyword,osg::Vec3d& value); + bool readSequence(const char* keyword,osg::Vec4d& value); + + bool readSequence(std::string& value); + bool readSequence(unsigned int& value); + bool readSequence(int& value); + bool readSequence(float& value); + bool readSequence(osg::Vec2f& value); + bool readSequence(osg::Vec3f& value); + bool readSequence(osg::Vec4f& value); + bool readSequence(osg::Vec2d& value); + bool readSequence(osg::Vec3d& value); + bool readSequence(osg::Vec4d& value); + + private: + + void _init(); + void _free(); + void _copy(const FieldReaderIterator& ic); + + FieldReader _reader; + + Field _blank; + + Field* _previousField; + + Field** _fieldQueue; + int _fieldQueueSize; + int _fieldQueueCapacity; + +}; + +/** deprecated. */ class OSGDB_EXPORT Input : public FieldReaderIterator { public: diff --git a/include/osgDB/Output b/include/osgDB/Output index 24264c96e..a0b9e10e5 100644 --- a/include/osgDB/Output +++ b/include/osgDB/Output @@ -24,8 +24,7 @@ namespace osgDB { -/** ofstream wrapper class for adding support for indenting. - Used in output of .osg ASCII files to improve their readability.*/ +/** deprecated. */ class OSGDB_EXPORT Output : public osgDB::ofstream { public: diff --git a/include/osgWidget/StyleManager b/include/osgWidget/StyleManager index b864c5012..a64eaf3bb 100644 --- a/include/osgWidget/StyleManager +++ b/include/osgWidget/StyleManager @@ -17,7 +17,7 @@ #define OSGWIDGET_STYLE_MANAGER #include -#include +#include #include #include #include diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt index 2968ae658..6f53f93b1 100644 --- a/src/osgDB/CMakeLists.txt +++ b/src/osgDB/CMakeLists.txt @@ -34,9 +34,6 @@ SET(LIB_PUBLIC_HEADERS ${HEADER_PATH}/DotOsgWrapper ${HEADER_PATH}/DynamicLibrary ${HEADER_PATH}/Export - ${HEADER_PATH}/Field - ${HEADER_PATH}/FieldReader - ${HEADER_PATH}/FieldReaderIterator ${HEADER_PATH}/FileCache ${HEADER_PATH}/FileNameUtils ${HEADER_PATH}/FileUtils diff --git a/src/osgDB/Field.cpp b/src/osgDB/Field.cpp index 844830ec3..004623860 100644 --- a/src/osgDB/Field.cpp +++ b/src/osgDB/Field.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/src/osgDB/FieldReader.cpp b/src/osgDB/FieldReader.cpp index d6389a96a..61e97c8de 100644 --- a/src/osgDB/FieldReader.cpp +++ b/src/osgDB/FieldReader.cpp @@ -10,8 +10,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ -#include -#include +#include +#include + #include using namespace osgDB; diff --git a/src/osgDB/FieldReaderIterator.cpp b/src/osgDB/FieldReaderIterator.cpp index 1fe870e20..af52da973 100644 --- a/src/osgDB/FieldReaderIterator.cpp +++ b/src/osgDB/FieldReaderIterator.cpp @@ -10,7 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ -#include +#include using namespace osgDB;