diff --git a/src/osgWrappers/introspection/osgAnimation/Animation.cpp b/src/osgWrappers/introspection/osgAnimation/Animation.cpp index 844ad8997..814289d4b 100644 --- a/src/osgWrappers/introspection/osgAnimation/Animation.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Animation.cpp @@ -91,9 +91,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) __void__computeDuration, "Compute duration from channel and keyframes if the duration is not specified you should call this method before using it. ", ""); - I_Method0(float, getDuration, + I_Method0(double, getDuration, Properties::NON_VIRTUAL, - __float__getDuration, + __double__getDuration, "", ""); I_Method1(void, setWeight, IN, float, weight, @@ -106,9 +106,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) __float__getWeight, "", ""); - I_MethodWithDefaults2(bool, update, IN, float, time, , IN, int, priority, 0, + I_MethodWithDefaults2(bool, update, IN, double, time, , IN, int, priority, 0, Properties::NON_VIRTUAL, - __bool__update__float__int, + __bool__update__double__int, "", ""); I_Method0(void, resetTargets, @@ -126,14 +126,14 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) __PlayMode__getPlayMode, "", ""); - I_Method1(void, setStartTime, IN, float, time, + I_Method1(void, setStartTime, IN, double, time, Properties::NON_VIRTUAL, - __void__setStartTime__float, + __void__setStartTime__double, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); I_ProtectedMethod0(double, computeDurationFromChannels, @@ -146,7 +146,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) __ChannelList_R1__getChannels, 0); I_SimpleProperty(double, Duration, - 0, + __double__getDuration, __void__setDuration__double); I_SimpleProperty(osgAnimation::Animation::PlayMode, PlayMode, __PlayMode__getPlayMode, @@ -154,9 +154,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) I_SimpleProperty(osgAnimation::Animation::PlayMode, Playmode, 0, __void__setPlaymode__PlayMode); - I_SimpleProperty(float, StartTime, - __float__getStartTime, - __void__setStartTime__float); + I_SimpleProperty(double, StartTime, + __double__getStartTime, + __void__setStartTime__double); I_SimpleProperty(float, Weight, __float__getWeight, __void__setWeight__float); diff --git a/src/osgWrappers/introspection/osgAnimation/Channel.cpp b/src/osgWrappers/introspection/osgAnimation/Channel.cpp index 03f799c15..561b8ef1a 100644 --- a/src/osgWrappers/introspection/osgAnimation/Channel.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Channel.cpp @@ -38,9 +38,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) __Channel_P1__clone, "", ""); - I_Method3(void, update, IN, float, time, IN, float, weight, IN, int, priority, + I_Method3(void, update, IN, double, time, IN, float, weight, IN, int, priority, Properties::PURE_VIRTUAL, - __void__update__float__float__int, + __void__update__double__float__int, "", ""); I_Method0(void, reset, @@ -68,14 +68,14 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) __void__setName__C5_std_string_R1, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::PURE_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::PURE_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); I_Method0(const std::string &, getTargetName, @@ -103,8 +103,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) __bool__createKeyframeContainerFromTargetValue, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(const std::string &, Name, __C5_std_string_R1__getName, @@ -112,8 +112,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) I_SimpleProperty(osgAnimation::Sampler *, Sampler, __Sampler_P1__getSampler, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, diff --git a/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp b/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp index 8663644a0..3b42ffead 100644 --- a/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Keyframe.cpp @@ -25,19 +25,19 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::Keyframe) I_Constructor0(____Keyframe, "", ""); - I_Method0(float, getTime, + I_Method0(double, getTime, Properties::NON_VIRTUAL, - __float__getTime, + __double__getTime, "", ""); - I_Method1(void, setTime, IN, float, time, + I_Method1(void, setTime, IN, double, time, Properties::NON_VIRTUAL, - __void__setTime__float, + __void__setTime__double, "", ""); - I_SimpleProperty(float, Time, - __float__getTime, - __void__setTime__float); + I_SimpleProperty(double, Time, + __double__getTime, + __void__setTime__double); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::KeyframeContainer) diff --git a/src/osgWrappers/introspection/osgAnimation/Sampler.cpp b/src/osgWrappers/introspection/osgAnimation/Sampler.cpp index f8fdba23f..abb7f58e7 100644 --- a/src/osgWrappers/introspection/osgAnimation/Sampler.cpp +++ b/src/osgWrappers/introspection/osgAnimation/Sampler.cpp @@ -85,9 +85,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleCubicB I_Constructor0(____TemplateSampler, "", ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleCubicBezierInterpolator >::UsingType &, result, + I_Method2(void, getValueAt, IN, double, time, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleCubicBezierInterpolator >::UsingType &, result, Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, + __void__getValueAt__double__UsingType_R1, "", ""); I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleCubicBezierInterpolator >::KeyframeContainerType *, kf, @@ -120,18 +120,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleCubicB __KeyframeContainerType_P1__getOrCreateKeyframeContainer, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::NON_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, __KeyframeContainer_P1__getKeyframeContainer, @@ -139,8 +139,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleCubicB I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::DoubleCubicBezierInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, __KeyframeContainerType_P1__getKeyframeContainerTyped, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); END_REFLECTOR @@ -150,9 +150,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleLinear I_Constructor0(____TemplateSampler, "", ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleLinearInterpolator >::UsingType &, result, + I_Method2(void, getValueAt, IN, double, time, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleLinearInterpolator >::UsingType &, result, Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, + __void__getValueAt__double__UsingType_R1, "", ""); I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleLinearInterpolator >::KeyframeContainerType *, kf, @@ -185,18 +185,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleLinear __KeyframeContainerType_P1__getOrCreateKeyframeContainer, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::NON_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, __KeyframeContainer_P1__getKeyframeContainer, @@ -204,8 +204,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleLinear I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::DoubleLinearInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, __KeyframeContainerType_P1__getKeyframeContainerTyped, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); END_REFLECTOR @@ -215,9 +215,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleStepIn I_Constructor0(____TemplateSampler, "", ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::UsingType &, result, + I_Method2(void, getValueAt, IN, double, time, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::UsingType &, result, Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, + __void__getValueAt__double__UsingType_R1, "", ""); I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::KeyframeContainerType *, kf, @@ -250,18 +250,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleStepIn __KeyframeContainerType_P1__getOrCreateKeyframeContainer, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::NON_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, __KeyframeContainer_P1__getKeyframeContainer, @@ -269,8 +269,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleStepIn I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, __KeyframeContainerType_P1__getKeyframeContainerTyped, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); END_REFLECTOR @@ -280,9 +280,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatCubicBe I_Constructor0(____TemplateSampler, "", ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::FloatCubicBezierInterpolator >::UsingType &, result, + I_Method2(void, getValueAt, IN, double, time, IN, osgAnimation::TemplateSampler< osgAnimation::FloatCubicBezierInterpolator >::UsingType &, result, Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, + __void__getValueAt__double__UsingType_R1, "", ""); I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::FloatCubicBezierInterpolator >::KeyframeContainerType *, kf, @@ -315,18 +315,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatCubicBe __KeyframeContainerType_P1__getOrCreateKeyframeContainer, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::NON_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, __KeyframeContainer_P1__getKeyframeContainer, @@ -334,8 +334,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatCubicBe I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::FloatCubicBezierInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, __KeyframeContainerType_P1__getKeyframeContainerTyped, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); END_REFLECTOR @@ -345,9 +345,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatLinearI I_Constructor0(____TemplateSampler, "", ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::FloatLinearInterpolator >::UsingType &, result, + I_Method2(void, getValueAt, IN, double, time, IN, osgAnimation::TemplateSampler< osgAnimation::FloatLinearInterpolator >::UsingType &, result, Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, + __void__getValueAt__double__UsingType_R1, "", ""); I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::FloatLinearInterpolator >::KeyframeContainerType *, kf, @@ -380,18 +380,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatLinearI __KeyframeContainerType_P1__getOrCreateKeyframeContainer, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::NON_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, __KeyframeContainer_P1__getKeyframeContainer, @@ -399,8 +399,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatLinearI I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::FloatLinearInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, __KeyframeContainerType_P1__getKeyframeContainerTyped, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); END_REFLECTOR @@ -410,9 +410,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatStepInt I_Constructor0(____TemplateSampler, "", ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::UsingType &, result, + I_Method2(void, getValueAt, IN, double, time, IN, osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::UsingType &, result, Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, + __void__getValueAt__double__UsingType_R1, "", ""); I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::KeyframeContainerType *, kf, @@ -445,18 +445,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatStepInt __KeyframeContainerType_P1__getOrCreateKeyframeContainer, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::NON_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, __KeyframeContainer_P1__getKeyframeContainer, @@ -464,8 +464,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatStepInt I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, __KeyframeContainerType_P1__getKeyframeContainerTyped, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); END_REFLECTOR @@ -475,9 +475,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::QuatSpherica I_Constructor0(____TemplateSampler, "", ""); - I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::QuatSphericalLinearInterpolator >::UsingType &, result, + I_Method2(void, getValueAt, IN, double, time, IN, osgAnimation::TemplateSampler< osgAnimation::QuatSphericalLinearInterpolator >::UsingType &, result, Properties::NON_VIRTUAL, - __void__getValueAt__float__UsingType_R1, + __void__getValueAt__double__UsingType_R1, "", ""); I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::QuatSphericalLinearInterpolator >::KeyframeContainerType *, kf, @@ -510,18 +510,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::QuatSpherica __KeyframeContainerType_P1__getOrCreateKeyframeContainer, "", ""); - I_Method0(float, getStartTime, + I_Method0(double, getStartTime, Properties::NON_VIRTUAL, - __float__getStartTime, + __double__getStartTime, "", ""); - I_Method0(float, getEndTime, + I_Method0(double, getEndTime, Properties::NON_VIRTUAL, - __float__getEndTime, + __double__getEndTime, "", ""); - I_SimpleProperty(float, EndTime, - __float__getEndTime, + I_SimpleProperty(double, EndTime, + __double__getEndTime, 0); I_SimpleProperty(osgAnimation::KeyframeContainer *, KeyframeContainer, __KeyframeContainer_P1__getKeyframeContainer, @@ -529,8 +529,8 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::QuatSpherica I_SimpleProperty(osgAnimation::TemplateSampler< osgAnimation::QuatSphericalLinearInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, __KeyframeContainerType_P1__getKeyframeContainerTyped, 0); - I_SimpleProperty(float, StartTime, - __float__getStartTime, + I_SimpleProperty(double, StartTime, + __double__getStartTime, 0); END_REFLECTOR diff --git a/src/osgWrappers/introspection/osgTerrain/Layer.cpp b/src/osgWrappers/introspection/osgTerrain/Layer.cpp index b34095e30..128da72b0 100644 --- a/src/osgWrappers/introspection/osgTerrain/Layer.cpp +++ b/src/osgWrappers/introspection/osgTerrain/Layer.cpp @@ -756,6 +756,11 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer) __bool__getInterpolatedValue__double__double__float_R1, "", ""); + I_Method3(bool, getInterpolatedValidValue, IN, double, ndc_x, IN, double, ndc_y, IN, float &, value, + Properties::NON_VIRTUAL, + __bool__getInterpolatedValidValue__double__double__float_R1, + "", + ""); I_Method0(void, dirty, Properties::VIRTUAL, __void__dirty,