From Martins Innus,"Here's a fix to allow the serializer to compile on the Mac 10.4 SDK. The definition of GLint seems to be different accross the SDKs. Its defined as "long" in 10.4. I have no idea if this is the correct way to go about this, but it compiles on my end."
This commit is contained in:
parent
c0e9fcbb67
commit
a8332528f4
@ -776,6 +776,10 @@ public:
|
||||
#define ADD_UINT_SERIALIZER(PROP, DEF) \
|
||||
wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, unsigned int >( \
|
||||
#PROP, DEF, &MyClass::get##PROP, &MyClass::set##PROP) )
|
||||
|
||||
#define ADD_GLINT_SERIALIZER(PROP, DEF) \
|
||||
wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, GLint >( \
|
||||
#PROP, ((int)(DEF)), &MyClass::get##PROP, &MyClass::set##PROP) )
|
||||
|
||||
#define ADD_HEXINT_SERIALIZER(PROP, DEF) \
|
||||
wrapper->addSerializer( new osgDB::PropByValSerializer< MyClass, unsigned int >( \
|
||||
|
@ -8,6 +8,6 @@ REGISTER_OBJECT_WRAPPER( LineStipple,
|
||||
osg::LineStipple,
|
||||
"osg::Object osg::StateAttribute osg::LineStipple" )
|
||||
{
|
||||
ADD_INT_SERIALIZER( Factor, 1 ); // _factor
|
||||
ADD_GLINT_SERIALIZER( Factor, 1 ); // _factor
|
||||
ADD_HEXSHORT_SERIALIZER( Pattern, 0xffff ); // _pattern
|
||||
}
|
||||
|
@ -86,7 +86,7 @@ REGISTER_OBJECT_WRAPPER( Texture,
|
||||
ADD_BOOL_SERIALIZER( ClientStorageHint, false ); // _clientStorageHint
|
||||
ADD_BOOL_SERIALIZER( ResizeNonPowerOfTwoHint, false ); // _resizeNonPowerOfTwoHint
|
||||
ADD_VEC4D_SERIALIZER( BorderColor, osg::Vec4d(0.0,0.0,0.0,0.0) ); // _borderColor
|
||||
ADD_INT_SERIALIZER( BorderWidth, 0 ); // _borderWidth
|
||||
ADD_GLINT_SERIALIZER( BorderWidth, 0 ); // _borderWidth
|
||||
|
||||
BEGIN_ENUM_SERIALIZER( InternalFormatMode, USE_IMAGE_DATA_FORMAT );
|
||||
ADD_ENUM_VALUE( USE_IMAGE_DATA_FORMAT );
|
||||
|
Loading…
Reference in New Issue
Block a user