Changeset 11018 for OpenSceneGraph/trunk/include/osgDB/Serializer

Timestamp:

01/27/10 18:09:05 (3 years ago)

Author:

robert

Message:

From Wang Rui, "Changes:

1. Rewrite the reading/writing exception handlers to work like the ive
plugin exceptions.
2. Write a header writing/checking function in ReaderWriterOSG2.cpp,
which may help decide if the stream is ascii or binary. The
readInputIterator() function will return null pointer if the input
file is nither osgb nor osgt format, which indicates that the old .osg
format could be used here, in case we've merged the two plugins
together.
3. Add a new ForceReadingImage? option in the InputStream?, which will
allocate an empty image object with the filename if specifed external
image file is missed. It may be useful for format converting in some
cases.
4. Add new osgParticle wrappers, as well as some modification to the
osgParticle headers, for instance, change isEnabled() to getEnabled().
5. Some fixes to the osg serialization wrappers."

Files:

• OpenSceneGraph/trunk/include/osgDB/Serializer (modified) (19 diffs)

OpenSceneGraph/trunk/include/osgDB/Serializer

@@ -138 +138 @@
     {
         C& object = OBJECT_CAST<C&>(obj);
-        if ( !is.isBinary() && !is.matchString(_name) )
-            return true;
+        if ( is.isBinary() )
+        {
+            bool ok = false; is >> ok;
+            if ( !ok ) return true;
+        }
+        else
+        {
+            if ( !is.matchString(_name) )
+                return true;
+        }
         return (*_reader)(is, object);
     }
@@ -146 +154 @@
     {
         const C& object = OBJECT_CAST<const C&>(obj);
-        if ( !os.isBinary() )
-        {
-            if ( !(*_checker)(object) ) return true;
-            os << _name;
+        bool ok = (*_checker)(object);
+        if ( os.isBinary() )
+        {
+            os << ok;
+            if ( !ok ) return true;
+        }
+        else
+        {
+            if ( !ok ) return true;
+            os << PROPERTY(_name.c_str());
         }
         return (*_writer)(os, object);
@@ -159 +173 @@
     std::string _name;
     Checker _checker;
+    
+public:
     Reader _reader;
     Writer _writer;
@@ -220 +236 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name;
+            os << PROPERTY((ParentType::_name).c_str());
             if ( _useHex ) os << std::hex;
             os << (object.*_getter)();
@@ -229 +245 @@
     }
     
-protected:
+public:
     Getter _getter;
     Setter _setter;
+    
+protected:
     bool _useHex;
 };
@@ -275 +293 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name << (object.*_getter)() << std::endl;
-        }
-        return true;
-    }
-    
-protected:
+            os << PROPERTY((ParentType::_name).c_str()) << (object.*_getter)() << std::endl;
+        }
+        return true;
+    }
+    
+public:
     Getter _getter;
     Setter _setter;
@@ -324 +342 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name << (object.*_getter)() << std::endl;
+            os << PROPERTY((ParentType::_name).c_str()) << (object.*_getter)() << std::endl;
         }
         return true;
@@ -344 +362 @@
     }
     
+public:
     Getter _getter;
     Setter _setter;
@@ -386 +405 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name << GLENUM((object.*_getter)()) << std::endl;
-        }
-        return true;
-    }
-    
-protected:
+            os << PROPERTY((ParentType::_name).c_str()) << GLENUM((object.*_getter)()) << std::endl;
+        }
+        return true;
+    }
+    
+public:
     Getter _getter;
     Setter _setter;
@@ -436 +455 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name;
+            os << PROPERTY((ParentType::_name).c_str());
             os.writeWrappedString( (object.*_getter)() );
             os << std::endl;
@@ -443 +462 @@
     }
     
-protected:
+public:
     Getter _getter;
     Setter _setter;
@@ -499 +518 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name << hasObject;
+            os << PROPERTY((ParentType::_name).c_str()) << hasObject;
             if ( hasObject )
             {
@@ -511 +530 @@
     }
     
-protected:
+public:
     Getter _getter;
     Setter _setter;
@@ -567 +586 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name << hasObject;
+            os << PROPERTY((ParentType::_name).c_str()) << hasObject;
             if ( hasObject )
             {
@@ -579 +598 @@
     }
     
-protected:
+public:
     Getter _getter;
     Setter _setter;
@@ -632 +651 @@
         else if ( ParentType::_defaultValue!=(object.*_getter)() )
         {
-            os << ParentType::_name << getString((object.*_getter)()) << std::endl;
-        }
-        return true;
-    }
-    
-protected:
+            os << PROPERTY((ParentType::_name).c_str()) << getString((object.*_getter)()) << std::endl;
+        }
+        return true;
+    }
+    
+public:
     Getter _getter;
     Setter _setter;
+    
+protected:
     IntLookup _lookup;
 };
@@ -707 +728 @@
         else if ( size>0 )
         {
-            os << ParentType::_name << size << BEGIN_BRACKET << std::endl;
+            os << PROPERTY((ParentType::_name).c_str()) << size << BEGIN_BRACKET << std::endl;
             for ( ConstIterator itr=list.begin();
                   itr!=list.end(); ++itr )
@@ -718 +739 @@
     }
     
-protected:
+public:
     Getter _getter;
     Setter _setter;
@@ -846 +867 @@
 
 #define END_ENUM_SERIALIZER() \
-    wrapper->addSerializer(serializer.get()); }
+    wrapper->addSerializer(serializer); }