Index: /OpenSceneGraph/trunk/src/osgWrappers/osg/StateAttributeCallback.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/osg/StateAttributeCallback.cpp (revision 10673) +++ /OpenSceneGraph/trunk/src/osgWrappers/osg/StateAttributeCallback.cpp (revision 10673) @@ -0,0 +1,63 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osg::StateAttributeCallback) + I_DeclaringFile("osg/StateAttributeCallback"); + I_VirtualBaseType(osg::Object); + I_Constructor0(____StateAttributeCallback, + "", + ""); + I_Constructor2(IN, const osg::StateAttributeCallback &, x, IN, const osg::CopyOp &, x, + ____StateAttributeCallback__C5_StateAttributeCallback_R1__C5_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); +END_REFLECTOR + Index: /OpenSceneGraph/trunk/src/osgWrappers/osg/StateAttribute.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/osg/StateAttribute.cpp (revision 9775) +++ /OpenSceneGraph/trunk/src/osgWrappers/osg/StateAttribute.cpp (revision 10673) @@ -12,8 +12,8 @@ #include -#include #include #include #include +#include #include #include @@ -98,4 +98,6 @@ TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList) +TYPE_NAME_ALIAS(osg::StateAttributeCallback, osg::StateAttribute::Callback) + BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) I_DeclaringFile("osg/StateAttribute"); @@ -198,32 +200,32 @@ "Check the modes associated with this StateAttribute are supported by current OpenGL drivers, and if not set the associated mode in osg::State to be black listed/invalid. ", "Return true if all associated modes are valid. "); - I_Method1(void, setUpdateCallback, IN, osg::StateAttribute::Callback *, uc, - Properties::NON_VIRTUAL, - __void__setUpdateCallback__Callback_P1, + I_Method1(void, setUpdateCallback, IN, osg::StateAttributeCallback *, uc, + Properties::NON_VIRTUAL, + __void__setUpdateCallback__StateAttributeCallback_P1, "Set the UpdateCallback which allows users to attach customize the updating of an object during the update traversal. ", ""); - I_Method0(osg::StateAttribute::Callback *, getUpdateCallback, - Properties::NON_VIRTUAL, - __Callback_P1__getUpdateCallback, + I_Method0(osg::StateAttributeCallback *, getUpdateCallback, + Properties::NON_VIRTUAL, + __StateAttributeCallback_P1__getUpdateCallback, "Get the non const UpdateCallback. ", ""); - I_Method0(const osg::StateAttribute::Callback *, getUpdateCallback, - Properties::NON_VIRTUAL, - __C5_Callback_P1__getUpdateCallback, + I_Method0(const osg::StateAttributeCallback *, getUpdateCallback, + Properties::NON_VIRTUAL, + __C5_StateAttributeCallback_P1__getUpdateCallback, "Get the const UpdateCallback. ", ""); - I_Method1(void, setEventCallback, IN, osg::StateAttribute::Callback *, ec, - Properties::NON_VIRTUAL, - __void__setEventCallback__Callback_P1, + I_Method1(void, setEventCallback, IN, osg::StateAttributeCallback *, ec, + Properties::NON_VIRTUAL, + __void__setEventCallback__StateAttributeCallback_P1, "Set the EventCallback which allows users to attach customize the updating of an object during the Event traversal. ", ""); - I_Method0(osg::StateAttribute::Callback *, getEventCallback, - Properties::NON_VIRTUAL, - __Callback_P1__getEventCallback, + I_Method0(osg::StateAttributeCallback *, getEventCallback, + Properties::NON_VIRTUAL, + __StateAttributeCallback_P1__getEventCallback, "Get the non const EventCallback. ", ""); - I_Method0(const osg::StateAttribute::Callback *, getEventCallback, - Properties::NON_VIRTUAL, - __C5_Callback_P1__getEventCallback, + I_Method0(const osg::StateAttributeCallback *, getEventCallback, + Properties::NON_VIRTUAL, + __C5_StateAttributeCallback_P1__getEventCallback, "Get the const EventCallback. ", ""); @@ -260,7 +262,7 @@ "", ""); - I_SimpleProperty(osg::StateAttribute::Callback *, EventCallback, - __Callback_P1__getEventCallback, - __void__setEventCallback__Callback_P1); + I_SimpleProperty(osg::StateAttributeCallback *, EventCallback, + __StateAttributeCallback_P1__getEventCallback, + __void__setEventCallback__StateAttributeCallback_P1); I_SimpleProperty(unsigned int, Member, __unsigned_int__getMember, @@ -282,44 +284,7 @@ __TypeMemberPair__getTypeMemberPair, 0); - I_SimpleProperty(osg::StateAttribute::Callback *, UpdateCallback, - __Callback_P1__getUpdateCallback, - __void__setUpdateCallback__Callback_P1); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::StateAttribute::Callback) - I_DeclaringFile("osg/StateAttribute"); - I_VirtualBaseType(osg::Object); - I_Constructor0(____Callback, - "", - ""); - I_Constructor2(IN, const osg::StateAttribute::Callback &, x, IN, const osg::CopyOp &, x, - ____Callback__C5_Callback_R1__C5_CopyOp_R1, - "", - ""); - I_Method0(osg::Object *, cloneType, - Properties::VIRTUAL, - __osg_Object_P1__cloneType, - "Clone the type of an object, with Object* return type. ", - "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, - Properties::VIRTUAL, - __osg_Object_P1__clone__C5_osg_CopyOp_R1, - "Clone an object, with Object* return type. ", - "Must be defined by derived classes. "); - I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, - Properties::VIRTUAL, - __bool__isSameKindAs__C5_osg_Object_P1, - "", - ""); - I_Method0(const char *, libraryName, - Properties::VIRTUAL, - __C5_char_P1__libraryName, - "return the name of the object's library. ", - "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); - I_Method0(const char *, className, - Properties::VIRTUAL, - __C5_char_P1__className, - "return the name of the object's class type. ", - "Must be defined by derived classes. "); + I_SimpleProperty(osg::StateAttributeCallback *, UpdateCallback, + __StateAttributeCallback_P1__getUpdateCallback, + __void__setUpdateCallback__StateAttributeCallback_P1); END_REFLECTOR Index: /OpenSceneGraph/trunk/src/osgWrappers/osg/CopyOp.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/osg/CopyOp.cpp (revision 10368) +++ /OpenSceneGraph/trunk/src/osgWrappers/osg/CopyOp.cpp (revision 10673) @@ -22,4 +22,5 @@ #include #include +#include #include #include @@ -48,5 +49,5 @@ I_EnumLabel(osg::CopyOp::DEEP_COPY_SHAPES); I_EnumLabel(osg::CopyOp::DEEP_COPY_UNIFORMS); - I_EnumLabel(osg::CopyOp::DEEP_COPY_NODECALLBACKS); + I_EnumLabel(osg::CopyOp::DEEP_COPY_CALLBACKS); I_EnumLabel(osg::CopyOp::DEEP_COPY_ALL); END_REFLECTOR Index: /OpenSceneGraph/trunk/src/osgWrappers/osg/ImageSequence.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/osg/ImageSequence.cpp (revision 9775) +++ /OpenSceneGraph/trunk/src/osgWrappers/osg/ImageSequence.cpp (revision 10673) @@ -272,5 +272,5 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageSequence::UpdateCallback) I_DeclaringFile("osg/ImageSequence"); - I_BaseType(osg::StateAttribute::Callback); + I_BaseType(osg::StateAttributeCallback); I_Constructor0(____UpdateCallback, "", Index: /OpenSceneGraph/trunk/src/osgWrappers/osgAnimation/UpdateCallback.cpp =================================================================== --- /OpenSceneGraph/trunk/src/osgWrappers/osgAnimation/UpdateCallback.cpp (revision 10563) +++ /OpenSceneGraph/trunk/src/osgWrappers/osgAnimation/UpdateCallback.cpp (revision 10673) @@ -132,4 +132,12 @@ "", ""); + I_Method0(osgAnimation::Vec4Target *, getDiffuse, + Properties::NON_VIRTUAL, + __osgAnimation_Vec4Target_P1__getDiffuse, + "", + ""); + I_SimpleProperty(osgAnimation::Vec4Target *, Diffuse, + __osgAnimation_Vec4Target_P1__getDiffuse, + 0); END_REFLECTOR