diff --git a/src/osgWrappers/introspection/genwrapper.conf b/src/osgWrappers/introspection/genwrapper.conf index b847ffeee..cc4777d9f 100644 --- a/src/osgWrappers/introspection/genwrapper.conf +++ b/src/osgWrappers/introspection/genwrapper.conf @@ -172,7 +172,6 @@ suppress reflector /osg::TemplateArray< osg::Vec3s\s*\,.*/ suppress reflector /osg::TemplateArray< osg::Vec4s\s*\,.*/ suppress reflector /osg::TemplateArray< osg::Vec4ub\s*\,.*/ - suppress reflector "osg::DrawArrayLengths" suppress reflector "osg::DrawElementsUByte" suppress reflector "osg::DrawElementsUShort" @@ -210,6 +209,8 @@ suppress reflector "osgAnimation::TemplateLinearInterpolator< osg::Vec2, osg::Ve suppress reflector "osgAnimation::TemplateLinearInterpolator< osg::Vec3, osg::Vec3 >" suppress reflector "osgAnimation::TemplateLinearInterpolator< osg::Vec3, osgAnimation::Vec3Packed >" suppress reflector "osgAnimation::TemplateLinearInterpolator< osg::Vec4, osg::Vec4 >" +suppress reflector "osgAnimation::TemplateLinearInterpolator< osg::Matrixf, osg::Matrixf >" + suppress reflector "osgAnimation::TemplateSphericalLinearInterpolator< osg::Quat, osg::Quat >" suppress reflector "osgAnimation::TemplateStepInterpolator< double, double >" @@ -262,11 +263,14 @@ suppress reflector "osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec3C suppress reflector "osgAnimation::TemplateKeyframe< osgAnimation::Vec4CubicBezier >" suppress reflector "osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec4CubicBezier >" +suppress reflector "osgAnimation::TemplateKeyframe< osg::Matrixf >" + suppress reflector "osgAnimation::TemplateCubicBezier< float >" suppress reflector "osgAnimation::TemplateCubicBezier< double >" suppress reflector "osgAnimation::TemplateCubicBezier< osg::Vec2 >" suppress reflector "osgAnimation::TemplateCubicBezier< osg::Vec3 >" suppress reflector "osgAnimation::TemplateCubicBezier< osg::Vec4 >" +suppress reflector "osgAnimation::TemplateCubicBezier< osg::Vec4 >" suppress reflector "osgAnimation::std::vector< osg::ref_ptr< osgAnimation::Channel > >" @@ -291,7 +295,26 @@ suppress reflector "osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezier suppress reflector "osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >" suppress reflector "osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >" +suppress reflector "osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >" + +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec2CubicBezierInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec2LinearInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec2StepInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec3CubicBezierInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec3LinearInterpolator > +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec3StepInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec4CubicBezierInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec4LinearInterpolator >" +suppress reflector "osgAnimation::TemplateSampler< osgAnimation::Vec4StepInterpolator >" + +suppress reflector "osgAnimation::TemplateTarget< osg::Matrixf >" + suppress reflector "osgAnimation::AnimationUpdateCallback" + +suppress reflector "osgAnimation::StackedTransform" + suppress reflector "osgDB::Registry::getObjectWrapperManager" configure reflector "osgDB::Registry" diff --git a/src/osgWrappers/introspection/osgAnimation/Channel.cpp b/src/osgWrappers/introspection/osgAnimation/Channel.cpp index 2e8aa2728..03f799c15 100644 --- a/src/osgWrappers/introspection/osgAnimation/Channel.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Channel.cpp @@ -201,122 +201,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Channel >) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >) - I_DeclaringFile("osgAnimation/Channel"); - I_BaseType(osgAnimation::Channel); - I_Method0(osgAnimation::Channel *, clone, - Properties::VIRTUAL, - __Channel_P1__clone, - "", - ""); - I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler > &, channel, - Properties::NON_EXPLICIT, - ____TemplateChannel__C5_TemplateChannel_R1, - "", - ""); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >::TargetType *, target, 0, - ____TemplateChannel__SamplerType_P1__TargetType_P1, - "", - ""); - I_Method0(bool, createKeyframeContainerFromTargetValue, - Properties::VIRTUAL, - __bool__createKeyframeContainerFromTargetValue, - "", - ""); - I_Method3(void, update, IN, float, time, IN, float, weight, IN, int, priority, - Properties::VIRTUAL, - __void__update__float__float__int, - "", - ""); - I_Method0(void, reset, - Properties::VIRTUAL, - __void__reset, - "", - ""); - I_Method0(osgAnimation::Target *, getTarget, - Properties::VIRTUAL, - __Target_P1__getTarget, - "", - ""); - I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, - Properties::VIRTUAL, - __bool__setTarget__Target_P1, - "", - ""); - I_Method0(SamplerType *, getOrCreateSampler, - Properties::NON_VIRTUAL, - __SamplerType_P1__getOrCreateSampler, - "", - ""); - I_Method0(osgAnimation::Sampler *, getSampler, - Properties::VIRTUAL, - __Sampler_P1__getSampler, - "", - ""); - I_Method0(const osgAnimation::Sampler *, getSampler, - Properties::VIRTUAL, - __C5_Sampler_P1__getSampler, - "", - ""); - I_Method0(SamplerType *, getSamplerTyped, - Properties::NON_VIRTUAL, - __SamplerType_P1__getSamplerTyped, - "", - ""); - I_Method0(const SamplerType *, getSamplerTyped, - Properties::NON_VIRTUAL, - __C5_SamplerType_P1__getSamplerTyped, - "", - ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, - Properties::NON_VIRTUAL, - __void__setSampler__SamplerType_P1, - "", - ""); - I_Method0(osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >::TargetType *, getTargetTyped, - Properties::NON_VIRTUAL, - __TargetType_P1__getTargetTyped, - "", - ""); - I_Method0(const osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >::TargetType *, getTargetTyped, - Properties::NON_VIRTUAL, - __C5_TargetType_P1__getTargetTyped, - "", - ""); - I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >::TargetType *, target, - Properties::NON_VIRTUAL, - __void__setTarget__TargetType_P1, - "", - ""); - I_Method0(float, getStartTime, - Properties::VIRTUAL, - __float__getStartTime, - "", - ""); - I_Method0(float, getEndTime, - Properties::VIRTUAL, - __float__getEndTime, - "", - ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, - 0); - I_SimpleProperty(SamplerType *, Sampler, - 0, - __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, - __SamplerType_P1__getSamplerTyped, - 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, - 0); - I_SimpleProperty(osgAnimation::Target *, Target, - __Target_P1__getTarget, - __bool__setTarget__Target_P1); - I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >::TargetType *, TargetTyped, - __TargetType_P1__getTargetTyped, - 0); -END_REFLECTOR - STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgAnimation::Channel > >) diff --git a/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp b/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp index 3874f7829..d4e4a1642 100644 --- a/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Interpolator.cpp @@ -60,16 +60,3 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec3 COMMA TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec4 COMMA osgAnimation::Vec4CubicBezier >, osgAnimation::Vec4CubicBezierInterpolator) -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Matrixf COMMA osg::Matrixf >) - I_DeclaringFile("osgAnimation/Interpolator"); - I_BaseType(osgAnimation::TemplateInterpolatorBase); - I_Constructor0(____TemplateLinearInterpolator, - "", - ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, - Properties::NON_VIRTUAL, - __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, - "", - ""); -END_REFLECTOR - diff --git a/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp b/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp index 0dbeba9f5..8663644a0 100644 --- a/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp @@ -105,31 +105,6 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< osgAnimation::Vec4CubicBezier >, TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec4CubicBezier >, osgAnimation::Vec4CubicBezierKeyframeContainer) -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Matrixf >) - I_DeclaringFile("osgAnimation/Keyframe"); - I_BaseType(osgAnimation::Keyframe); - I_Constructor0(____TemplateKeyframe, - "", - ""); - I_Constructor2(IN, float, time, IN, const T &, value, - ____TemplateKeyframe__float__C5_T_R1, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, - Properties::NON_VIRTUAL, - __void__setValue__C5_T_R1, - "", - ""); - I_Method0(const T &, getValue, - Properties::NON_VIRTUAL, - __C5_T_R1__getValue, - "", - ""); - I_SimpleProperty(const T &, Value, - __C5_T_R1__getValue, - __void__setValue__C5_T_R1); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframeContainer< osg::Matrixf >) I_DeclaringFile("osgAnimation/Keyframe"); I_BaseType(osgAnimation::KeyframeContainer); diff --git a/src/osgWrappers/introspection/osgAnimation/Sampler.cpp b/src/osgWrappers/introspection/osgAnimation/Sampler.cpp index 1c387cff3..1ef9cc12f 100644 --- a/src/osgWrappers/introspection/osgAnimation/Sampler.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Sampler.cpp @@ -469,71 +469,6 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatStepInt 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >) - I_DeclaringFile("osgAnimation/Sampler"); - I_BaseType(osgAnimation::Sampler); - I_Constructor0(____TemplateSampler, - "", - ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >::UsingType &, result, - Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, - "", - ""); - I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >::KeyframeContainerType *, kf, - Properties::NON_VIRTUAL, - __void__setKeyframeContainer__KeyframeContainerType_P1, - "", - ""); - I_Method0(osgAnimation::KeyframeContainer *, getKeyframeContainer, - Properties::VIRTUAL, - __KeyframeContainer_P1__getKeyframeContainer, - "", - ""); - I_Method0(const osgAnimation::KeyframeContainer *, getKeyframeContainer, - Properties::VIRTUAL, - __C5_KeyframeContainer_P1__getKeyframeContainer, - "", - ""); - I_Method0(osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, - Properties::NON_VIRTUAL, - __KeyframeContainerType_P1__getKeyframeContainerTyped, - "", - ""); - I_Method0(const osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, - Properties::NON_VIRTUAL, - __C5_KeyframeContainerType_P1__getKeyframeContainerTyped, - "", - ""); - I_Method0(osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >::KeyframeContainerType *, getOrCreateKeyframeContainer, - Properties::NON_VIRTUAL, - __KeyframeContainerType_P1__getOrCreateKeyframeContainer, - "", - ""); - I_Method0(float, getStartTime, - Properties::NON_VIRTUAL, - __float__getStartTime, - "", - ""); - I_Method0(float, getEndTime, - Properties::NON_VIRTUAL, - __float__getEndTime, - "", - ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, - 0); - I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, - __KeyframeContainer_P1__getKeyframeContainer, - 0); - I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, - __KeyframeContainerType_P1__getKeyframeContainerTyped, - 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, - 0); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::QuatSphericalLinearInterpolator >) I_DeclaringFile("osgAnimation/Sampler"); I_BaseType(osgAnimation::Sampler); @@ -599,71 +534,6 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::QuatSpherica 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >) - I_DeclaringFile("osgAnimation/Sampler"); - I_BaseType(osgAnimation::Sampler); - I_Constructor0(____TemplateSampler, - "", - ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >::UsingType &, result, - Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, - "", - ""); - I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >::KeyframeContainerType *, kf, - Properties::NON_VIRTUAL, - __void__setKeyframeContainer__KeyframeContainerType_P1, - "", - ""); - I_Method0(osgAnimation::KeyframeContainer *, getKeyframeContainer, - Properties::VIRTUAL, - __KeyframeContainer_P1__getKeyframeContainer, - "", - ""); - I_Method0(const osgAnimation::KeyframeContainer *, getKeyframeContainer, - Properties::VIRTUAL, - __C5_KeyframeContainer_P1__getKeyframeContainer, - "", - ""); - I_Method0(osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, - Properties::NON_VIRTUAL, - __KeyframeContainerType_P1__getKeyframeContainerTyped, - "", - ""); - I_Method0(const osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, - Properties::NON_VIRTUAL, - __C5_KeyframeContainerType_P1__getKeyframeContainerTyped, - "", - ""); - I_Method0(osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >::KeyframeContainerType *, getOrCreateKeyframeContainer, - Properties::NON_VIRTUAL, - __KeyframeContainerType_P1__getOrCreateKeyframeContainer, - "", - ""); - I_Method0(float, getStartTime, - Properties::NON_VIRTUAL, - __float__getStartTime, - "", - ""); - I_Method0(float, getEndTime, - Properties::NON_VIRTUAL, - __float__getEndTime, - "", - ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, - 0); - I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, - __KeyframeContainer_P1__getKeyframeContainer, - 0); - I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, - __KeyframeContainerType_P1__getKeyframeContainerTyped, - 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, - 0); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec2CubicBezierInterpolator >) I_DeclaringFile("osgAnimation/Sampler"); I_BaseType(osgAnimation::Sampler); diff --git a/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp b/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp index 8fa99be1e..48b9dc275 100644 --- a/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp +++ b/src/osgWrappers/introspection/osgAnimation/StackedTransform.cpp @@ -22,28 +22,3 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osgAnimation::StackedTransform) - I_DeclaringFile("osgAnimation/StackedTransform"); - I_BaseType(osg::MixinVector); - I_Constructor0(____StackedTransform, - "", - ""); - I_ConstructorWithDefaults2(IN, const osgAnimation::StackedTransform &, x, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____StackedTransform__C5_StackedTransform_R1__C5_osg_CopyOp_R1, - "", - ""); - I_Method0(void, update, - Properties::NON_VIRTUAL, - __void__update, - "", - ""); - I_Method0(const osg::Matrix &, getMatrix, - Properties::NON_VIRTUAL, - __C5_osg_Matrix_R1__getMatrix, - "", - ""); - I_SimpleProperty(const osg::Matrix &, Matrix, - __C5_osg_Matrix_R1__getMatrix, - 0); -END_REFLECTOR - diff --git a/src/osgWrappers/introspection/osgAnimation/Target.cpp b/src/osgWrappers/introspection/osgAnimation/Target.cpp index adc70bcdb..60c804839 100644 --- a/src/osgWrappers/introspection/osgAnimation/Target.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Target.cpp @@ -68,44 +68,3 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateTarget< float >, osgAnimation::FloatTarget TYPE_NAME_ALIAS(osgAnimation::TemplateTarget< double >, osgAnimation::DoubleTarget) -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Matrixf >) - I_DeclaringFile("osgAnimation/Target"); - I_BaseType(osgAnimation::Target); - I_Constructor0(____TemplateTarget, - "", - ""); - I_Constructor1(IN, const T &, v, - Properties::NON_EXPLICIT, - ____TemplateTarget__C5_T_R1, - "", - ""); - I_Constructor1(IN, const osgAnimation::TemplateTarget< osg::Matrixf > &, v, - Properties::NON_EXPLICIT, - ____TemplateTarget__C5_TemplateTarget_R1, - "", - ""); - I_Method3(void, lerp, IN, float, t, IN, const T &, a, IN, const T &, b, - Properties::NON_VIRTUAL, - __void__lerp__float__C5_T_R1__C5_T_R1, - "", - ""); - I_Method3(void, update, IN, float, weight, IN, const T &, val, IN, int, priority, - Properties::NON_VIRTUAL, - __void__update__float__C5_T_R1__int, - "The priority is used to detect a change of priority It's important to update animation target in priority order. ", - "eg: all animation with priority 1 all animation with priority 0 all animation with priority -1 ... "); - I_Method0(const T &, getValue, - Properties::NON_VIRTUAL, - __C5_T_R1__getValue, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, - Properties::NON_VIRTUAL, - __void__setValue__C5_T_R1, - "", - ""); - I_SimpleProperty(const T &, Value, - __C5_T_R1__getValue, - __void__setValue__C5_T_R1); -END_REFLECTOR -