488eac94f7
few headers and the osgAnimation sources are also modified to make everything goes well, including: A new REGISTER_OBJECT_WRAPPER2 macro to wrap classes like Skeleton::UpdateSkeleton. A bug fix in the Seralizer header which avoids setting default values to objects. Naming style fixes in osgAnimation headers and sources, also in the deprecated dotosg wrappers. A bug fix for the XML support, to write char values correctly. A small change in the osg::Geometry wrapper to ignore the InternalGeometry property, which is used by the MorphGeometry and should not be set by user applications. The avatar.osg, nathan.osg and robot.osg data files all work fine with serializers, with some 'unsupported wrapper' warnings when converting. I'm thinking of removing these warnings by disabling related property serializers (ComputeBoundingBoxCallback and Drawable::UpdateCallback), which are seldom recorded by users. By the way, I still wonder how would we handle the C4121 problem, discussed some days before. The /Zp compile option is set to 16 in the attached cmake script file. And is there a better solution now?"
116 lines
4.8 KiB
C++
116 lines
4.8 KiB
C++
#include <osg/Geometry>
|
|
#include <osgDB/ObjectWrapper>
|
|
#include <osgDB/InputStream>
|
|
#include <osgDB/OutputStream>
|
|
|
|
BEGIN_USER_TABLE( AttributeBinding, osg::Geometry );
|
|
ADD_USER_VALUE( BIND_OFF );
|
|
ADD_USER_VALUE( BIND_OVERALL );
|
|
ADD_USER_VALUE( BIND_PER_PRIMITIVE_SET );
|
|
ADD_USER_VALUE( BIND_PER_PRIMITIVE );
|
|
ADD_USER_VALUE( BIND_PER_VERTEX );
|
|
END_USER_TABLE()
|
|
|
|
USER_READ_FUNC( AttributeBinding, readAttributeBinding )
|
|
USER_WRITE_FUNC( AttributeBinding, writeAttributeBinding )
|
|
|
|
static void readArrayData( osgDB::InputStream& is, osg::Geometry::ArrayData& data )
|
|
{
|
|
bool hasArray = false;
|
|
is >> osgDB::PROPERTY("Array") >> hasArray;
|
|
if ( hasArray ) data.array = is.readArray();
|
|
|
|
bool hasIndices = false;
|
|
is >> osgDB::PROPERTY("Indices") >> hasIndices;
|
|
if ( hasIndices ) data.indices = dynamic_cast<osg::IndexArray*>( is.readArray() );
|
|
|
|
is >> osgDB::PROPERTY("Binding");
|
|
data.binding = (osg::Geometry::AttributeBinding)readAttributeBinding(is);
|
|
|
|
int normalizeValue = 0;
|
|
is >> osgDB::PROPERTY("Normalize") >> normalizeValue;
|
|
data.normalize = normalizeValue;
|
|
}
|
|
|
|
static void writeArrayData( osgDB::OutputStream& os, const osg::Geometry::ArrayData& data )
|
|
{
|
|
os << osgDB::PROPERTY("Array") << data.array.valid();
|
|
if ( data.array.valid() ) os << data.array.get();
|
|
else os << std::endl;
|
|
|
|
os << osgDB::PROPERTY("Indices") << data.indices.valid();
|
|
if ( data.indices.valid() ) os << data.indices.get();
|
|
else os << std::endl;
|
|
|
|
os << osgDB::PROPERTY("Binding"); writeAttributeBinding(os, data.binding); os << std::endl;
|
|
os << osgDB::PROPERTY("Normalize") << (int)data.normalize << std::endl;
|
|
}
|
|
|
|
#define ADD_ARRAYDATA_FUNCTIONS( PROP ) \
|
|
static bool check##PROP( const osg::Geometry& geom ) \
|
|
{ return geom.get##PROP().array.valid(); } \
|
|
static bool read##PROP( osgDB::InputStream& is, osg::Geometry& geom ) { \
|
|
osg::Geometry::ArrayData data; \
|
|
is >> osgDB::BEGIN_BRACKET; readArrayData(is, data); \
|
|
is >> osgDB::END_BRACKET; \
|
|
geom.set##PROP(data); \
|
|
return true; \
|
|
} \
|
|
static bool write##PROP( osgDB::OutputStream& os, const osg::Geometry& geom ) { \
|
|
os << osgDB::BEGIN_BRACKET << std::endl; \
|
|
writeArrayData(os, geom.get##PROP()); \
|
|
os << osgDB::END_BRACKET << std::endl; \
|
|
return true; \
|
|
}
|
|
|
|
ADD_ARRAYDATA_FUNCTIONS( VertexData )
|
|
ADD_ARRAYDATA_FUNCTIONS( NormalData )
|
|
ADD_ARRAYDATA_FUNCTIONS( ColorData )
|
|
ADD_ARRAYDATA_FUNCTIONS( SecondaryColorData )
|
|
ADD_ARRAYDATA_FUNCTIONS( FogCoordData )
|
|
|
|
#define ADD_ARRAYLIST_FUNCTIONS( PROP, LISTNAME ) \
|
|
static bool check##PROP( const osg::Geometry& geom ) \
|
|
{ return geom.get##LISTNAME().size()>0; } \
|
|
static bool read##PROP( osgDB::InputStream& is, osg::Geometry& geom ) { \
|
|
unsigned int size = is.readSize(); is >> osgDB::BEGIN_BRACKET; \
|
|
for ( unsigned int i=0; i<size; ++i ) { \
|
|
osg::Geometry::ArrayData data; \
|
|
is >> osgDB::PROPERTY("Data") >> osgDB::BEGIN_BRACKET; \
|
|
readArrayData(is, data); \
|
|
is >> osgDB::END_BRACKET; geom.set##PROP(i, data); } \
|
|
is >> osgDB::END_BRACKET; \
|
|
return true; \
|
|
} \
|
|
static bool write##PROP( osgDB::OutputStream& os, const osg::Geometry& geom ) { \
|
|
const osg::Geometry::ArrayDataList& LISTNAME = geom.get##LISTNAME(); \
|
|
os.writeSize(LISTNAME.size()); os << osgDB::BEGIN_BRACKET << std::endl; \
|
|
for ( osg::Geometry::ArrayDataList::const_iterator itr=LISTNAME.begin(); \
|
|
itr!=LISTNAME.end(); ++itr ) { \
|
|
os << osgDB::PROPERTY("Data") << osgDB::BEGIN_BRACKET << std::endl; \
|
|
writeArrayData(os, *itr); os << osgDB::END_BRACKET << std::endl; \
|
|
} \
|
|
os << osgDB::END_BRACKET << std::endl; \
|
|
return true; \
|
|
}
|
|
|
|
ADD_ARRAYLIST_FUNCTIONS( TexCoordData, TexCoordArrayList )
|
|
ADD_ARRAYLIST_FUNCTIONS( VertexAttribData, VertexAttribArrayList )
|
|
|
|
REGISTER_OBJECT_WRAPPER( Geometry,
|
|
new osg::Geometry,
|
|
osg::Geometry,
|
|
"osg::Object osg::Drawable osg::Geometry" )
|
|
{
|
|
ADD_LIST_SERIALIZER( PrimitiveSetList, osg::Geometry::PrimitiveSetList ); // _primitives
|
|
ADD_USER_SERIALIZER( VertexData ); // _vertexData
|
|
ADD_USER_SERIALIZER( NormalData ); // _normalData
|
|
ADD_USER_SERIALIZER( ColorData ); // _colorData
|
|
ADD_USER_SERIALIZER( SecondaryColorData ); // _secondaryColorData
|
|
ADD_USER_SERIALIZER( FogCoordData ); // _fogCoordData
|
|
ADD_USER_SERIALIZER( TexCoordData ); // _texCoordList
|
|
ADD_USER_SERIALIZER( VertexAttribData ); // _vertexAttribList
|
|
ADD_BOOL_SERIALIZER( FastPathHint, true ); // _fastPathHint
|
|
//ADD_OBJECT_SERIALIZER( InternalOptimizedGeometry, osg::Geometry, NULL ); // _internalOptimizedGeometry
|
|
}
|