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

From Wang Rui, "Changes:

Browse Source 
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."
This commit is contained in:
Robert Osfield
2010-01-27 17:09:05 +00:00
parent 00c17c6cff
commit 0a9263d50e
19 changed files with 434 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
include/osgDB/Serializer
View File

@@ -137,18 +137,32 @@ public:
virtual bool read( InputStream& is, osg::Object& obj )
{
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);
}
virtual bool write( OutputStream& os, const osg::Object& obj )
{
const C& object = OBJECT_CAST<const C&>(obj);
if ( !os.isBinary() )
bool ok = (*_checker)(object);
if ( os.isBinary() )
{
if ( !(*_checker)(object) ) return true;
os << _name;
os << ok;
if ( !ok ) return true;
}
else
{
if ( !ok ) return true;
os << PROPERTY(_name.c_str());
}
return (*_writer)(os, object);
}
@@ -158,6 +172,8 @@ public:
protected:
std::string _name;
Checker _checker;
public:
Reader _reader;
Writer _writer;
};
@@ -219,7 +235,7 @@ public:
}
else if ( ParentType::_defaultValue!=(object.*_getter)() )
{
os << ParentType::_name;
os << PROPERTY((ParentType::_name).c_str());
if ( _useHex ) os << std::hex;
os << (object.*_getter)();
if ( _useHex ) os << std::dec;
@@ -228,9 +244,11 @@ public:
return true;
}
protected:
public:
Getter _getter;
Setter _setter;
protected:
bool _useHex;
};
@@ -274,12 +292,12 @@ public:
}
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;
}
protected:
public:
Getter _getter;
Setter _setter;
};
@@ -323,7 +341,7 @@ public:
}
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;
}
@@ -343,6 +361,7 @@ protected:
}
}
public:
Getter _getter;
Setter _setter;
};
@@ -385,12 +404,12 @@ public:
}
else if ( ParentType::_defaultValue!=(object.*_getter)() )
{
os << ParentType::_name << GLENUM((object.*_getter)()) << std::endl;
os << PROPERTY((ParentType::_name).c_str()) << GLENUM((object.*_getter)()) << std::endl;
}
return true;
}
protected:
public:
Getter _getter;
Setter _setter;
};
@@ -435,14 +454,14 @@ public:
}
else if ( ParentType::_defaultValue!=(object.*_getter)() )
{
os << ParentType::_name;
os << PROPERTY((ParentType::_name).c_str());
os.writeWrappedString( (object.*_getter)() );
os << std::endl;
}
return true;
}
protected:
public:
Getter _getter;
Setter _setter;
};
@@ -498,7 +517,7 @@ public:
}
else if ( ParentType::_defaultValue!=(object.*_getter)() )
{
os << ParentType::_name << hasObject;
os << PROPERTY((ParentType::_name).c_str()) << hasObject;
if ( hasObject )
{
os << BEGIN_BRACKET << std::endl;
@@ -510,7 +529,7 @@ public:
return true;
}
protected:
public:
Getter _getter;
Setter _setter;
};
@@ -566,7 +585,7 @@ public:
}
else if ( ParentType::_defaultValue!=(object.*_getter)() )
{
os << ParentType::_name << hasObject;
os << PROPERTY((ParentType::_name).c_str()) << hasObject;
if ( hasObject )
{
os << BEGIN_BRACKET << std::endl;
@@ -578,7 +597,7 @@ public:
return true;
}
protected:
public:
Getter _getter;
Setter _setter;
};
@@ -631,14 +650,16 @@ public:
}
else if ( ParentType::_defaultValue!=(object.*_getter)() )
{
os << ParentType::_name << getString((object.*_getter)()) << std::endl;
os << PROPERTY((ParentType::_name).c_str()) << getString((object.*_getter)()) << std::endl;
}
return true;
}
protected:
public:
Getter _getter;
Setter _setter;
protected:
IntLookup _lookup;
};
@@ -706,7 +727,7 @@ public:
}
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 )
{
@@ -717,7 +738,7 @@ public:
return true;
}
protected:
public:
Getter _getter;
Setter _setter;
};
@@ -845,7 +866,7 @@ protected:
serializer->add(#VALUE, MyClass::VALUE)
#define END_ENUM_SERIALIZER() \
wrapper->addSerializer(serializer.get()); }
wrapper->addSerializer(serializer); }
}