diff --git a/src/osgWrappers/osgAnimation/Animation.cpp b/src/osgWrappers/osgAnimation/Animation.cpp index a6c24ea90..844ad8997 100644 --- a/src/osgWrappers/osgAnimation/Animation.cpp +++ b/src/osgWrappers/osgAnimation/Animation.cpp @@ -106,11 +106,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) __float__getWeight, "", ""); - I_Method1(bool, update, IN, float, time, - Properties::NON_VIRTUAL, - __bool__update__float, - "", - ""); + I_MethodWithDefaults2(bool, update, IN, float, time, , IN, int, priority, 0, + Properties::NON_VIRTUAL, + __bool__update__float__int, + "", + ""); I_Method0(void, resetTargets, Properties::NON_VIRTUAL, __void__resetTargets, diff --git a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp index 73ca711e5..5fcd57e3f 100644 --- a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp +++ b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp @@ -43,11 +43,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationManagerBase) __void__buildTargetReference, "", ""); - I_Method1(void, registerAnimation, IN, osgAnimation::Animation *, animation, + I_Method1(void, registerAnimation, IN, osgAnimation::Animation *, x, Properties::VIRTUAL, __void__registerAnimation__Animation_P1, "", ""); + I_Method1(void, unregisterAnimation, IN, osgAnimation::Animation *, x, + Properties::VIRTUAL, + __void__unregisterAnimation__Animation_P1, + "", + ""); I_Method1(void, link, IN, osg::Node *, subgraph, Properties::VIRTUAL, __void__link__osg_Node_P1, diff --git a/src/osgWrappers/osgAnimation/Bone.cpp b/src/osgWrappers/osgAnimation/Bone.cpp index 02f1fa2df..9b2c0ed65 100644 --- a/src/osgWrappers/osgAnimation/Bone.cpp +++ b/src/osgWrappers/osgAnimation/Bone.cpp @@ -16,10 +16,10 @@ #include #include #include -#include #include #include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -127,6 +127,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) __C5_osg_Quat_R1__getRotation, "", ""); + I_Method0(const osg::Vec3 &, getScale, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getScale, + "", + ""); I_Method0(osg::Matrix, getMatrixInBoneSpace, Properties::NON_VIRTUAL, __osg_Matrix__getMatrixInBoneSpace, @@ -210,56 +215,13 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) __C5_osg_Quat_R1__getRotation, __void__setRotation__C5_osg_Quat_R1); I_SimpleProperty(const osg::Vec3 &, Scale, - 0, + __C5_osg_Vec3_R1__getScale, __void__setScale__C5_osg_Vec3_R1); I_SimpleProperty(const osg::Vec3 &, Translation, __C5_osg_Vec3_R1__getTranslation, __void__setTranslation__C5_osg_Vec3_R1); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone::BoneMapVisitor) - I_DeclaringFile("osgAnimation/Bone"); - I_BaseType(osg::NodeVisitor); - I_Constructor0(____BoneMapVisitor, - "", - ""); - I_Method0(const char *, libraryName, - Properties::VIRTUAL, - __C5_char_P1__libraryName, - "return the library name/namespapce of the visitor's. ", - "Should be defined by derived classes. "); - I_Method0(const char *, className, - Properties::VIRTUAL, - __C5_char_P1__className, - "return the name of the visitor's class type. ", - "Should be defined by derived classes. "); - I_Method1(void, apply, IN, osg::Node &, x, - Properties::VIRTUAL, - __void__apply__osg_Node_R1, - "", - ""); - I_Method1(void, apply, IN, osg::Transform &, node, - Properties::VIRTUAL, - __void__apply__osg_Transform_R1, - "", - ""); - I_PublicMemberProperty(osgAnimation::Bone::BoneMap, _map); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone::FindNearestParentAnimationManager) - I_DeclaringFile("osgAnimation/Bone"); - I_BaseType(osg::NodeVisitor); - I_Constructor0(____FindNearestParentAnimationManager, - "", - ""); - I_Method1(void, apply, IN, osg::Node &, node, - Properties::VIRTUAL, - __void__apply__osg_Node_R1, - "", - ""); - I_PublicMemberProperty(osg::ref_ptr< osgAnimation::AnimationManagerBase >, _manager); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone::UpdateBone) I_DeclaringFile("osgAnimation/Bone"); I_Method0(osg::Object *, cloneType, @@ -301,6 +263,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone::UpdateBone) __void__update__osgAnimation_Bone_R1, "", ""); + I_Method0(osgAnimation::QuatTarget *, getQuaternion, + Properties::NON_VIRTUAL, + __osgAnimation_QuatTarget_P1__getQuaternion, + "", + ""); + I_Method0(osgAnimation::Vec3Target *, getPosition, + Properties::NON_VIRTUAL, + __osgAnimation_Vec3Target_P1__getPosition, + "", + ""); + I_Method0(osgAnimation::Vec3Target *, getScale, + Properties::NON_VIRTUAL, + __osgAnimation_Vec3Target_P1__getScale, + "", + ""); I_Method0(bool, needLink, Properties::VIRTUAL, __bool__needLink, @@ -309,8 +286,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone::UpdateBone) I_Method1(bool, link, IN, osgAnimation::Channel *, channel, Properties::VIRTUAL, __bool__link__osgAnimation_Channel_P1, - "", + "Link channel. ", ""); + I_SimpleProperty(osgAnimation::Vec3Target *, Position, + __osgAnimation_Vec3Target_P1__getPosition, + 0); + I_SimpleProperty(osgAnimation::QuatTarget *, Quaternion, + __osgAnimation_QuatTarget_P1__getQuaternion, + 0); + I_SimpleProperty(osgAnimation::Vec3Target *, Scale, + __osgAnimation_Vec3Target_P1__getScale, + 0); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Bone >) diff --git a/src/osgWrappers/osgAnimation/Channel.cpp b/src/osgWrappers/osgAnimation/Channel.cpp index 68c43ddd1..174d6bb21 100644 --- a/src/osgWrappers/osgAnimation/Channel.cpp +++ b/src/osgWrappers/osgAnimation/Channel.cpp @@ -38,9 +38,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) __Channel_P1__clone, "", ""); - I_Method1(void, update, IN, float, time, + I_Method3(void, update, IN, float, time, IN, float, weight, IN, int, priority, Properties::PURE_VIRTUAL, - __void__update__float, + __void__update__float__float__int, "", ""); I_Method0(void, reset, @@ -88,16 +88,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) __void__setTargetName__C5_std_string_R1, "", ""); - I_Method0(float, getWeight, - Properties::NON_VIRTUAL, - __float__getWeight, - "", - ""); - I_Method1(void, setWeight, IN, float, w, - Properties::NON_VIRTUAL, - __void__setWeight__float, - "", - ""); I_Method0(osgAnimation::Sampler *, getSampler, Properties::PURE_VIRTUAL, __Sampler_P1__getSampler, @@ -126,9 +116,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) I_SimpleProperty(const std::string &, TargetName, __C5_std_string_R1__getTargetName, __void__setTargetName__C5_std_string_R1); - I_SimpleProperty(float, Weight, - __float__getWeight, - __void__setWeight__float); END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgAnimation::Channel > >, osgAnimation::ChannelList) diff --git a/src/osgWrappers/osgAnimation/LinkVisitor.cpp b/src/osgWrappers/osgAnimation/LinkVisitor.cpp index eeb9d1c3f..1aa4366fb 100644 --- a/src/osgWrappers/osgAnimation/LinkVisitor.cpp +++ b/src/osgWrappers/osgAnimation/LinkVisitor.cpp @@ -59,6 +59,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::LinkVisitor) __void__reset, "Method to call to reset visitor. ", "Useful if your visitor accumulates state during a traversal, and you plan to reuse the visitor. To flush that state for the next traversal: call reset() prior to each traversal. "); + I_Method0(unsigned int, getNbLinkedTarget, + Properties::NON_VIRTUAL, + __unsigned_int__getNbLinkedTarget, + "", + ""); I_ProtectedMethod1(void, handle_stateset, IN, osg::StateSet *, stateset, Properties::NON_VIRTUAL, Properties::NON_CONST, @@ -74,5 +79,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::LinkVisitor) I_SimpleProperty(osgAnimation::AnimationList &, AnimationList, __AnimationList_R1__getAnimationList, 0); + I_SimpleProperty(unsigned int, NbLinkedTarget, + __unsigned_int__getNbLinkedTarget, + 0); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/Target.cpp b/src/osgWrappers/osgAnimation/Target.cpp index 66e24a783..e2881a253 100644 --- a/src/osgWrappers/osgAnimation/Target.cpp +++ b/src/osgWrappers/osgAnimation/Target.cpp @@ -31,11 +31,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Target) __void__normalize, "", ""); - I_Method0(float, getWeight, - Properties::NON_VIRTUAL, - __float__getWeight, - "", - ""); I_Method0(void, reset, Properties::NON_VIRTUAL, __void__reset, @@ -46,12 +41,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Target) __int__getCount, "", ""); - I_ProtectedMethod1(void, addWeight, IN, float, w, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__addWeight__float, - "", - ""); + I_Method0(float, getWeight, + Properties::NON_VIRTUAL, + __float__getWeight, + "", + ""); I_SimpleProperty(int, Count, __int__getCount, 0); diff --git a/src/osgWrappers/osgAnimation/Timeline.cpp b/src/osgWrappers/osgAnimation/Timeline.cpp index d19e51e96..7ca818509 100644 --- a/src/osgWrappers/osgAnimation/Timeline.cpp +++ b/src/osgWrappers/osgAnimation/Timeline.cpp @@ -236,5 +236,3 @@ END_REFLECTOR STD_MAP_REFLECTOR(std::map< int COMMA osgAnimation::Timeline::ActionList >) -STD_VECTOR_REFLECTOR(std::vector< osgAnimation::FrameAction >) - diff --git a/src/osgWrappers/osgAnimation/UpdateCallback.cpp b/src/osgWrappers/osgAnimation/UpdateCallback.cpp index 94144061e..dd885be1f 100644 --- a/src/osgWrappers/osgAnimation/UpdateCallback.cpp +++ b/src/osgWrappers/osgAnimation/UpdateCallback.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -36,6 +37,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationUpdateCallbackBase) I_Constructor0(____AnimationUpdateCallbackBase, "", ""); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::PURE_VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "", + ""); I_Method0(osgAnimation::AnimationManagerBase *, getAnimationManager, Properties::PURE_VIRTUAL, __AnimationManagerBase_P1__getAnimationManager, @@ -183,5 +189,29 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateTransform) __bool__link__osgAnimation_Channel_P1, "", ""); + I_Method0(osgAnimation::Vec3Target *, getEuler, + Properties::NON_VIRTUAL, + __osgAnimation_Vec3Target_P1__getEuler, + "", + ""); + I_Method0(osgAnimation::Vec3Target *, getPosition, + Properties::NON_VIRTUAL, + __osgAnimation_Vec3Target_P1__getPosition, + "", + ""); + I_Method0(osgAnimation::Vec3Target *, getScale, + Properties::NON_VIRTUAL, + __osgAnimation_Vec3Target_P1__getScale, + "", + ""); + I_SimpleProperty(osgAnimation::Vec3Target *, Euler, + __osgAnimation_Vec3Target_P1__getEuler, + 0); + I_SimpleProperty(osgAnimation::Vec3Target *, Position, + __osgAnimation_Vec3Target_P1__getPosition, + 0); + I_SimpleProperty(osgAnimation::Vec3Target *, Scale, + __osgAnimation_Vec3Target_P1__getScale, + 0); END_REFLECTOR