diff --git a/src/osgWrappers/OpenThreads/Thread.cpp b/src/osgWrappers/OpenThreads/Thread.cpp index ca1249454..31d574fe0 100644 --- a/src/osgWrappers/OpenThreads/Thread.cpp +++ b/src/osgWrappers/OpenThreads/Thread.cpp @@ -40,34 +40,6 @@ END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(OpenThreads::Thread) I_DeclaringFile("OpenThreads/Thread"); - I_StaticMethod1(int, SetConcurrency, IN, int, concurrencyLevel, - __int__SetConcurrency__int_S, - "Set the concurrency level for a running application. ", - "This method only has effect if the pthreads thread model is being used, and then only when that model is many-to-one (eg. irix). in other cases it is ignored. The concurrency level is only a *hint* as to the number of execution vehicles to use, the actual implementation may do anything it wants. Setting the value to 0 returns things to their default state.previous concurrency level, -1 indicates no-op. "); - I_StaticMethod0(int, GetConcurrency, - __int__GetConcurrency_S, - "Get the concurrency level for a running application. ", - "In this case, a return code of 0 means that the application is in default mode. A return code of -1 means that the application is incapable of setting an arbitrary concurrency, because it is a one-to-one execution model (sprocs, linuxThreads) "); - I_StaticMethod0(OpenThreads::Thread *, CurrentThread, - __Thread_P1__CurrentThread_S, - "Return a pointer to the current running thread. ", - ""); - I_StaticMethod0(void, Init, - __void__Init_S, - "Initialize Threading in a program. ", - "This method must be called before you can do any threading in a program. "); - I_StaticMethod0(int, YieldCurrentThread, - __int__YieldCurrentThread_S, - "Yield the processor. ", - "This method operates on the calling process. And is equivalent to calling sched_yield(). 0 if normal, -1 if errno set, errno code otherwise. "); - I_StaticMethod0(OpenThreads::Thread::ThreadPriority, GetMasterPriority, - __ThreadPriority__GetMasterPriority_S, - "This method will return the ThreadPriority of the master process. ", - "(ie, the one calling the thread->start() methods for the first time) The method will almost certainly return Thread::THREAD_PRIORITY_DEFAULT if Init() has not been called.the Thread::ThreadPriority of the master thread. "); - I_StaticMethod1(int, microSleep, IN, unsigned int, microsec, - __int__microSleep__unsigned_int_S, - "microSleep method, equivilant to the posix usleep(microsec). ", - "This is not strictly thread API but is used so often with threads. It's basically UNIX usleep. Parameter is number of microseconds we current thread to sleep. Returns 0 on succes, non-zero on failure (UNIX errno or GetLastError() will give detailed description. "); I_Constructor0(____Thread, "Constructor. ", ""); @@ -186,6 +158,34 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(OpenThreads::Thread) __int__setProcessorAffinity__unsigned_int, "Thread's processor affinity method. ", "This binds a thread to a processor whenever possible. This call must be made before start() or startThread() and has no effect after the thread has been running. In the pthreads implementation, this is only implemented on sgi, through a pthread extension. On other pthread platforms this is ignored. Returns 0 on success, implementation's error on failure, or -1 if ignored. "); + I_StaticMethod1(int, SetConcurrency, IN, int, concurrencyLevel, + __int__SetConcurrency__int_S, + "Set the concurrency level for a running application. ", + "This method only has effect if the pthreads thread model is being used, and then only when that model is many-to-one (eg. irix). in other cases it is ignored. The concurrency level is only a *hint* as to the number of execution vehicles to use, the actual implementation may do anything it wants. Setting the value to 0 returns things to their default state.previous concurrency level, -1 indicates no-op. "); + I_StaticMethod0(int, GetConcurrency, + __int__GetConcurrency_S, + "Get the concurrency level for a running application. ", + "In this case, a return code of 0 means that the application is in default mode. A return code of -1 means that the application is incapable of setting an arbitrary concurrency, because it is a one-to-one execution model (sprocs, linuxThreads) "); + I_StaticMethod0(OpenThreads::Thread *, CurrentThread, + __Thread_P1__CurrentThread_S, + "Return a pointer to the current running thread. ", + ""); + I_StaticMethod0(void, Init, + __void__Init_S, + "Initialize Threading in a program. ", + "This method must be called before you can do any threading in a program. "); + I_StaticMethod0(int, YieldCurrentThread, + __int__YieldCurrentThread_S, + "Yield the processor. ", + "This method operates on the calling process. And is equivalent to calling sched_yield(). 0 if normal, -1 if errno set, errno code otherwise. "); + I_StaticMethod0(OpenThreads::Thread::ThreadPriority, GetMasterPriority, + __ThreadPriority__GetMasterPriority_S, + "This method will return the ThreadPriority of the master process. ", + "(ie, the one calling the thread->start() methods for the first time) The method will almost certainly return Thread::THREAD_PRIORITY_DEFAULT if Init() has not been called.the Thread::ThreadPriority of the master thread. "); + I_StaticMethod1(int, microSleep, IN, unsigned int, microsec, + __int__microSleep__unsigned_int_S, + "microSleep method, equivilant to the posix usleep(microsec). ", + "This is not strictly thread API but is used so often with threads. It's basically UNIX usleep. Parameter is number of microseconds we current thread to sleep. Returns 0 on succes, non-zero on failure (UNIX errno or GetLastError() will give detailed description. "); I_SimpleProperty(void *, Implementation, __void_P1__getImplementation, 0); diff --git a/src/osgWrappers/osg/AlphaFunc.cpp b/src/osgWrappers/osg/AlphaFunc.cpp index ee116505a..9afd19fc7 100644 --- a/src/osgWrappers/osg/AlphaFunc.cpp +++ b/src/osgWrappers/osg/AlphaFunc.cpp @@ -55,7 +55,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -85,7 +85,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -115,7 +115,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc) __float__getReferenceValue, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/AnimationPath.cpp b/src/osgWrappers/osg/AnimationPath.cpp index cb9b0eebf..d4ed0d95a 100644 --- a/src/osgWrappers/osg/AnimationPath.cpp +++ b/src/osgWrappers/osg/AnimationPath.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::map< double COMMA osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap) + BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) I_DeclaringFile("osg/AnimationPath"); I_EnumLabel(osg::AnimationPath::SWING); @@ -35,8 +37,6 @@ BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) I_EnumLabel(osg::AnimationPath::NO_LOOPING); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< double COMMA osg::AnimationPath::ControlPoint >, osg::AnimationPath::TimeControlPointMap) - BEGIN_OBJECT_REFLECTOR(osg::AnimationPath) I_DeclaringFile("osg/AnimationPath"); I_VirtualBaseType(osg::Object); @@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AnimationPath) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -288,7 +288,7 @@ BEGIN_OBJECT_REFLECTOR(osg::AnimationPathCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/ApplicationUsage.cpp b/src/osgWrappers/osg/ApplicationUsage.cpp index acf3c22f2..ef81b8a57 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osg::ApplicationUsage::UsageMap) + BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) I_DeclaringFile("osg/ApplicationUsage"); I_EnumLabel(osg::ApplicationUsage::NO_HELP); @@ -29,15 +31,9 @@ BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) I_EnumLabel(osg::ApplicationUsage::HELP_ALL); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osg::ApplicationUsage::UsageMap) - BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage) I_DeclaringFile("osg/ApplicationUsage"); I_BaseType(osg::Referenced); - I_StaticMethod0(osg::ApplicationUsage *, instance, - __ApplicationUsage_P1__instance_S, - "", - ""); I_Constructor0(____ApplicationUsage, "", ""); @@ -166,6 +162,10 @@ BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage) __void__writeEnvironmentSettings__std_ostream_R1, "", ""); + I_StaticMethod0(osg::ApplicationUsage *, instance, + __ApplicationUsage_P1__instance_S, + "", + ""); I_SimpleProperty(const std::string &, ApplicationName, __C5_std_string_R1__getApplicationName, __void__setApplicationName__C5_std_string_R1); diff --git a/src/osgWrappers/osg/ArgumentParser.cpp b/src/osgWrappers/osg/ArgumentParser.cpp index 91fec3a37..9f71e3b7f 100644 --- a/src/osgWrappers/osg/ArgumentParser.cpp +++ b/src/osgWrappers/osg/ArgumentParser.cpp @@ -21,32 +21,16 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap) + BEGIN_ENUM_REFLECTOR(osg::ArgumentParser::ErrorSeverity) I_DeclaringFile("osg/ArgumentParser"); I_EnumLabel(osg::ArgumentParser::BENIGN); I_EnumLabel(osg::ArgumentParser::CRITICAL); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ArgumentParser::ErrorSeverity >, osg::ArgumentParser::ErrorMessageMap) - BEGIN_VALUE_REFLECTOR(osg::ArgumentParser) I_DeclaringFile("osg/ArgumentParser"); - I_StaticMethod1(bool, isOption, IN, const char *, str, - __bool__isOption__C5_char_P1_S, - "Return true if the specified string is an option in the form -option or --option. ", - ""); - I_StaticMethod1(bool, isString, IN, const char *, str, - __bool__isString__C5_char_P1_S, - "Return true if string is non-NULL and not an option in the form -option or --option. ", - ""); - I_StaticMethod1(bool, isNumber, IN, const char *, str, - __bool__isNumber__C5_char_P1_S, - "Return true if specified parameter is a number. ", - ""); - I_StaticMethod1(bool, isBool, IN, const char *, str, - __bool__isBool__C5_char_P1_S, - "Return true if specified parameter is a bool. ", - ""); I_Constructor2(IN, int *, argc, IN, char **, argv, ____ArgumentParser__int_P1__char_P1P1, "", @@ -241,6 +225,22 @@ BEGIN_VALUE_REFLECTOR(osg::ArgumentParser) __ApplicationUsage_Type__readHelpType, "This convinience method handles help requests on the command line. ", "Return the type(s) of help requested. The return value of this function is suitable for passing into getApplicationUsage()->write(). If ApplicationUsage::NO_HELP is returned then no help commandline option was found on the command line. "); + I_StaticMethod1(bool, isOption, IN, const char *, str, + __bool__isOption__C5_char_P1_S, + "Return true if the specified string is an option in the form -option or --option. ", + ""); + I_StaticMethod1(bool, isString, IN, const char *, str, + __bool__isString__C5_char_P1_S, + "Return true if string is non-NULL and not an option in the form -option or --option. ", + ""); + I_StaticMethod1(bool, isNumber, IN, const char *, str, + __bool__isNumber__C5_char_P1_S, + "Return true if specified parameter is a number. ", + ""); + I_StaticMethod1(bool, isBool, IN, const char *, str, + __bool__isBool__C5_char_P1_S, + "Return true if specified parameter is a bool. ", + ""); I_SimpleProperty(std::string, ApplicationName, __std_string__getApplicationName, 0); diff --git a/src/osgWrappers/osg/AudioStream.cpp b/src/osgWrappers/osg/AudioStream.cpp new file mode 100644 index 000000000..8497923b8 --- /dev/null +++ b/src/osgWrappers/osg/AudioStream.cpp @@ -0,0 +1,152 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_ABSTRACT_OBJECT_REFLECTOR(osg::AudioSink) + I_DeclaringFile("osg/AudioStream"); + I_BaseType(osg::Object); + I_Constructor0(____AudioSink, + "", + ""); + 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_Method0(void, play, + Properties::PURE_VIRTUAL, + __void__play, + "", + ""); + I_Method0(void, pause, + Properties::PURE_VIRTUAL, + __void__pause, + "", + ""); + I_Method0(void, stop, + Properties::PURE_VIRTUAL, + __void__stop, + "", + ""); + I_Method0(bool, playing, + Properties::PURE_VIRTUAL, + __bool__playing, + "", + ""); + I_Method0(double, getDelay, + Properties::VIRTUAL, + __double__getDelay, + "", + ""); + I_Method1(void, setDelay, IN, const double, delay, + Properties::VIRTUAL, + __void__setDelay__C5_double, + "", + ""); + I_Method1(void, setVolume, IN, float, x, + Properties::VIRTUAL, + __void__setVolume__float, + "", + ""); + I_Method0(float, getVolume, + Properties::VIRTUAL, + __float__getVolume, + "", + ""); + I_SimpleProperty(double, Delay, + __double__getDelay, + 0); + I_SimpleProperty(float, Volume, + __float__getVolume, + __void__setVolume__float); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::AudioStream::SampleFormat) + I_DeclaringFile("osg/AudioStream"); + I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_U8); + I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_S16); + I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_S24); + I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_S32); + I_EnumLabel(osg::AudioStream::SAMPLE_FORMAT_F32); +END_REFLECTOR + +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AudioStream) + I_DeclaringFile("osg/AudioStream"); + I_BaseType(osg::Object); + I_Constructor0(____AudioStream, + "", + ""); + I_ConstructorWithDefaults2(IN, const osg::AudioStream &, audio, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____AudioStream__C5_AudioStream_R1__C5_CopyOp_R1, + "Copy constructor using CopyOp to manage deep vs shallow copy. ", + ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_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_Method1(void, setAudioSink, IN, osg::AudioSink *, audio_sink, + Properties::PURE_VIRTUAL, + __void__setAudioSink__osg_AudioSink_P1, + "", + ""); + I_Method2(void, consumeAudioBuffer, IN, void *const, buffer, IN, const size_t, size, + Properties::PURE_VIRTUAL, + __void__consumeAudioBuffer__void_P1C5__C5_size_t, + "", + ""); + I_Method0(int, audioFrequency, + Properties::PURE_VIRTUAL, + __int__audioFrequency, + "", + ""); + I_Method0(int, audioNbChannels, + Properties::PURE_VIRTUAL, + __int__audioNbChannels, + "", + ""); + I_Method0(osg::AudioStream::SampleFormat, audioSampleFormat, + Properties::PURE_VIRTUAL, + __SampleFormat__audioSampleFormat, + "", + ""); + I_SimpleProperty(osg::AudioSink *, AudioSink, + 0, + __void__setAudioSink__osg_AudioSink_P1); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index d24c5f36a..bf25c9b4a 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -27,6 +27,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList) + BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) I_DeclaringFile("osg/Billboard"); I_EnumLabel(osg::Billboard::POINT_ROT_EYE); @@ -34,8 +36,6 @@ BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) I_EnumLabel(osg::Billboard::AXIAL_ROT); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osg::Billboard::PositionList) - BEGIN_OBJECT_REFLECTOR(osg::Billboard) I_DeclaringFile("osg/Billboard"); I_BaseType(osg::Geode); diff --git a/src/osgWrappers/osg/BlendColor.cpp b/src/osgWrappers/osg/BlendColor.cpp index fa15c052f..da71d6ffb 100644 --- a/src/osgWrappers/osg/BlendColor.cpp +++ b/src/osgWrappers/osg/BlendColor.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -95,7 +95,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor) __C5_osg_Vec4_R1__getConstantColor, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/BlendEquation.cpp b/src/osgWrappers/osg/BlendEquation.cpp index 43ffd8c3e..57519bfe1 100644 --- a/src/osgWrappers/osg/BlendEquation.cpp +++ b/src/osgWrappers/osg/BlendEquation.cpp @@ -56,7 +56,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -86,7 +86,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -101,7 +101,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) __Equation__getEquation, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/BlendFunc.cpp b/src/osgWrappers/osg/BlendFunc.cpp index c7e4b5377..bc9b01210 100644 --- a/src/osgWrappers/osg/BlendFunc.cpp +++ b/src/osgWrappers/osg/BlendFunc.cpp @@ -66,7 +66,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -96,7 +96,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -171,7 +171,7 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) __GLenum__getDestinationAlpha, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/BoundingBox.cpp b/src/osgWrappers/osg/BoundingBox.cpp index 9306aa845..2b9317de4 100644 --- a/src/osgWrappers/osg/BoundingBox.cpp +++ b/src/osgWrappers/osg/BoundingBox.cpp @@ -28,5 +28,5 @@ TYPE_NAME_ALIAS(osg::BoundingBoxImpl< osg::Vec3f >, osg::BoundingBoxf) TYPE_NAME_ALIAS(osg::BoundingBoxImpl< osg::Vec3d >, osg::BoundingBoxd) -TYPE_NAME_ALIAS(osg::BoundingBoxf, osg::BoundingBox) +TYPE_NAME_ALIAS(osg::BoundingBoxd, osg::BoundingBox) diff --git a/src/osgWrappers/osg/BoundingSphere.cpp b/src/osgWrappers/osg/BoundingSphere.cpp index 26f3a352e..ed22dc9a6 100644 --- a/src/osgWrappers/osg/BoundingSphere.cpp +++ b/src/osgWrappers/osg/BoundingSphere.cpp @@ -28,5 +28,5 @@ TYPE_NAME_ALIAS(osg::BoundingSphereImpl< osg::Vec3f >, osg::BoundingSpheref) TYPE_NAME_ALIAS(osg::BoundingSphereImpl< osg::Vec3d >, osg::BoundingSphered) -TYPE_NAME_ALIAS(osg::BoundingSpheref, osg::BoundingSphere) +TYPE_NAME_ALIAS(osg::BoundingSphered, osg::BoundingSphere) diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index bc6effbaa..dee2398b6 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -170,7 +170,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ElementBufferObject) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -255,7 +255,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -332,7 +332,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PixelDataBufferObject) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -416,7 +416,7 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexBufferObject) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp index 1c05cec2e..ec11f850f 100644 --- a/src/osgWrappers/osg/Camera.cpp +++ b/src/osgWrappers/osg/Camera.cpp @@ -43,6 +43,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA osg::Camera::Attachment >, osg::Camera::BufferAttachmentMap) + BEGIN_ENUM_REFLECTOR(osg::Camera::TransformOrder) I_DeclaringFile("osg/Camera"); I_EnumLabel(osg::Camera::PRE_MULTIPLY); @@ -96,8 +98,6 @@ BEGIN_ENUM_REFLECTOR(osg::Camera::BufferComponent) I_EnumLabel(osg::Camera::COLOR_BUFFER15); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA osg::Camera::Attachment >, osg::Camera::BufferAttachmentMap) - BEGIN_OBJECT_REFLECTOR(osg::Camera) I_DeclaringFile("osg/Camera"); I_BaseType(osg::Transform); @@ -787,7 +787,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera::DrawCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/ClampColor.cpp b/src/osgWrappers/osg/ClampColor.cpp index 09f784846..b43ddebe6 100644 --- a/src/osgWrappers/osg/ClampColor.cpp +++ b/src/osgWrappers/osg/ClampColor.cpp @@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -103,7 +103,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor) __GLenum__getClampReadColor, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index accd10915..8162ae153 100644 --- a/src/osgWrappers/osg/ClipNode.cpp +++ b/src/osgWrappers/osg/ClipNode.cpp @@ -28,14 +28,14 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList) + BEGIN_ENUM_REFLECTOR(osg::ClipNode::ReferenceFrame) I_DeclaringFile("osg/ClipNode"); I_EnumLabel(osg::ClipNode::RELATIVE_RF); I_EnumLabel(osg::ClipNode::ABSOLUTE_RF); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList) - BEGIN_OBJECT_REFLECTOR(osg::ClipNode) I_DeclaringFile("osg/ClipNode"); I_BaseType(osg::Group); diff --git a/src/osgWrappers/osg/ClipPlane.cpp b/src/osgWrappers/osg/ClipPlane.cpp index 08ef90393..01d3b11e0 100644 --- a/src/osgWrappers/osg/ClipPlane.cpp +++ b/src/osgWrappers/osg/ClipPlane.cpp @@ -58,7 +58,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClipPlane) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -93,7 +93,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClipPlane) __unsigned_int__getMember, "Return the member identifier within the attribute's class type. ", "Used for light number/clip plane number etc. "); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", diff --git a/src/osgWrappers/osg/ClusterCullingCallback.cpp b/src/osgWrappers/osg/ClusterCullingCallback.cpp index fbfde8a8d..e28977897 100644 --- a/src/osgWrappers/osg/ClusterCullingCallback.cpp +++ b/src/osgWrappers/osg/ClusterCullingCallback.cpp @@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ClusterCullingCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index cba3867c9..bf09e224e 100644 --- a/src/osgWrappers/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/osg/CollectOccludersVisitor.cpp @@ -56,17 +56,17 @@ BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) __void__reset, "", ""); - I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, + I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale, Properties::VIRTUAL, __float__getDistanceToEyePoint__C5_Vec3_R1__bool, "Get the distance from a point to the eye point, distance value in local coordinate system. ", "Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. If the getDistanceFromEyePoint(pos) is not implemented then a default value of 0.0 is returned. "); - I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, x, IN, bool, x, + I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale, Properties::VIRTUAL, __float__getDistanceToViewPoint__C5_Vec3_R1__bool, "Get the distance from a point to the view point, distance value in local coordinate system. ", "Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. If the getDistanceToViewPoint(pos) is not implemented then a default value of 0.0 is returned. "); - I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, + I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale, Properties::VIRTUAL, __float__getDistanceFromEyePoint__C5_Vec3_R1__bool, "Get the distance of a point from the eye point, distance value in the eye coordinate system. ", diff --git a/src/osgWrappers/osg/ColorMask.cpp b/src/osgWrappers/osg/ColorMask.cpp index cb1ed8107..3f7408ed2 100644 --- a/src/osgWrappers/osg/ColorMask.cpp +++ b/src/osgWrappers/osg/ColorMask.cpp @@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ColorMask) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -118,7 +118,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ColorMask) __bool__getAlphaMask, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/ColorMatrix.cpp b/src/osgWrappers/osg/ColorMatrix.cpp index 6de8b9d75..7db36433a 100644 --- a/src/osgWrappers/osg/ColorMatrix.cpp +++ b/src/osgWrappers/osg/ColorMatrix.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ColorMatrix) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp index 092f03079..54f408fb0 100644 --- a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp +++ b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index a15e498b1..af8c29a06 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -146,7 +146,7 @@ BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/CopyOp.cpp b/src/osgWrappers/osg/CopyOp.cpp index cf4c90ec6..35c29a308 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -15,11 +15,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -32,6 +34,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags) + BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) I_DeclaringFile("osg/CopyOp"); I_EnumLabel(osg::CopyOp::SHALLOW_COPY); @@ -46,11 +50,10 @@ BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) I_EnumLabel(osg::CopyOp::DEEP_COPY_PRIMITIVES); I_EnumLabel(osg::CopyOp::DEEP_COPY_SHAPES); I_EnumLabel(osg::CopyOp::DEEP_COPY_UNIFORMS); + I_EnumLabel(osg::CopyOp::DEEP_COPY_CALLBACKS); I_EnumLabel(osg::CopyOp::DEEP_COPY_ALL); END_REFLECTOR -TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags) - BEGIN_VALUE_REFLECTOR(osg::CopyOp) I_DeclaringFile("osg/CopyOp"); I_ConstructorWithDefaults1(IN, osg::CopyOp::CopyFlags, flags, osg::CopyOp::SHALLOW_COPY, diff --git a/src/osgWrappers/osg/CullFace.cpp b/src/osgWrappers/osg/CullFace.cpp index bef88e5d9..c61f176b5 100644 --- a/src/osgWrappers/osg/CullFace.cpp +++ b/src/osgWrappers/osg/CullFace.cpp @@ -48,7 +48,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CullFace) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -78,7 +78,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CullFace) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -93,7 +93,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CullFace) __Mode__getMode, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index b9f70eb77..6cffe7bac 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -24,6 +24,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode) + BEGIN_ENUM_REFLECTOR(osg::CullSettings::VariablesMask) I_DeclaringFile("osg/CullSettings"); I_EnumLabel(osg::CullSettings::COMPUTE_NEAR_FAR_MODE); @@ -73,8 +75,6 @@ BEGIN_ENUM_REFLECTOR(osg::CullSettings::CullingModeValues) I_EnumLabel(osg::CullSettings::ENABLE_ALL_CULLING); END_REFLECTOR -TYPE_NAME_ALIAS(unsigned int, osg::CullSettings::CullingMode) - BEGIN_VALUE_REFLECTOR(osg::CullSettings) I_DeclaringFile("osg/CullSettings"); I_Constructor0(____CullSettings, diff --git a/src/osgWrappers/osg/CullingSet.cpp b/src/osgWrappers/osg/CullingSet.cpp index 1e55da002..b67609697 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -30,6 +30,14 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >, osg::CullingSet::StateFrustumPair) + +TYPE_NAME_ALIAS(std::vector< osg::CullingSet::StateFrustumPair >, osg::CullingSet::StateFrustumList) + +TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList) + +TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask) + BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) I_DeclaringFile("osg/CullingSet"); I_EnumLabel(osg::CullingSet::NO_CULLING); @@ -43,14 +51,6 @@ BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) I_EnumLabel(osg::CullingSet::ENABLE_ALL_CULLING); END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateSet > COMMA osg::Polytope >, osg::CullingSet::StateFrustumPair) - -TYPE_NAME_ALIAS(std::vector< osg::CullingSet::StateFrustumPair >, osg::CullingSet::StateFrustumList) - -TYPE_NAME_ALIAS(std::vector< osg::ShadowVolumeOccluder >, osg::CullingSet::OccluderList) - -TYPE_NAME_ALIAS(unsigned int, osg::CullingSet::Mask) - BEGIN_OBJECT_REFLECTOR(osg::CullingSet) I_DeclaringFile("osg/CullingSet"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osg/Depth.cpp b/src/osgWrappers/osg/Depth.cpp index 36c95f665..72e0024d1 100644 --- a/src/osgWrappers/osg/Depth.cpp +++ b/src/osgWrappers/osg/Depth.cpp @@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Depth) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -82,7 +82,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Depth) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -132,7 +132,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Depth) __bool__getWriteMask, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/DisplaySettings.cpp b/src/osgWrappers/osg/DisplaySettings.cpp index e856d6ecc..9df0ab268 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -57,10 +57,6 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) I_DeclaringFile("osg/DisplaySettings"); I_BaseType(osg::Referenced); - I_StaticMethod0(osg::DisplaySettings *, instance, - __DisplaySettings_P1__instance_S, - "Maintain a DisplaySettings singleton for objects to query at runtime. ", - ""); I_Constructor0(____DisplaySettings, "", ""); @@ -384,6 +380,10 @@ BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) __C5_std_string_R1__getApplication, "", ""); + I_StaticMethod0(osg::DisplaySettings *, instance, + __DisplaySettings_P1__instance_S, + "Maintain a DisplaySettings singleton for objects to query at runtime. ", + ""); I_SimpleProperty(bool, AccumBuffer, __bool__getAccumBuffer, 0); diff --git a/src/osgWrappers/osg/DrawPixels.cpp b/src/osgWrappers/osg/DrawPixels.cpp index 17e16632b..821196c41 100644 --- a/src/osgWrappers/osg/DrawPixels.cpp +++ b/src/osgWrappers/osg/DrawPixels.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawPixels) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index e858b5e9f..379664b09 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -38,6 +38,10 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList) + +TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType) + BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) I_DeclaringFile("osg/Drawable"); I_EnumLabel(osg::Drawable::VERTICES); @@ -59,10 +63,6 @@ BEGIN_ENUM_REFLECTOR(osg::Drawable::AttributeTypes) I_EnumLabel(osg::Drawable::TEXTURE_COORDS_7); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Node * >, osg::Drawable::ParentList) - -TYPE_NAME_ALIAS(unsigned int, osg::Drawable::AttributeType) - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) I_DeclaringFile("osg/Drawable"); I_BaseType(osg::Object); @@ -622,7 +622,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -746,7 +746,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -793,7 +793,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::DrawCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -835,7 +835,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::EventCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -877,7 +877,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Fog.cpp b/src/osgWrappers/osg/Fog.cpp index 01afb3bb4..b1237affd 100644 --- a/src/osgWrappers/osg/Fog.cpp +++ b/src/osgWrappers/osg/Fog.cpp @@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Fog) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -83,7 +83,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Fog) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -148,7 +148,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Fog) __GLint__getFogCoordinateSource, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/FragmentProgram.cpp b/src/osgWrappers/osg/FragmentProgram.cpp index f7bdcff2e..e256edb70 100644 --- a/src/osgWrappers/osg/FragmentProgram.cpp +++ b/src/osgWrappers/osg/FragmentProgram.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) __int__compare__C5_osg_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -145,12 +145,12 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) __void__dirtyFragmentProgramObject, "Force a recompile on next apply() of associated OpenGL vertex program objects. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state. "); - I_Method1(void, compileGLObjects, IN, osg::State &, x, + I_Method1(void, compileGLObjects, IN, osg::State &, state, Properties::VIRTUAL, __void__compileGLObjects__State_R1, "Default to nothing to compile - all state is applied immediately. ", diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index 43605b61f..0e2f3103b 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -32,6 +32,40 @@ #undef OUT #endif +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindRenderbufferEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteRenderbuffersEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenRenderbuffersEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageMultisampleEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglRenderbufferStorageMultisampleCoverageNV) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBindFramebufferEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglDeleteFramebuffersEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenFramebuffersEXT) + +TYPE_NAME_ALIAS(GLenum , osg::FBOExtensions::TglCheckFramebufferStatusEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture1DEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture2DEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTexture3DEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferTextureLayerEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT) + +TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglBlitFramebufferEXT) + BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) I_DeclaringFile("osg/FrameBufferObject"); I_Constructor0(____FrameBufferAttachment, @@ -157,6 +191,12 @@ BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) 0); END_REFLECTOR +TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap) + +TYPE_NAME_ALIAS(std::vector< GLenum >, osg::FrameBufferObject::MultipleRenderingTargets) + +TYPE_NAME_ALIAS(osg::Camera::BufferComponent, osg::FrameBufferObject::BufferComponent) + BEGIN_ENUM_REFLECTOR(osg::FrameBufferObject::BindTarget) I_DeclaringFile("osg/FrameBufferObject"); I_EnumLabel(osg::FrameBufferObject::READ_FRAMEBUFFER); @@ -164,12 +204,6 @@ BEGIN_ENUM_REFLECTOR(osg::FrameBufferObject::BindTarget) I_EnumLabel(osg::FrameBufferObject::READ_DRAW_FRAMEBUFFER); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< osg::Camera::BufferComponent COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap) - -TYPE_NAME_ALIAS(std::vector< GLenum >, osg::FrameBufferObject::MultipleRenderingTargets) - -TYPE_NAME_ALIAS(osg::Camera::BufferComponent, osg::FrameBufferObject::BufferComponent) - BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) I_DeclaringFile("osg/FrameBufferObject"); I_BaseType(osg::StateAttribute); @@ -185,7 +219,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -250,7 +284,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -324,7 +358,7 @@ BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/FrontFace.cpp b/src/osgWrappers/osg/FrontFace.cpp index 434edecee..ebd484887 100644 --- a/src/osgWrappers/osg/FrontFace.cpp +++ b/src/osgWrappers/osg/FrontFace.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrontFace) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -87,7 +87,7 @@ BEGIN_OBJECT_REFLECTOR(osg::FrontFace) __Mode__getMode, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index a093d22ec..e9aabee50 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -28,6 +28,14 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayDataList) + +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList) + +TYPE_NAME_ALIAS(std::vector< osg::Array * >, osg::Geometry::ArrayList) + +TYPE_NAME_ALIAS(std::vector< osg::DrawElements * >, osg::Geometry::DrawElementsList) + BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding) I_DeclaringFile("osg/Geometry"); I_EnumLabel(osg::Geometry::BIND_OFF); @@ -37,14 +45,6 @@ BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding) I_EnumLabel(osg::Geometry::BIND_PER_VERTEX); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayDataList) - -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList) - -TYPE_NAME_ALIAS(std::vector< osg::Array * >, osg::Geometry::ArrayList) - -TYPE_NAME_ALIAS(std::vector< osg::DrawElements * >, osg::Geometry::DrawElementsList) - BEGIN_OBJECT_REFLECTOR(osg::Geometry) I_DeclaringFile("osg/Geometry"); I_BaseType(osg::Drawable); @@ -60,7 +60,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 56e315a28..c47593898 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -39,54 +39,6 @@ TYPE_NAME_ALIAS(std::list< osg::Camera * >, osg::GraphicsContext::Cameras) BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) I_DeclaringFile("osg/GraphicsContext"); I_BaseType(osg::Object); - I_StaticMethod1(void, setWindowingSystemInterface, IN, osg::GraphicsContext::WindowingSystemInterface *, wsInterface, - __void__setWindowingSystemInterface__WindowingSystemInterface_P1_S, - "Set the query the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. ", - ""); - I_StaticMethod0(osg::GraphicsContext::WindowingSystemInterface *, getWindowingSystemInterface, - __WindowingSystemInterface_P1__getWindowingSystemInterface_S, - "Get the WindowingSystemInterface. ", - ""); - I_StaticMethod1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits, - __GraphicsContext_P1__createGraphicsContext__Traits_P1_S, - "Create a graphics context for a specified set of traits. ", - ""); - I_StaticMethod0(unsigned int, createNewContextID, - __unsigned_int__createNewContextID_S, - "Create a contextID for a new graphics context, this contextID is used to set up the osg::State associate with context. ", - "Automatically increments the usage count of the contextID to 1. "); - I_StaticMethod0(unsigned int, getMaxContextID, - __unsigned_int__getMaxContextID_S, - "Get the current max ContextID. ", - ""); - I_StaticMethod1(void, incrementContextIDUsageCount, IN, unsigned int, contextID, - __void__incrementContextIDUsageCount__unsigned_int_S, - "Increment the usage count associate with a contextID. ", - "The usage count specifies how many graphics contexts a specific contextID is shared between. "); - I_StaticMethod1(void, decrementContextIDUsageCount, IN, unsigned int, contextID, - __void__decrementContextIDUsageCount__unsigned_int_S, - "Decrement the usage count associate with a contextID. ", - "Once the contextID goes to 0 the contextID is then free to be reused. "); - I_StaticMethod0(osg::GraphicsContext::GraphicsContexts, getAllRegisteredGraphicsContexts, - __GraphicsContexts__getAllRegisteredGraphicsContexts_S, - "Get all the registered graphics contexts. ", - ""); - I_StaticMethod1(osg::GraphicsContext::GraphicsContexts, getRegisteredGraphicsContexts, IN, unsigned int, contextID, - __GraphicsContexts__getRegisteredGraphicsContexts__unsigned_int_S, - "Get all the registered graphics contexts associated with a specific contextID. ", - ""); - I_StaticMethod2(void, setCompileContext, IN, unsigned int, contextID, IN, osg::GraphicsContext *, gc, - __void__setCompileContext__unsigned_int__GraphicsContext_P1_S, - "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ", - ""); - I_StaticMethod1(osg::GraphicsContext *, getOrCreateCompileContext, IN, unsigned int, contextID, - __GraphicsContext_P1__getOrCreateCompileContext__unsigned_int_S, - "Get existing or create a new GraphicsContext to do background compilation for GraphicsContexts associated with specified contextID. ", - ""); - I_StaticMethod1(osg::GraphicsContext *, getCompileContext, IN, unsigned int, contextID, - __GraphicsContext_P1__getCompileContext__unsigned_int_S, - "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ", - ""); I_Method1(void, add, IN, osg::Operation *, operation, Properties::NON_VIRTUAL, __void__add__Operation_P1, @@ -337,6 +289,54 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_StaticMethod1(void, setWindowingSystemInterface, IN, osg::GraphicsContext::WindowingSystemInterface *, wsInterface, + __void__setWindowingSystemInterface__WindowingSystemInterface_P1_S, + "Set the query the windowing system for screens and create graphics context - this functor should be supplied by the windows toolkit. ", + ""); + I_StaticMethod0(osg::GraphicsContext::WindowingSystemInterface *, getWindowingSystemInterface, + __WindowingSystemInterface_P1__getWindowingSystemInterface_S, + "Get the WindowingSystemInterface. ", + ""); + I_StaticMethod1(osg::GraphicsContext *, createGraphicsContext, IN, osg::GraphicsContext::Traits *, traits, + __GraphicsContext_P1__createGraphicsContext__Traits_P1_S, + "Create a graphics context for a specified set of traits. ", + ""); + I_StaticMethod0(unsigned int, createNewContextID, + __unsigned_int__createNewContextID_S, + "Create a contextID for a new graphics context, this contextID is used to set up the osg::State associate with context. ", + "Automatically increments the usage count of the contextID to 1. "); + I_StaticMethod0(unsigned int, getMaxContextID, + __unsigned_int__getMaxContextID_S, + "Get the current max ContextID. ", + ""); + I_StaticMethod1(void, incrementContextIDUsageCount, IN, unsigned int, contextID, + __void__incrementContextIDUsageCount__unsigned_int_S, + "Increment the usage count associate with a contextID. ", + "The usage count specifies how many graphics contexts a specific contextID is shared between. "); + I_StaticMethod1(void, decrementContextIDUsageCount, IN, unsigned int, contextID, + __void__decrementContextIDUsageCount__unsigned_int_S, + "Decrement the usage count associate with a contextID. ", + "Once the contextID goes to 0 the contextID is then free to be reused. "); + I_StaticMethod0(osg::GraphicsContext::GraphicsContexts, getAllRegisteredGraphicsContexts, + __GraphicsContexts__getAllRegisteredGraphicsContexts_S, + "Get all the registered graphics contexts. ", + ""); + I_StaticMethod1(osg::GraphicsContext::GraphicsContexts, getRegisteredGraphicsContexts, IN, unsigned int, contextID, + __GraphicsContexts__getRegisteredGraphicsContexts__unsigned_int_S, + "Get all the registered graphics contexts associated with a specific contextID. ", + ""); + I_StaticMethod2(void, setCompileContext, IN, unsigned int, contextID, IN, osg::GraphicsContext *, gc, + __void__setCompileContext__unsigned_int__GraphicsContext_P1_S, + "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ", + ""); + I_StaticMethod1(osg::GraphicsContext *, getOrCreateCompileContext, IN, unsigned int, contextID, + __GraphicsContext_P1__getOrCreateCompileContext__unsigned_int_S, + "Get existing or create a new GraphicsContext to do background compilation for GraphicsContexts associated with specified contextID. ", + ""); + I_StaticMethod1(osg::GraphicsContext *, getCompileContext, IN, unsigned int, contextID, + __GraphicsContext_P1__getCompileContext__unsigned_int_S, + "Get the GraphicsContext for doing background compilation for GraphicsContexts associated with specified contextID. ", + ""); I_ProtectedConstructor0(____GraphicsContext, "", ""); diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index 286f5da9b..6661c33c3 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -76,7 +76,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Group) __C5_Group_P1__asGroup, "convert 'const this' into a const Group pointer if Node is a Group, otherwise return 0. ", "Equivalent to dynamic_cast(this). "); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osg/Hint.cpp b/src/osgWrappers/osg/Hint.cpp index c4609858a..9733733a7 100644 --- a/src/osgWrappers/osg/Hint.cpp +++ b/src/osgWrappers/osg/Hint.cpp @@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Hint) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -98,7 +98,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Hint) __GLenum__getMode, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index a45b8b48b..997ee0401 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType) + BEGIN_ENUM_REFLECTOR(osg::Image::WriteHint) I_DeclaringFile("osg/Image"); I_EnumLabel(osg::Image::NO_PREFERENCE); @@ -48,8 +50,6 @@ BEGIN_ENUM_REFLECTOR(osg::Image::Origin) I_EnumLabel(osg::Image::TOP_LEFT); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< unsigned int >, osg::Image::MipmapDataType) - BEGIN_OBJECT_REFLECTOR(osg::Image) I_DeclaringFile("osg/Image"); I_BaseType(osg::Object); @@ -65,7 +65,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -220,6 +220,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) __unsigned_int__getPacking, "", ""); + I_Method1(void, setPixelAspectRatio, IN, float, pixelAspectRatio, + Properties::NON_VIRTUAL, + __void__setPixelAspectRatio__float, + "", + ""); + I_Method0(float, getPixelAspectRatio, + Properties::NON_VIRTUAL, + __float__getPixelAspectRatio, + "", + ""); I_Method0(unsigned int, getPixelSizeInBits, Properties::NON_VIRTUAL, __unsigned_int__getPixelSizeInBits, @@ -464,6 +474,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) I_SimpleProperty(unsigned int, Packing, __unsigned_int__getPacking, __void__setPacking__unsigned_int); + I_SimpleProperty(float, PixelAspectRatio, + __float__getPixelAspectRatio, + __void__setPixelAspectRatio__float); I_SimpleProperty(osg::PixelBufferObject *, PixelBufferObject, __PixelBufferObject_P1__getPixelBufferObject, __void__setPixelBufferObject__PixelBufferObject_P1); diff --git a/src/osgWrappers/osg/ImageSequence.cpp b/src/osgWrappers/osg/ImageSequence.cpp index 24650556b..1ccb5cb2c 100644 --- a/src/osgWrappers/osg/ImageSequence.cpp +++ b/src/osgWrappers/osg/ImageSequence.cpp @@ -25,6 +25,10 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Image > >, osg::ImageSequence::Images) + +TYPE_NAME_ALIAS(std::vector< std::string >, osg::ImageSequence::FileNames) + BEGIN_ENUM_REFLECTOR(osg::ImageSequence::Mode) I_DeclaringFile("osg/ImageSequence"); I_EnumLabel(osg::ImageSequence::PRE_LOAD_ALL_IMAGES); @@ -32,10 +36,6 @@ BEGIN_ENUM_REFLECTOR(osg::ImageSequence::Mode) I_EnumLabel(osg::ImageSequence::PAGE_AND_DISCARD_USED_IMAGES); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Image > >, osg::ImageSequence::Images) - -TYPE_NAME_ALIAS(std::vector< std::string >, osg::ImageSequence::FileNames) - BEGIN_OBJECT_REFLECTOR(osg::ImageSequence) I_DeclaringFile("osg/ImageSequence"); I_BaseType(osg::ImageStream); @@ -51,7 +51,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageSequence) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -174,7 +174,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageSequence) I_MethodWithDefaults9(void, setImage, IN, int, s, , IN, int, t, , IN, int, r, , IN, GLint, internalTextureformat, , IN, GLenum, pixelFormat, , IN, GLenum, type, , IN, unsigned char *, data, , IN, osg::Image::AllocationMode, mode, , IN, int, packing, 1, Properties::NON_VIRTUAL, __void__setImage__int__int__int__GLint__GLenum__GLenum__unsigned_char_P1__AllocationMode__int, - "Set the image dimensions, format and data. ", + "", ""); I_Method2(void, setImage, IN, unsigned int, pos, IN, osg::Image *, image, Properties::NON_VIRTUAL, @@ -271,7 +271,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::ImageSequence::UpdateCallback) I_DeclaringFile("osg/ImageSequence"); - I_BaseType(osg::StateAttribute::Callback); + I_BaseType(osg::StateAttributeCallback); I_Constructor0(____UpdateCallback, "", ""); diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 2511a3368..be346a4ff 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -23,6 +24,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::AudioStream > >, osg::ImageStream::AudioStreams) + BEGIN_ENUM_REFLECTOR(osg::ImageStream::StreamStatus) I_DeclaringFile("osg/ImageStream"); I_EnumLabel(osg::ImageStream::INVALID); @@ -52,7 +55,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -122,6 +125,11 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) __double__getLength, "", ""); + I_Method0(double, getFrameRate, + Properties::VIRTUAL, + __double__getFrameRate, + "", + ""); I_Method1(void, setReferenceTime, IN, double, x, Properties::VIRTUAL, __void__setReferenceTime__double, @@ -152,12 +160,33 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) __float__getVolume, "", ""); + I_Method1(void, setAudioStreams, IN, const osg::ImageStream::AudioStreams &, asl, + Properties::NON_VIRTUAL, + __void__setAudioStreams__C5_AudioStreams_R1, + "", + ""); + I_Method0(osg::ImageStream::AudioStreams &, getAudioStreams, + Properties::NON_VIRTUAL, + __AudioStreams_R1__getAudioStreams, + "", + ""); + I_Method0(const osg::ImageStream::AudioStreams &, getAudioStreams, + Properties::NON_VIRTUAL, + __C5_AudioStreams_R1__getAudioStreams, + "", + ""); I_ProtectedMethod0(void, applyLoopingMode, Properties::VIRTUAL, Properties::NON_CONST, __void__applyLoopingMode, "", ""); + I_SimpleProperty(const osg::ImageStream::AudioStreams &, AudioStreams, + __C5_AudioStreams_R1__getAudioStreams, + __void__setAudioStreams__C5_AudioStreams_R1); + I_SimpleProperty(double, FrameRate, + __double__getFrameRate, + 0); I_SimpleProperty(double, Length, __double__getLength, 0); @@ -178,3 +207,45 @@ BEGIN_OBJECT_REFLECTOR(osg::ImageStream) __void__setVolume__float); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::AudioStream >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osg::AudioStream *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osg::AudioStream > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osg::AudioStream *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osg::AudioStream *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osg::AudioStream > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osg::AudioStream *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::AudioStream > >) + diff --git a/src/osgWrappers/osg/KdTree.cpp b/src/osgWrappers/osg/KdTree.cpp index 401ef2e56..4079025cc 100644 --- a/src/osgWrappers/osg/KdTree.cpp +++ b/src/osgWrappers/osg/KdTree.cpp @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osg::KdTree) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -70,12 +70,12 @@ BEGIN_OBJECT_REFLECTOR(osg::KdTree) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", diff --git a/src/osgWrappers/osg/LOD.cpp b/src/osgWrappers/osg/LOD.cpp index eb1530f84..3a76918f1 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -25,6 +25,14 @@ #undef OUT #endif +TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::LOD::vec_type) + +TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::LOD::value_type) + +TYPE_NAME_ALIAS(std::pair< float COMMA float >, osg::LOD::MinMaxPair) + +TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList) + BEGIN_ENUM_REFLECTOR(osg::LOD::CenterMode) I_DeclaringFile("osg/LOD"); I_EnumLabel(osg::LOD::USE_BOUNDING_SPHERE_CENTER); @@ -37,14 +45,6 @@ BEGIN_ENUM_REFLECTOR(osg::LOD::RangeMode) I_EnumLabel(osg::LOD::PIXEL_SIZE_ON_SCREEN); END_REFLECTOR -TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::LOD::vec_type) - -TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::LOD::value_type) - -TYPE_NAME_ALIAS(std::pair< float COMMA float >, osg::LOD::MinMaxPair) - -TYPE_NAME_ALIAS(std::vector< osg::LOD::MinMaxPair >, osg::LOD::RangeList) - BEGIN_OBJECT_REFLECTOR(osg::LOD) I_DeclaringFile("osg/LOD"); I_BaseType(osg::Group); @@ -85,7 +85,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LOD) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osg/Light.cpp b/src/osgWrappers/osg/Light.cpp index 3a7bbe7df..b4115f3e9 100644 --- a/src/osgWrappers/osg/Light.cpp +++ b/src/osgWrappers/osg/Light.cpp @@ -46,7 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Light) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -81,7 +81,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Light) __unsigned_int__getMember, "Return the member identifier within the attribute's class type. ", "Used for light number/clip plane number etc. "); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", diff --git a/src/osgWrappers/osg/LightModel.cpp b/src/osgWrappers/osg/LightModel.cpp index 73388fae5..a3c89b207 100644 --- a/src/osgWrappers/osg/LightModel.cpp +++ b/src/osgWrappers/osg/LightModel.cpp @@ -46,7 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LightModel) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -116,7 +116,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LightModel) __bool__getTwoSided, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/LineStipple.cpp b/src/osgWrappers/osg/LineStipple.cpp index 675e0773e..ce32ab82c 100644 --- a/src/osgWrappers/osg/LineStipple.cpp +++ b/src/osgWrappers/osg/LineStipple.cpp @@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineStipple) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineStipple) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -98,7 +98,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineStipple) __GLushort__getPattern, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/LineWidth.cpp b/src/osgWrappers/osg/LineWidth.cpp index 3023385ef..8f0a92a77 100644 --- a/src/osgWrappers/osg/LineWidth.cpp +++ b/src/osgWrappers/osg/LineWidth.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineWidth) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -81,7 +81,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LineWidth) __float__getWidth, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/LogicOp.cpp b/src/osgWrappers/osg/LogicOp.cpp index d72e5ccaa..860346c42 100644 --- a/src/osgWrappers/osg/LogicOp.cpp +++ b/src/osgWrappers/osg/LogicOp.cpp @@ -64,7 +64,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LogicOp) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -94,7 +94,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LogicOp) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -109,7 +109,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LogicOp) __Opcode__getOpcode, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Material.cpp b/src/osgWrappers/osg/Material.cpp index f71ac329a..8e8abce63 100644 --- a/src/osgWrappers/osg/Material.cpp +++ b/src/osgWrappers/osg/Material.cpp @@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Material) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -92,7 +92,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Material) __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Multisample.cpp b/src/osgWrappers/osg/Multisample.cpp index 8f4dc4bfe..a19290222 100644 --- a/src/osgWrappers/osg/Multisample.cpp +++ b/src/osgWrappers/osg/Multisample.cpp @@ -46,7 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Multisample) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -111,7 +111,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Multisample) __Mode__getHint, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 6f7f3b25d..b0ab9cd9f 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -500,7 +500,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/NodeCallback.cpp b/src/osgWrappers/osg/NodeCallback.cpp index 3c74fbdab..d0adfd6cb 100644 --- a/src/osgWrappers/osg/NodeCallback.cpp +++ b/src/osgWrappers/osg/NodeCallback.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osg::NodeCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/OcclusionQueryNode.cpp b/src/osgWrappers/osg/OcclusionQueryNode.cpp index 6587a436c..7d77bf867 100644 --- a/src/osgWrappers/osg/OcclusionQueryNode.cpp +++ b/src/osgWrappers/osg/OcclusionQueryNode.cpp @@ -72,7 +72,7 @@ BEGIN_OBJECT_REFLECTOR(osg::OcclusionQueryNode) __osg_BoundingSphere__computeBound, "Compute the bounding sphere around Node's geometry or children. ", "This method is automatically called by getBound() when the bounding sphere has been marked dirty via dirtyBound(). "); - I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0, + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0, Properties::VIRTUAL, __void__releaseGLObjects__osg_State_P1, "If State is non-zero, this function releases any associated OpenGL objects for the specified graphics context. ", @@ -152,9 +152,9 @@ BEGIN_OBJECT_REFLECTOR(osg::OcclusionQueryNode) __bool__getPassed, "", ""); - I_Method2(bool, getPassed, IN, const osg::Camera *, camera, IN, float, distanceToEyePoint, + I_Method2(bool, getPassed, IN, const osg::Camera *, camera, IN, osg::NodeVisitor &, nv, Properties::NON_VIRTUAL, - __bool__getPassed__C5_osg_Camera_P1__float, + __bool__getPassed__C5_osg_Camera_P1__osg_NodeVisitor_R1, "", ""); I_Method2(void, traverseQuery, IN, const osg::Camera *, camera, IN, osg::NodeVisitor &, nv, diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index a6cfe6642..9757867f4 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -68,7 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osg/Point.cpp b/src/osgWrappers/osg/Point.cpp index 7922d3361..da7deee4c 100644 --- a/src/osgWrappers/osg/Point.cpp +++ b/src/osgWrappers/osg/Point.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Point) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Point) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -130,7 +130,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Point) __float__getMaxSize, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/PointSprite.cpp b/src/osgWrappers/osg/PointSprite.cpp index c2814269a..778330e56 100644 --- a/src/osgWrappers/osg/PointSprite.cpp +++ b/src/osgWrappers/osg/PointSprite.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -90,7 +90,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite) __bool__isTextureAttribute, "Return true if StateAttribute is a type which controls texturing and needs to be issued w.r.t to specific texture unit. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__osg_State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/PolygonMode.cpp b/src/osgWrappers/osg/PolygonMode.cpp index af1fda549..04d9519bd 100644 --- a/src/osgWrappers/osg/PolygonMode.cpp +++ b/src/osgWrappers/osg/PolygonMode.cpp @@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonMode) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -102,7 +102,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonMode) __bool__getFrontAndBack, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/PolygonOffset.cpp b/src/osgWrappers/osg/PolygonOffset.cpp index 36b411ad2..1fe26f423 100644 --- a/src/osgWrappers/osg/PolygonOffset.cpp +++ b/src/osgWrappers/osg/PolygonOffset.cpp @@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -98,7 +98,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset) __float__getUnits, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/PolygonStipple.cpp b/src/osgWrappers/osg/PolygonStipple.cpp index 0d20d5acc..c68c30121 100644 --- a/src/osgWrappers/osg/PolygonStipple.cpp +++ b/src/osgWrappers/osg/PolygonStipple.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -74,7 +74,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -89,7 +89,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple) __C5_GLubyte_P1__getMask, "get a pointer to the mask. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index b99285283..fc026ca08 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawArrays) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index db696abb3..cbd5f67f2 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Program) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index 58f0e6208..7bcf470c9 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -27,6 +27,10 @@ #undef OUT #endif +TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::ProxyNode::vec_type) + +TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::ProxyNode::value_type) + BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode) I_DeclaringFile("osg/ProxyNode"); I_EnumLabel(osg::ProxyNode::USE_BOUNDING_SPHERE_CENTER); @@ -40,10 +44,6 @@ BEGIN_ENUM_REFLECTOR(osg::ProxyNode::LoadingExternalReferenceMode) I_EnumLabel(osg::ProxyNode::NO_AUTOMATIC_LOADING); END_REFLECTOR -TYPE_NAME_ALIAS(osg::BoundingSphere::vec_type, osg::ProxyNode::vec_type) - -TYPE_NAME_ALIAS(osg::BoundingSphere::value_type, osg::ProxyNode::value_type) - BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) I_DeclaringFile("osg/ProxyNode"); I_BaseType(osg::Group); @@ -84,7 +84,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osg/Scissor.cpp b/src/osgWrappers/osg/Scissor.cpp index 50c8a425e..c82ebf1d6 100644 --- a/src/osgWrappers/osg/Scissor.cpp +++ b/src/osgWrappers/osg/Scissor.cpp @@ -43,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Scissor) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -73,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Scissor) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -128,7 +128,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Scissor) __int__height, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Sequence.cpp b/src/osgWrappers/osg/Sequence.cpp index 31b4fcb8e..b163e95d2 100644 --- a/src/osgWrappers/osg/Sequence.cpp +++ b/src/osgWrappers/osg/Sequence.cpp @@ -78,7 +78,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Sequence) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osg/ShadeModel.cpp b/src/osgWrappers/osg/ShadeModel.cpp index a522dac69..378c17ecd 100644 --- a/src/osgWrappers/osg/ShadeModel.cpp +++ b/src/osgWrappers/osg/ShadeModel.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ShadeModel) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -87,7 +87,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ShadeModel) __Mode__getMode, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp index 857669211..d275fcec9 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index 9719303df..a22297352 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Box) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -70,12 +70,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Box) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -160,7 +160,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Capsule) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -180,12 +180,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Capsule) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -281,7 +281,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CompositeShape) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -301,12 +301,12 @@ BEGIN_OBJECT_REFLECTOR(osg::CompositeShape) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -387,7 +387,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Cone) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -407,12 +407,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Cone) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -584,7 +584,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ConvexHull) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -604,12 +604,12 @@ BEGIN_OBJECT_REFLECTOR(osg::ConvexHull) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -635,7 +635,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Cylinder) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -655,12 +655,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Cylinder) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -756,7 +756,7 @@ BEGIN_OBJECT_REFLECTOR(osg::HeightField) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -776,12 +776,12 @@ BEGIN_OBJECT_REFLECTOR(osg::HeightField) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -967,7 +967,7 @@ BEGIN_OBJECT_REFLECTOR(osg::InfinitePlane) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -987,12 +987,12 @@ BEGIN_OBJECT_REFLECTOR(osg::InfinitePlane) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -1127,7 +1127,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Sphere) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -1147,12 +1147,12 @@ BEGIN_OBJECT_REFLECTOR(osg::Sphere) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", @@ -1210,7 +1210,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -1230,12 +1230,12 @@ BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh) __C5_char_P1__className, "return the name of the attribute's class type. ", ""); - I_Method1(void, accept, IN, osg::ShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ShapeVisitor &, sv, Properties::VIRTUAL, __void__accept__osg_ShapeVisitor_R1, "accept a non const shape visitor which can be used on non const shape objects. ", "Must be defined by derived classes. "); - I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, csv, Properties::VIRTUAL, __void__accept__osg_ConstShapeVisitor_R1, "accept a const shape visitor which can be used on const shape objects. ", diff --git a/src/osgWrappers/osg/ShapeDrawable.cpp b/src/osgWrappers/osg/ShapeDrawable.cpp index 2f693f012..c7b1f8182 100644 --- a/src/osgWrappers/osg/ShapeDrawable.cpp +++ b/src/osgWrappers/osg/ShapeDrawable.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -156,7 +156,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TessellationHints) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index 11a011482..5ef816a91 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -31,6 +31,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< const osg::StateSet * >, osg::State::StateSetStack) + BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) I_DeclaringFile("osg/State"); I_EnumLabel(osg::State::NEVER_CHECK_GL_ERRORS); @@ -38,8 +40,6 @@ BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) I_EnumLabel(osg::State::ONCE_PER_ATTRIBUTE); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< const osg::StateSet * >, osg::State::StateSetStack) - BEGIN_OBJECT_REFLECTOR(osg::State) I_DeclaringFile("osg/State"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index ce9042061..75a6e4ba5 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -11,10 +11,10 @@ #include #include -#include #include #include #include +#include #include #include @@ -26,6 +26,18 @@ #undef OUT #endif +TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode) + +TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue) + +TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue) + +TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA unsigned int >, osg::StateAttribute::TypeMemberPair) + +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList) + +TYPE_NAME_ALIAS(osg::StateAttributeCallback, osg::StateAttribute::Callback) + BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values) I_DeclaringFile("osg/StateAttribute"); I_EnumLabel(osg::StateAttribute::OFF); @@ -87,16 +99,6 @@ BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Type) I_EnumLabel(osg::StateAttribute::OSGNVPARSE_PROGRAM_PARSER); END_REFLECTOR -TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode) - -TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::GLModeValue) - -TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue) - -TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA unsigned int >, osg::StateAttribute::TypeMemberPair) - -TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList) - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) I_DeclaringFile("osg/StateAttribute"); I_BaseType(osg::Object); @@ -197,34 +199,34 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) __bool__checkValidityOfAssociatedModes__osg_State_R1, "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, + I_Method1(void, setUpdateCallback, IN, osg::StateAttributeCallback *, uc, Properties::NON_VIRTUAL, - __void__setUpdateCallback__Callback_P1, + __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, + I_Method0(osg::StateAttributeCallback *, getUpdateCallback, Properties::NON_VIRTUAL, - __Callback_P1__getUpdateCallback, + __StateAttributeCallback_P1__getUpdateCallback, "Get the non const UpdateCallback. ", ""); - I_Method0(const osg::StateAttribute::Callback *, getUpdateCallback, + I_Method0(const osg::StateAttributeCallback *, getUpdateCallback, Properties::NON_VIRTUAL, - __C5_Callback_P1__getUpdateCallback, + __C5_StateAttributeCallback_P1__getUpdateCallback, "Get the const UpdateCallback. ", ""); - I_Method1(void, setEventCallback, IN, osg::StateAttribute::Callback *, ec, + I_Method1(void, setEventCallback, IN, osg::StateAttributeCallback *, ec, Properties::NON_VIRTUAL, - __void__setEventCallback__Callback_P1, + __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, + I_Method0(osg::StateAttributeCallback *, getEventCallback, Properties::NON_VIRTUAL, - __Callback_P1__getEventCallback, + __StateAttributeCallback_P1__getEventCallback, "Get the non const EventCallback. ", ""); - I_Method0(const osg::StateAttribute::Callback *, getEventCallback, + I_Method0(const osg::StateAttributeCallback *, getEventCallback, Properties::NON_VIRTUAL, - __C5_Callback_P1__getEventCallback, + __C5_StateAttributeCallback_P1__getEventCallback, "Get the const EventCallback. ", ""); I_Method1(void, apply, IN, osg::State &, x, @@ -259,9 +261,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) __void__removeParent__osg_StateSet_P1, "", ""); - 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, 0); @@ -281,46 +283,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) I_SimpleProperty(osg::StateAttribute::TypeMemberPair, TypeMemberPair, __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 BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute::ModeUsage) diff --git a/src/osgWrappers/osg/StateAttributeCallback.cpp b/src/osgWrappers/osg/StateAttributeCallback.cpp new file mode 100644 index 000000000..65bd28b4d --- /dev/null +++ b/src/osgWrappers/osg/StateAttributeCallback.cpp @@ -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 &, copyop, + 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 + diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 698d5957a..908013d28 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -26,20 +26,6 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint) - I_DeclaringFile("osg/StateSet"); - I_EnumLabel(osg::StateSet::DEFAULT_BIN); - I_EnumLabel(osg::StateSet::OPAQUE_BIN); - I_EnumLabel(osg::StateSet::TRANSPARENT_BIN); -END_REFLECTOR - -BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderBinMode) - I_DeclaringFile("osg/StateSet"); - I_EnumLabel(osg::StateSet::INHERIT_RENDERBIN_DETAILS); - I_EnumLabel(osg::StateSet::USE_RENDERBIN_DETAILS); - I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS); -END_REFLECTOR - TYPE_NAME_ALIAS(std::vector< osg::Object * >, osg::StateSet::ParentList) TYPE_NAME_ALIAS(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateSet::ModeList) @@ -56,6 +42,20 @@ TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribu TYPE_NAME_ALIAS(std::map< std::string COMMA osg::StateSet::RefUniformPair >, osg::StateSet::UniformList) +BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderingHint) + I_DeclaringFile("osg/StateSet"); + I_EnumLabel(osg::StateSet::DEFAULT_BIN); + I_EnumLabel(osg::StateSet::OPAQUE_BIN); + I_EnumLabel(osg::StateSet::TRANSPARENT_BIN); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderBinMode) + I_DeclaringFile("osg/StateSet"); + I_EnumLabel(osg::StateSet::INHERIT_RENDERBIN_DETAILS); + I_EnumLabel(osg::StateSet::USE_RENDERBIN_DETAILS); + I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::StateSet) I_DeclaringFile("osg/StateSet"); I_BaseType(osg::Object); @@ -71,7 +71,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -688,7 +688,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet::Callback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Stencil.cpp b/src/osgWrappers/osg/Stencil.cpp index 85fdf3c97..9cf305e78 100644 --- a/src/osgWrappers/osg/Stencil.cpp +++ b/src/osgWrappers/osg/Stencil.cpp @@ -63,7 +63,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Stencil) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -93,7 +93,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Stencil) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -178,7 +178,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Stencil) __unsigned_int__getWriteMask, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/StencilTwoSided.cpp b/src/osgWrappers/osg/StencilTwoSided.cpp index 66aa31f85..6d1df13e9 100644 --- a/src/osgWrappers/osg/StencilTwoSided.cpp +++ b/src/osgWrappers/osg/StencilTwoSided.cpp @@ -69,7 +69,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -99,7 +99,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -184,7 +184,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided) __unsigned_int__getWriteMask__Face, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 5dca10777..7af94c4e8 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -77,7 +77,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Switch) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osg/TexEnv.cpp b/src/osgWrappers/osg/TexEnv.cpp index 1f4e33193..d7f062b65 100644 --- a/src/osgWrappers/osg/TexEnv.cpp +++ b/src/osgWrappers/osg/TexEnv.cpp @@ -51,7 +51,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnv) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -111,7 +111,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnv) __C5_Vec4_R1__getColor, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/TexEnvCombine.cpp b/src/osgWrappers/osg/TexEnvCombine.cpp index f541f9002..45aa3d039 100644 --- a/src/osgWrappers/osg/TexEnvCombine.cpp +++ b/src/osgWrappers/osg/TexEnvCombine.cpp @@ -77,7 +77,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -292,7 +292,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine) __Vec3__getConstantColorAsLightDirection, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/TexEnvFilter.cpp b/src/osgWrappers/osg/TexEnvFilter.cpp index 065e20d1e..35f5a73a9 100644 --- a/src/osgWrappers/osg/TexEnvFilter.cpp +++ b/src/osgWrappers/osg/TexEnvFilter.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -86,7 +86,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter) __float__getLodBias, "", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/TexGen.cpp b/src/osgWrappers/osg/TexGen.cpp index dd2a0607a..540ad515b 100644 --- a/src/osgWrappers/osg/TexGen.cpp +++ b/src/osgWrappers/osg/TexGen.cpp @@ -58,7 +58,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexGen) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -93,12 +93,12 @@ BEGIN_OBJECT_REFLECTOR(osg::TexGen) __int__compare__C5_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/TexMat.cpp b/src/osgWrappers/osg/TexMat.cpp index d2536423f..e86ecb7f4 100644 --- a/src/osgWrappers/osg/TexMat.cpp +++ b/src/osgWrappers/osg/TexMat.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TexMat) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 43fabc882..bc5669583 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -27,6 +27,10 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Texture::TextureObject > >, osg::Texture::TextureObjectList) + +TYPE_NAME_ALIAS(osg::buffered_object< osg::Texture::TextureObjectList >, osg::Texture::TextureObjectListMap) + BEGIN_ENUM_REFLECTOR(osg::Texture::WrapParameter) I_DeclaringFile("osg/Texture"); I_EnumLabel(osg::Texture::WRAP_S); @@ -97,10 +101,6 @@ BEGIN_ENUM_REFLECTOR(osg::Texture::GenerateMipmapMode) I_EnumLabel(osg::Texture::GENERATE_MIPMAP_TEX_PARAMETER); END_REFLECTOR -TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Texture::TextureObject > >, osg::Texture::TextureObjectList) - -TYPE_NAME_ALIAS(osg::buffered_object< osg::Texture::TextureObjectList >, osg::Texture::TextureObjectListMap) - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) I_DeclaringFile("osg/Texture"); I_BaseType(osg::StateAttribute); @@ -116,7 +116,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::PURE_VIRTUAL, __osg_Object_P1__clone__C5_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -161,7 +161,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) __GLenum__getTextureTarget, "", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index ff38b732c..55c46c7fb 100644 --- a/src/osgWrappers/osg/Texture1D.cpp +++ b/src/osgWrappers/osg/Texture1D.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture1D) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/Texture2D.cpp b/src/osgWrappers/osg/Texture2D.cpp index 3e356a103..dbff5ab74 100644 --- a/src/osgWrappers/osg/Texture2D.cpp +++ b/src/osgWrappers/osg/Texture2D.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2D) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/Texture2DArray.cpp b/src/osgWrappers/osg/Texture2DArray.cpp index abc77195f..425c95bea 100644 --- a/src/osgWrappers/osg/Texture2DArray.cpp +++ b/src/osgWrappers/osg/Texture2DArray.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index 141454846..6dc0df3a4 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture3D) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index 0549c788a..8d29506e4 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/TextureRectangle.cpp b/src/osgWrappers/osg/TextureRectangle.cpp index e92100578..615ab4d34 100644 --- a/src/osgWrappers/osg/TextureRectangle.cpp +++ b/src/osgWrappers/osg/TextureRectangle.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TextureRectangle) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", diff --git a/src/osgWrappers/osg/TransferFunction.cpp b/src/osgWrappers/osg/TransferFunction.cpp index 3311ea2a1..c0a07bb74 100644 --- a/src/osgWrappers/osg/TransferFunction.cpp +++ b/src/osgWrappers/osg/TransferFunction.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TransferFunction) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -91,7 +91,7 @@ BEGIN_OBJECT_REFLECTOR(osg::TransferFunction1D) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index 484d4da80..afa2a2536 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -123,6 +123,8 @@ BEGIN_VALUE_REFLECTOR(osg::Matrix3) ""); END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList) + BEGIN_ENUM_REFLECTOR(osg::Uniform::Type) I_DeclaringFile("osg/Uniform"); I_EnumLabel(osg::Uniform::FLOAT); @@ -181,8 +183,6 @@ BEGIN_ENUM_REFLECTOR(osg::Uniform::Type) I_EnumLabel(osg::Uniform::UNDEFINED); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList) - BEGIN_OBJECT_REFLECTOR(osg::Uniform) I_DeclaringFile("osg/Uniform"); I_BaseType(osg::Object); @@ -202,7 +202,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -984,7 +984,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform::Callback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/VertexProgram.cpp b/src/osgWrappers/osg/VertexProgram.cpp index 273cfe949..88d6b84b1 100644 --- a/src/osgWrappers/osg/VertexProgram.cpp +++ b/src/osgWrappers/osg/VertexProgram.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) __int__compare__C5_osg_StateAttribute_R1, "Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -145,12 +145,12 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) __void__dirtyVertexProgramObject, "Force a recompile on next apply() of associated OpenGL vertex program objects. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state. "); - I_Method1(void, compileGLObjects, IN, osg::State &, x, + I_Method1(void, compileGLObjects, IN, osg::State &, state, Properties::VIRTUAL, __void__compileGLObjects__State_R1, "Default to nothing to compile - all state is applied immediately. ", diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp index a82dd24ad..e6e9506cb 100644 --- a/src/osgWrappers/osg/View.cpp +++ b/src/osgWrappers/osg/View.cpp @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osg::View) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/Viewport.cpp b/src/osgWrappers/osg/Viewport.cpp index d6ecbb174..34647b7ff 100644 --- a/src/osgWrappers/osg/Viewport.cpp +++ b/src/osgWrappers/osg/Viewport.cpp @@ -46,7 +46,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Viewport) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -136,7 +136,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Viewport) __C5_osg_Matrix__computeWindowMatrix, "Compute the Window Matrix which takes projected coords into Window coordinates. ", "To convert local coordinates into window coordinates use v_window = v_local * MVPW matrix, where the MVPW matrix is ModelViewMatrix * ProjectionMatrix * WindowMatrix, the latter supplied by Viewport::computeWindowMatrix(), the ModelView and Projection Matrix can either be sourced from the current osg::State object, via osgUtil::SceneView or CullVisitor. "); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osgAnimation/Action.cpp b/src/osgWrappers/osgAnimation/Action.cpp new file mode 100644 index 000000000..b512b6458 --- /dev/null +++ b/src/osgWrappers/osgAnimation/Action.cpp @@ -0,0 +1,232 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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 + +TYPE_NAME_ALIAS(std::map< unsigned int COMMA osg::ref_ptr< osgAnimation::Action::Callback > >, osgAnimation::Action::FrameCallback) + +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Action) + I_DeclaringFile("osgAnimation/Action"); + I_BaseType(osg::Object); + I_Method2(, META_Action, IN, osgAnimation, x, IN, osgAnimation::Action, x, + Properties::NON_VIRTUAL, + ____META_Action__osgAnimation__Action, + "", + ""); + I_Constructor0(____Action, + "", + ""); + I_Constructor2(IN, const osgAnimation::Action &, x, IN, const osg::CopyOp &, x, + ____Action__C5_Action_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method2(void, setCallback, IN, double, when, IN, osgAnimation::Action::Callback *, callback, + Properties::NON_VIRTUAL, + __void__setCallback__double__Callback_P1, + "", + ""); + I_Method2(void, setCallback, IN, unsigned int, frame, IN, osgAnimation::Action::Callback *, callback, + Properties::NON_VIRTUAL, + __void__setCallback__unsigned_int__Callback_P1, + "", + ""); + I_Method1(osgAnimation::Action::Callback *, getCallback, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __Callback_P1__getCallback__unsigned_int, + "", + ""); + I_Method1(void, removeCallback, IN, osgAnimation::Action::Callback *, x, + Properties::NON_VIRTUAL, + __void__removeCallback__Callback_P1, + "", + ""); + I_Method1(osgAnimation::Action::Callback *, getFrameCallback, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __Callback_P1__getFrameCallback__unsigned_int, + "", + ""); + I_Method1(osgAnimation::Action::Callback *, getFrameCallback, IN, double, time, + Properties::NON_VIRTUAL, + __Callback_P1__getFrameCallback__double, + "", + ""); + I_Method0(unsigned int, getFramesPerSecond, + Properties::NON_VIRTUAL, + __unsigned_int__getFramesPerSecond, + "", + ""); + I_Method1(void, setNumFrames, IN, unsigned int, numFrames, + Properties::NON_VIRTUAL, + __void__setNumFrames__unsigned_int, + "", + ""); + I_Method1(void, setDuration, IN, double, duration, + Properties::NON_VIRTUAL, + __void__setDuration__double, + "", + ""); + I_Method0(unsigned int, getNumFrames, + Properties::NON_VIRTUAL, + __unsigned_int__getNumFrames, + "", + ""); + I_Method0(double, getDuration, + Properties::NON_VIRTUAL, + __double__getDuration, + "", + ""); + I_Method1(void, setLoop, IN, int, nb, + Properties::VIRTUAL, + __void__setLoop__int, + "", + ""); + I_Method0(unsigned int, getLoop, + Properties::VIRTUAL, + __unsigned_int__getLoop, + "", + ""); + I_Method3(bool, evaluateFrame, IN, unsigned int, frame, IN, unsigned int &, resultframe, IN, unsigned int &, nbloop, + Properties::NON_VIRTUAL, + __bool__evaluateFrame__unsigned_int__unsigned_int_R1__unsigned_int_R1, + "", + ""); + I_Method1(void, traverse, IN, osgAnimation::ActionVisitor &, visitor, + Properties::VIRTUAL, + __void__traverse__ActionVisitor_R1, + "", + ""); + I_IndexedProperty(osgAnimation::Action::Callback *, Callback, + __Callback_P1__getCallback__unsigned_int, + __void__setCallback__unsigned_int__Callback_P1, + 0); + I_SimpleProperty(double, Duration, + __double__getDuration, + __void__setDuration__double); + I_SimpleProperty(unsigned int, FramesPerSecond, + __unsigned_int__getFramesPerSecond, + 0); + I_SimpleProperty(int, Loop, + 0, + __void__setLoop__int); + I_SimpleProperty(unsigned int, NumFrames, + 0, + __void__setNumFrames__unsigned_int); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::Action::Callback) + I_DeclaringFile("osgAnimation/Action"); + I_BaseType(osg::Object); + I_Constructor0(____Callback, + "", + ""); + I_Constructor2(IN, const osgAnimation::Action::Callback &, nc, IN, const osg::CopyOp &, x, + ____Callback__C5_Callback_R1__C5_osg_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 &, copyop, + 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_Method0(osgAnimation::Action::Callback *, getNestedCallback, + Properties::NON_VIRTUAL, + __Callback_P1__getNestedCallback, + "", + ""); + I_Method1(void, addNestedCallback, IN, osgAnimation::Action::Callback *, callback, + Properties::NON_VIRTUAL, + __void__addNestedCallback__Callback_P1, + "", + ""); + I_Method1(void, removeCallback, IN, osgAnimation::Action::Callback *, cb, + Properties::NON_VIRTUAL, + __void__removeCallback__Callback_P1, + "", + ""); + I_SimpleProperty(osgAnimation::Action::Callback *, NestedCallback, + __Callback_P1__getNestedCallback, + 0); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Action::Callback >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgAnimation::Action::Callback *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgAnimation::Action::Callback > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgAnimation::Action::Callback *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osgAnimation::Action::Callback *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgAnimation::Action::Callback > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osgAnimation::Action::Callback *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_MAP_REFLECTOR(std::map< unsigned int COMMA osg::ref_ptr< osgAnimation::Action::Callback > >) + diff --git a/src/osgWrappers/osgAnimation/ActionAnimation.cpp b/src/osgWrappers/osgAnimation/ActionAnimation.cpp new file mode 100644 index 000000000..63010f5b9 --- /dev/null +++ b/src/osgWrappers/osgAnimation/ActionAnimation.cpp @@ -0,0 +1,60 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::ActionAnimation) + I_DeclaringFile("osgAnimation/ActionAnimation"); + I_BaseType(osgAnimation::Action); + I_Method2(, META_Action, IN, osgAnimation, x, IN, osgAnimation::ActionAnimation, x, + Properties::NON_VIRTUAL, + ____META_Action__osgAnimation__ActionAnimation, + "", + ""); + I_Constructor0(____ActionAnimation, + "", + ""); + I_Constructor2(IN, const osgAnimation::ActionAnimation &, a, IN, const osg::CopyOp &, c, + ____ActionAnimation__C5_ActionAnimation_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Constructor1(IN, osgAnimation::Animation *, animation, + Properties::NON_EXPLICIT, + ____ActionAnimation__Animation_P1, + "", + ""); + I_Method2(void, updateAnimation, IN, unsigned int, frame, IN, int, priority, + Properties::NON_VIRTUAL, + __void__updateAnimation__unsigned_int__int, + "", + ""); + I_Method0(osgAnimation::Animation *, getAnimation, + Properties::NON_VIRTUAL, + __Animation_P1__getAnimation, + "", + ""); + I_SimpleProperty(osgAnimation::Animation *, Animation, + __Animation_P1__getAnimation, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/ActionBlendIn.cpp b/src/osgWrappers/osgAnimation/ActionBlendIn.cpp new file mode 100644 index 000000000..64eba5324 --- /dev/null +++ b/src/osgWrappers/osgAnimation/ActionBlendIn.cpp @@ -0,0 +1,67 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::ActionBlendIn) + I_DeclaringFile("osgAnimation/ActionBlendIn"); + I_BaseType(osgAnimation::Action); + I_Method2(, META_Action, IN, osgAnimation, x, IN, osgAnimation::ActionBlendIn, x, + Properties::NON_VIRTUAL, + ____META_Action__osgAnimation__ActionBlendIn, + "", + ""); + I_Constructor0(____ActionBlendIn, + "", + ""); + I_Constructor2(IN, const osgAnimation::ActionBlendIn &, a, IN, const osg::CopyOp &, c, + ____ActionBlendIn__C5_ActionBlendIn_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Constructor3(IN, osgAnimation::Animation *, animation, IN, double, duration, IN, double, weight, + ____ActionBlendIn__Animation_P1__double__double, + "", + ""); + I_Method0(double, getWeight, + Properties::NON_VIRTUAL, + __double__getWeight, + "", + ""); + I_Method0(osgAnimation::Animation *, getAnimation, + Properties::NON_VIRTUAL, + __Animation_P1__getAnimation, + "", + ""); + I_Method1(void, computeWeight, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __void__computeWeight__unsigned_int, + "", + ""); + I_SimpleProperty(osgAnimation::Animation *, Animation, + __Animation_P1__getAnimation, + 0); + I_SimpleProperty(double, Weight, + __double__getWeight, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/ActionBlendOut.cpp b/src/osgWrappers/osgAnimation/ActionBlendOut.cpp new file mode 100644 index 000000000..d41affcac --- /dev/null +++ b/src/osgWrappers/osgAnimation/ActionBlendOut.cpp @@ -0,0 +1,67 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::ActionBlendOut) + I_DeclaringFile("osgAnimation/ActionBlendOut"); + I_BaseType(osgAnimation::Action); + I_Method2(, META_Action, IN, osgAnimation, x, IN, osgAnimation::ActionBlendOut, x, + Properties::NON_VIRTUAL, + ____META_Action__osgAnimation__ActionBlendOut, + "", + ""); + I_Constructor0(____ActionBlendOut, + "", + ""); + I_Constructor2(IN, const osgAnimation::ActionBlendOut &, a, IN, const osg::CopyOp &, c, + ____ActionBlendOut__C5_ActionBlendOut_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Constructor2(IN, osgAnimation::Animation *, animation, IN, double, duration, + ____ActionBlendOut__Animation_P1__double, + "", + ""); + I_Method0(osgAnimation::Animation *, getAnimation, + Properties::NON_VIRTUAL, + __Animation_P1__getAnimation, + "", + ""); + I_Method0(double, getWeight, + Properties::NON_VIRTUAL, + __double__getWeight, + "", + ""); + I_Method1(void, computeWeight, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __void__computeWeight__unsigned_int, + "", + ""); + I_SimpleProperty(osgAnimation::Animation *, Animation, + __Animation_P1__getAnimation, + 0); + I_SimpleProperty(double, Weight, + __double__getWeight, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/ActionCallback.cpp b/src/osgWrappers/osgAnimation/ActionCallback.cpp new file mode 100644 index 000000000..09475be56 --- /dev/null +++ b/src/osgWrappers/osgAnimation/ActionCallback.cpp @@ -0,0 +1,49 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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(osgAnimation::RunAction) + I_DeclaringFile("osgAnimation/ActionCallback"); + I_BaseType(osgAnimation::Action::Callback); + I_ConstructorWithDefaults2(IN, osgAnimation::Action *, a, , IN, int, priority, 0, + ____RunAction__Action_P1__int, + "", + ""); + I_Method0(osgAnimation::Action *, getAction, + Properties::NON_VIRTUAL, + __Action_P1__getAction, + "", + ""); + I_Method0(int, getPriority, + Properties::NON_VIRTUAL, + __int__getPriority, + "", + ""); + I_SimpleProperty(osgAnimation::Action *, Action, + __Action_P1__getAction, + 0); + I_SimpleProperty(int, Priority, + __int__getPriority, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/ActionStripAnimation.cpp b/src/osgWrappers/osgAnimation/ActionStripAnimation.cpp new file mode 100644 index 000000000..480054333 --- /dev/null +++ b/src/osgWrappers/osgAnimation/ActionStripAnimation.cpp @@ -0,0 +1,115 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::ActionStripAnimation) + I_DeclaringFile("osgAnimation/ActionStripAnimation"); + I_BaseType(osgAnimation::Action); + I_Method2(, META_Action, IN, osgAnimation, x, IN, osgAnimation::ActionStripAnimation, x, + Properties::NON_VIRTUAL, + ____META_Action__osgAnimation__ActionStripAnimation, + "", + ""); + I_Constructor0(____ActionStripAnimation, + "", + ""); + I_Constructor2(IN, const osgAnimation::ActionStripAnimation &, a, IN, const osg::CopyOp &, c, + ____ActionStripAnimation__C5_ActionStripAnimation_R1__C5_osg_CopyOp_R1, + "", + ""); + I_ConstructorWithDefaults4(IN, osgAnimation::Animation *, animation, , IN, double, blendInDuration, 0.0, IN, double, blendOutDuration, 0.0, IN, double, blendInWeightTarget, 1.0, + ____ActionStripAnimation__Animation_P1__double__double__double, + "", + ""); + I_Method0(osgAnimation::ActionAnimation *, getAnimation, + Properties::NON_VIRTUAL, + __ActionAnimation_P1__getAnimation, + "", + ""); + I_Method0(osgAnimation::ActionBlendIn *, getBlendIn, + Properties::NON_VIRTUAL, + __ActionBlendIn_P1__getBlendIn, + "", + ""); + I_Method0(osgAnimation::ActionBlendOut *, getBlendOut, + Properties::NON_VIRTUAL, + __ActionBlendOut_P1__getBlendOut, + "", + ""); + I_Method0(const osgAnimation::ActionAnimation *, getAnimation, + Properties::NON_VIRTUAL, + __C5_ActionAnimation_P1__getAnimation, + "", + ""); + I_Method0(const osgAnimation::ActionBlendIn *, getBlendIn, + Properties::NON_VIRTUAL, + __C5_ActionBlendIn_P1__getBlendIn, + "", + ""); + I_Method0(const osgAnimation::ActionBlendOut *, getBlendOut, + Properties::NON_VIRTUAL, + __C5_ActionBlendOut_P1__getBlendOut, + "", + ""); + I_Method0(unsigned int, getBlendOutStartFrame, + Properties::NON_VIRTUAL, + __unsigned_int__getBlendOutStartFrame, + "", + ""); + I_Method0(unsigned int, getLoop, + Properties::VIRTUAL, + __unsigned_int__getLoop, + "", + ""); + I_Method1(void, setLoop, IN, unsigned int, loop, + Properties::NON_VIRTUAL, + __void__setLoop__unsigned_int, + "", + ""); + I_Method1(void, traverse, IN, osgAnimation::ActionVisitor &, visitor, + Properties::VIRTUAL, + __void__traverse__ActionVisitor_R1, + "", + ""); + I_SimpleProperty(osgAnimation::ActionAnimation *, Animation, + __ActionAnimation_P1__getAnimation, + 0); + I_SimpleProperty(osgAnimation::ActionBlendIn *, BlendIn, + __ActionBlendIn_P1__getBlendIn, + 0); + I_SimpleProperty(osgAnimation::ActionBlendOut *, BlendOut, + __ActionBlendOut_P1__getBlendOut, + 0); + I_SimpleProperty(unsigned int, BlendOutStartFrame, + __unsigned_int__getBlendOutStartFrame, + 0); + I_SimpleProperty(unsigned int, Loop, + __unsigned_int__getLoop, + __void__setLoop__unsigned_int); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/ActionVisitor.cpp b/src/osgWrappers/osgAnimation/ActionVisitor.cpp new file mode 100644 index 000000000..26ff90f34 --- /dev/null +++ b/src/osgWrappers/osgAnimation/ActionVisitor.cpp @@ -0,0 +1,231 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#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(osgAnimation::ActionVisitor) + I_DeclaringFile("osgAnimation/ActionVisitor"); + I_BaseType(osg::Referenced); + I_Method2(, META_ActionVisitor, IN, osgAnimation, x, IN, osgAnimation::ActionVisitor, x, + Properties::NON_VIRTUAL, + ____META_ActionVisitor__osgAnimation__ActionVisitor, + "", + ""); + I_Constructor0(____ActionVisitor, + "", + ""); + I_Method1(void, traverse, IN, osgAnimation::Action &, visitor, + Properties::NON_VIRTUAL, + __void__traverse__Action_R1, + "", + ""); + I_Method1(void, pushFrameActionOnStack, IN, const osgAnimation::FrameAction &, fa, + Properties::NON_VIRTUAL, + __void__pushFrameActionOnStack__C5_FrameAction_R1, + "", + ""); + I_Method0(void, popFrameAction, + Properties::NON_VIRTUAL, + __void__popFrameAction, + "", + ""); + I_Method1(void, pushTimelineOnStack, IN, osgAnimation::Timeline *, tm, + Properties::NON_VIRTUAL, + __void__pushTimelineOnStack__Timeline_P1, + "", + ""); + I_Method0(void, popTimeline, + Properties::NON_VIRTUAL, + __void__popTimeline, + "", + ""); + I_Method0(osgAnimation::Timeline *, getCurrentTimeline, + Properties::NON_VIRTUAL, + __Timeline_P1__getCurrentTimeline, + "", + ""); + I_Method1(void, setCurrentLayer, IN, int, layer, + Properties::NON_VIRTUAL, + __void__setCurrentLayer__int, + "", + ""); + I_Method0(int, getCurrentLayer, + Properties::NON_VIRTUAL, + __int__getCurrentLayer, + "", + ""); + I_Method0(const std::vector< osgAnimation::FrameAction > &, getStackedFrameAction, + Properties::NON_VIRTUAL, + __C5_std_vectorT1_FrameAction__R1__getStackedFrameAction, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Action &, action, + Properties::VIRTUAL, + __void__apply__Action_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Timeline &, tm, + Properties::VIRTUAL, + __void__apply__Timeline_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionBlendIn &, action, + Properties::VIRTUAL, + __void__apply__ActionBlendIn_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionBlendOut &, action, + Properties::VIRTUAL, + __void__apply__ActionBlendOut_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionAnimation &, action, + Properties::VIRTUAL, + __void__apply__ActionAnimation_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionStripAnimation &, action, + Properties::VIRTUAL, + __void__apply__ActionStripAnimation_R1, + "", + ""); + I_SimpleProperty(int, CurrentLayer, + __int__getCurrentLayer, + __void__setCurrentLayer__int); + I_SimpleProperty(osgAnimation::Timeline *, CurrentTimeline, + __Timeline_P1__getCurrentTimeline, + 0); + I_SimpleProperty(const std::vector< osgAnimation::FrameAction > &, StackedFrameAction, + __C5_std_vectorT1_FrameAction__R1__getStackedFrameAction, + 0); +END_REFLECTOR + +BEGIN_ENUM_REFLECTOR(osgAnimation::ClearActionVisitor::ClearType) + I_DeclaringFile("osgAnimation/ActionVisitor"); + I_EnumLabel(osgAnimation::ClearActionVisitor::BEFORE_FRAME); + I_EnumLabel(osgAnimation::ClearActionVisitor::AFTER_FRAME); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::ClearActionVisitor) + I_DeclaringFile("osgAnimation/ActionVisitor"); + I_BaseType(osgAnimation::ActionVisitor); + I_Method2(, META_ActionVisitor, IN, osgAnimation, x, IN, osgAnimation::ClearActionVisitor, x, + Properties::NON_VIRTUAL, + ____META_ActionVisitor__osgAnimation__ClearActionVisitor, + "", + ""); + I_ConstructorWithDefaults1(IN, osgAnimation::ClearActionVisitor::ClearType, type, osgAnimation::ClearActionVisitor::BEFORE_FRAME, + Properties::NON_EXPLICIT, + ____ClearActionVisitor__ClearType, + "", + ""); + I_Method1(void, setFrame, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __void__setFrame__unsigned_int, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Timeline &, action, + Properties::VIRTUAL, + __void__apply__Timeline_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Action &, action, + Properties::VIRTUAL, + __void__apply__Action_R1, + "", + ""); + I_SimpleProperty(unsigned int, Frame, + 0, + __void__setFrame__unsigned_int); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateActionVisitor) + I_DeclaringFile("osgAnimation/ActionVisitor"); + I_BaseType(osgAnimation::ActionVisitor); + I_Method2(, META_ActionVisitor, IN, osgAnimation, x, IN, osgAnimation::UpdateActionVisitor, x, + Properties::NON_VIRTUAL, + ____META_ActionVisitor__osgAnimation__UpdateActionVisitor, + "", + ""); + I_Constructor0(____UpdateActionVisitor, + "", + ""); + I_Method1(void, setFrame, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __void__setFrame__unsigned_int, + "", + ""); + I_Method1(bool, isActive, IN, osgAnimation::Action &, action, + Properties::NON_VIRTUAL, + __bool__isActive__Action_R1, + "", + ""); + I_Method0(unsigned int, getLocalFrame, + Properties::NON_VIRTUAL, + __unsigned_int__getLocalFrame, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Timeline &, action, + Properties::VIRTUAL, + __void__apply__Timeline_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Action &, action, + Properties::VIRTUAL, + __void__apply__Action_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionBlendIn &, action, + Properties::VIRTUAL, + __void__apply__ActionBlendIn_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionBlendOut &, action, + Properties::VIRTUAL, + __void__apply__ActionBlendOut_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionAnimation &, action, + Properties::VIRTUAL, + __void__apply__ActionAnimation_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionStripAnimation &, action, + Properties::VIRTUAL, + __void__apply__ActionStripAnimation_R1, + "", + ""); + I_SimpleProperty(unsigned int, Frame, + 0, + __void__setFrame__unsigned_int); + I_SimpleProperty(unsigned int, LocalFrame, + __unsigned_int__getLocalFrame, + 0); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osgAnimation::FrameAction >) + diff --git a/src/osgWrappers/osgAnimation/Animation.cpp b/src/osgWrappers/osgAnimation/Animation.cpp index 676368151..ca3dd0455 100644 --- a/src/osgWrappers/osgAnimation/Animation.cpp +++ b/src/osgWrappers/osgAnimation/Animation.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -62,7 +62,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) I_Constructor0(____Animation, "", ""); - I_Constructor2(IN, const osgAnimation::Animation &, anim, IN, const osg::CopyOp &, x, + I_Constructor2(IN, const osgAnimation::Animation &, x, IN, const osg::CopyOp &, x, ____Animation__C5_osgAnimation_Animation_R1__C5_osg_CopyOp_R1, "", ""); @@ -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, @@ -121,6 +121,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) __void__setPlaymode__PlayMode, "", ""); + I_Method0(osgAnimation::Animation::PlayMode, getPlayMode, + Properties::NON_VIRTUAL, + __PlayMode__getPlayMode, + "", + ""); I_Method1(void, setStartTime, IN, float, time, Properties::NON_VIRTUAL, __void__setStartTime__float, @@ -143,6 +148,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Animation) I_SimpleProperty(double, Duration, 0, __void__setDuration__double); + I_SimpleProperty(osgAnimation::Animation::PlayMode, PlayMode, + __PlayMode__getPlayMode, + 0); I_SimpleProperty(osgAnimation::Animation::PlayMode, Playmode, 0, __void__setPlaymode__PlayMode); diff --git a/src/osgWrappers/osgAnimation/AnimationManager.cpp b/src/osgWrappers/osgAnimation/AnimationManager.cpp index e77efa1c7..d6ef7580d 100644 --- a/src/osgWrappers/osgAnimation/AnimationManager.cpp +++ b/src/osgWrappers/osgAnimation/AnimationManager.cpp @@ -31,7 +31,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::AnimationManager) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp index 10ee9923d..ba5725faf 100644 --- a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp +++ b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -42,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, @@ -70,16 +76,42 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationManagerBase) I_Method0(void, clearTargets, Properties::NON_VIRTUAL, __void__clearTargets, - "Operation that must be done each frame. ", + "Reset the value of targets this Operation must be done each frame. ", ""); - I_Method0(void, normalizeTargets, + I_Method0(osgAnimation::LinkVisitor *, getOrCreateLinkVisitor, Properties::NON_VIRTUAL, - __void__normalizeTargets, + __LinkVisitor_P1__getOrCreateLinkVisitor, + "", + ""); + I_Method1(void, setLinkVisitor, IN, osgAnimation::LinkVisitor *, x, + Properties::NON_VIRTUAL, + __void__setLinkVisitor__LinkVisitor_P1, + "", + ""); + I_Method1(void, setAutomaticLink, IN, bool, x, + Properties::NON_VIRTUAL, + __void__setAutomaticLink__bool, + "set a flag to define the behaviour ", + ""); + I_Method0(bool, isAutomaticLink, + Properties::NON_VIRTUAL, + __bool__isAutomaticLink, + "", + ""); + I_Method0(void, dirty, + Properties::NON_VIRTUAL, + __void__dirty, "", ""); I_SimpleProperty(const osgAnimation::AnimationList &, AnimationList, __C5_AnimationList_R1__getAnimationList, 0); + I_SimpleProperty(bool, AutomaticLink, + 0, + __void__setAutomaticLink__bool); + I_SimpleProperty(osgAnimation::LinkVisitor *, LinkVisitor, + 0, + __void__setLinkVisitor__LinkVisitor_P1); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Target >) diff --git a/src/osgWrappers/osgAnimation/AnimationUpdateCallback.cpp b/src/osgWrappers/osgAnimation/AnimationUpdateCallback.cpp new file mode 100644 index 000000000..e4ef320c6 --- /dev/null +++ b/src/osgWrappers/osgAnimation/AnimationUpdateCallback.cpp @@ -0,0 +1,42 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationUpdateCallbackBase) + I_DeclaringFile("osgAnimation/AnimationUpdateCallback"); + I_VirtualBaseType(osg::Object); + I_Constructor0(____AnimationUpdateCallbackBase, + "", + ""); + I_Method1(bool, link, IN, osgAnimation::Channel *, channel, + Properties::PURE_VIRTUAL, + __bool__link__Channel_P1, + "", + ""); + I_Method1(int, link, IN, osgAnimation::Animation *, animation, + Properties::PURE_VIRTUAL, + __int__link__Animation_P1, + "", + ""); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/BasicAnimationManager.cpp b/src/osgWrappers/osgAnimation/BasicAnimationManager.cpp index 99b99d397..810b01a69 100644 --- a/src/osgWrappers/osgAnimation/BasicAnimationManager.cpp +++ b/src/osgWrappers/osgAnimation/BasicAnimationManager.cpp @@ -32,7 +32,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::BasicAnimationManager) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgAnimation/Bone.cpp b/src/osgWrappers/osgAnimation/Bone.cpp index 6fef3e3a6..bf44eec5d 100644 --- a/src/osgWrappers/osgAnimation/Bone.cpp +++ b/src/osgWrappers/osgAnimation/Bone.cpp @@ -12,14 +12,9 @@ #include #include -#include #include #include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -29,15 +24,11 @@ #undef OUT #endif -TYPE_NAME_ALIAS(osg::ref_ptr< osgAnimation::Bone >, osgAnimation::Bone::PointerType) - -TYPE_NAME_ALIAS(std::map< std::string COMMA osgAnimation::Bone::PointerType >, osgAnimation::Bone::BoneMap) - TYPE_NAME_ALIAS(osg::Matrix, osgAnimation::Bone::MatrixType) BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) I_DeclaringFile("osgAnimation/Bone"); - I_BaseType(osg::Transform); + I_BaseType(osg::MatrixTransform); I_Method0(osg::Object *, cloneType, Properties::VIRTUAL, __osg_Object_P1__cloneType, @@ -82,16 +73,6 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) __void__setDefaultUpdateCallback__C5_std_string_R1, "", ""); - I_Method2(bool, computeLocalToWorldMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv, - Properties::VIRTUAL, - __bool__computeLocalToWorldMatrix__osg_Matrix_R1__osg_NodeVisitor_P1, - "", - ""); - I_Method2(bool, computeWorldToLocalMatrix, IN, osg::Matrix &, matrix, IN, osg::NodeVisitor *, nv, - Properties::VIRTUAL, - __bool__computeWorldToLocalMatrix__osg_Matrix_R1__osg_NodeVisitor_P1, - "", - ""); I_Method0(osgAnimation::Bone *, getBoneParent, Properties::NON_VIRTUAL, __Bone_P1__getBoneParent, @@ -102,39 +83,9 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) __C5_Bone_P1__getBoneParent, "", ""); - I_Method1(void, setTranslation, IN, const osg::Vec3 &, trans, + I_Method0(const osg::Matrix &, getMatrixInBoneSpace, Properties::NON_VIRTUAL, - __void__setTranslation__C5_osg_Vec3_R1, - "", - ""); - I_Method1(void, setRotation, IN, const osg::Quat &, quat, - Properties::NON_VIRTUAL, - __void__setRotation__C5_osg_Quat_R1, - "", - ""); - I_Method1(void, setScale, IN, const osg::Vec3 &, scale, - Properties::NON_VIRTUAL, - __void__setScale__C5_osg_Vec3_R1, - "", - ""); - I_Method0(const osg::Vec3 &, getTranslation, - Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getTranslation, - "", - ""); - I_Method0(const osg::Quat &, getRotation, - Properties::NON_VIRTUAL, - __C5_osg_Quat_R1__getRotation, - "", - ""); - I_Method0(osg::Matrix, getMatrixInBoneSpace, - Properties::NON_VIRTUAL, - __osg_Matrix__getMatrixInBoneSpace, - "", - ""); - I_Method0(const osg::Matrix &, getBindMatrixInBoneSpace, - Properties::NON_VIRTUAL, - __C5_osg_Matrix_R1__getBindMatrixInBoneSpace, + __C5_osg_Matrix_R1__getMatrixInBoneSpace, "", ""); I_Method0(const osg::Matrix &, getMatrixInSkeletonSpace, @@ -152,47 +103,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) __void__setMatrixInSkeletonSpace__C5_osg_Matrix_R1, "", ""); - I_Method1(void, setBindMatrixInBoneSpace, IN, const osg::Matrix &, matrix, + I_Method1(void, setInvBindMatrixInSkeletonSpace, IN, const osg::Matrix &, matrix, Properties::NON_VIRTUAL, - __void__setBindMatrixInBoneSpace__C5_osg_Matrix_R1, + __void__setInvBindMatrixInSkeletonSpace__C5_osg_Matrix_R1, "", ""); - I_Method0(bool, needToComputeBindMatrix, - Properties::NON_VIRTUAL, - __bool__needToComputeBindMatrix, - "", - ""); - I_Method0(void, computeBindMatrix, - Properties::VIRTUAL, - __void__computeBindMatrix, - "", - ""); - I_Method0(bool, needLink, - Properties::NON_VIRTUAL, - __bool__needLink, - "", - ""); - I_Method1(void, setNeedToComputeBindMatrix, IN, bool, state, - Properties::NON_VIRTUAL, - __void__setNeedToComputeBindMatrix__bool, - "", - ""); - I_Method1(bool, addChild, IN, osg::Node *, child, - Properties::VIRTUAL, - __bool__addChild__Node_P1, - "Add Node to Group. ", - "If node is not NULL and is not contained in Group then increment its reference count, add it to the child list and dirty the bounding sphere to force it to recompute on next getBound() and return true for success. Otherwise return false. Scene nodes can't be added as child nodes. "); - I_Method0(osgAnimation::Bone::BoneMap, getBoneMap, - Properties::NON_VIRTUAL, - __BoneMap__getBoneMap, - "", - ""); - I_SimpleProperty(const osg::Matrix &, BindMatrixInBoneSpace, - __C5_osg_Matrix_R1__getBindMatrixInBoneSpace, - __void__setBindMatrixInBoneSpace__C5_osg_Matrix_R1); - I_SimpleProperty(osgAnimation::Bone::BoneMap, BoneMap, - __BoneMap__getBoneMap, - 0); I_SimpleProperty(osgAnimation::Bone *, BoneParent, __Bone_P1__getBoneParent, 0); @@ -201,126 +116,16 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone) __void__setDefaultUpdateCallback__C5_std_string_R1); I_SimpleProperty(const osg::Matrix &, InvBindMatrixInSkeletonSpace, __C5_osg_Matrix_R1__getInvBindMatrixInSkeletonSpace, - 0); - I_SimpleProperty(osg::Matrix, MatrixInBoneSpace, - __osg_Matrix__getMatrixInBoneSpace, + __void__setInvBindMatrixInSkeletonSpace__C5_osg_Matrix_R1); + I_SimpleProperty(const osg::Matrix &, MatrixInBoneSpace, + __C5_osg_Matrix_R1__getMatrixInBoneSpace, 0); I_SimpleProperty(const osg::Matrix &, MatrixInSkeletonSpace, __C5_osg_Matrix_R1__getMatrixInSkeletonSpace, __void__setMatrixInSkeletonSpace__C5_osg_Matrix_R1); - I_SimpleProperty(bool, NeedToComputeBindMatrix, - 0, - __void__setNeedToComputeBindMatrix__bool); - I_SimpleProperty(const osg::Quat &, Rotation, - __C5_osg_Quat_R1__getRotation, - __void__setRotation__C5_osg_Quat_R1); - I_SimpleProperty(const osg::Vec3 &, Scale, - 0, - __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_BaseType(osgAnimation::AnimationUpdateCallback); - 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_Constructor2(IN, const osgAnimation::Bone::UpdateBone &, apc, IN, const osg::CopyOp &, copyop, - ____UpdateBone__C5_UpdateBone_R1__C5_osg_CopyOp_R1, - "", - ""); - I_ConstructorWithDefaults1(IN, const std::string &, name, "", - Properties::NON_EXPLICIT, - ____UpdateBone__C5_std_string_R1, - "", - ""); - I_Method1(void, update, IN, osgAnimation::Bone &, bone, - Properties::NON_VIRTUAL, - __void__update__osgAnimation_Bone_R1, - "", - ""); - I_Method0(bool, needLink, - Properties::VIRTUAL, - __bool__needLink, - "", - ""); - I_Method1(bool, link, IN, osgAnimation::Channel *, channel, - Properties::VIRTUAL, - __bool__link__osgAnimation_Channel_P1, - "", - ""); - I_PublicMemberProperty(osg::ref_ptr< osgAnimation::Vec3Target >, _position); - I_PublicMemberProperty(osg::ref_ptr< osgAnimation::QuatTarget >, _quaternion); - I_PublicMemberProperty(osg::ref_ptr< osgAnimation::Vec3Target >, _scale); -END_REFLECTOR +TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ref_ptr< osgAnimation::Bone > >, osgAnimation::BoneMap) BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Bone >) I_DeclaringFile("osg/ref_ptr"); @@ -362,5 +167,5 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Bone >) 0); END_REFLECTOR -STD_MAP_REFLECTOR(std::map< std::string COMMA osgAnimation::Bone::PointerType >) +STD_MAP_REFLECTOR(std::map< std::string COMMA osg::ref_ptr< osgAnimation::Bone > >) diff --git a/src/osgWrappers/osgAnimation/BoneMapVisitor.cpp b/src/osgWrappers/osgAnimation/BoneMapVisitor.cpp new file mode 100644 index 000000000..43595276c --- /dev/null +++ b/src/osgWrappers/osgAnimation/BoneMapVisitor.cpp @@ -0,0 +1,61 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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(osgAnimation::BoneMapVisitor) + I_DeclaringFile("osgAnimation/BoneMapVisitor"); + I_BaseType(osg::NodeVisitor); + 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_Constructor0(____BoneMapVisitor, + "", + ""); + 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_Method0(const osgAnimation::BoneMap &, getBoneMap, + Properties::NON_VIRTUAL, + __C5_BoneMap_R1__getBoneMap, + "", + ""); + I_SimpleProperty(const osgAnimation::BoneMap &, BoneMap, + __C5_BoneMap_R1__getBoneMap, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/Channel.cpp b/src/osgWrappers/osgAnimation/Channel.cpp index a28434597..3ec4b8a3e 100644 --- a/src/osgWrappers/osgAnimation/Channel.cpp +++ b/src/osgWrappers/osgAnimation/Channel.cpp @@ -28,9 +28,19 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) I_Constructor0(____Channel, "", ""); - I_Method1(void, update, IN, float, time, + I_Constructor1(IN, const osgAnimation::Channel &, channel, + Properties::NON_EXPLICIT, + ____Channel__C5_Channel_R1, + "", + ""); + I_Method0(osgAnimation::Channel *, clone, Properties::PURE_VIRTUAL, - __void__update__float, + __Channel_P1__clone, + "", + ""); + I_Method3(void, update, IN, float, time, IN, float, weight, IN, int, priority, + Properties::PURE_VIRTUAL, + __void__update__float__float__int, "", ""); I_Method0(void, reset, @@ -43,6 +53,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) __Target_P1__getTarget, "", ""); + I_Method1(bool, setTarget, IN, osgAnimation::Target *, x, + Properties::PURE_VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); I_Method0(const std::string &, getName, Properties::NON_VIRTUAL, __C5_std_string_R1__getName, @@ -73,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, @@ -93,6 +98,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) __C5_Sampler_P1__getSampler, "", ""); + I_Method0(bool, createKeyframeContainerFromTargetValue, + Properties::PURE_VIRTUAL, + __bool__createKeyframeContainerFromTargetValue, + "", + ""); I_SimpleProperty(float, EndTime, __float__getEndTime, 0); @@ -107,17 +117,26 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Channel) 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); 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) +TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::DoubleStepSampler >, osgAnimation::DoubleStepChannel) + +TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::FloatStepSampler >, osgAnimation::FloatStepChannel) + +TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::Vec2StepSampler >, osgAnimation::Vec2StepChannel) + +TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::Vec3StepSampler >, osgAnimation::Vec3StepChannel) + +TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::Vec4StepSampler >, osgAnimation::Vec4StepChannel) + +TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::QuatStepSampler >, osgAnimation::QuatStepChannel) + TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >, osgAnimation::DoubleLinearChannel) TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >, osgAnimation::FloatLinearChannel) @@ -130,6 +149,8 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler > TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >, osgAnimation::QuatSphericalLinearChannel) +TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::MatrixLinearSampler >, osgAnimation::MatrixLinearChannel) + TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >, osgAnimation::FloatCubicBezierChannel) TYPE_NAME_ALIAS(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >, osgAnimation::DoubleCubicBezierChannel) @@ -183,13 +204,28 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::DoubleCubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -202,7 +238,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::DoubleCubicBezierSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -217,17 +258,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::DoubleCubicBezierSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::DoubleCubicBezierSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::DoubleCubicBezierSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -237,6 +278,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -255,10 +301,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, + I_SimpleProperty(osgAnimation::DoubleCubicBezierSampler *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::DoubleCubicBezierSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -266,7 +312,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); @@ -275,13 +321,28 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::DoubleLinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -294,7 +355,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::DoubleLinearSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -309,17 +375,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::DoubleLinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::DoubleLinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::DoubleLinearSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -329,6 +395,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -347,10 +418,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, + I_SimpleProperty(osgAnimation::DoubleLinearSampler *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::DoubleLinearSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -358,22 +429,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >) +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleStepSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::DoubleStepSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::DoubleStepSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleStepSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -386,7 +472,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::DoubleStepSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -401,17 +492,134 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::DoubleStepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::DoubleStepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::DoubleStepSampler *, sampler, + Properties::NON_VIRTUAL, + __void__setSampler__SamplerType_P1, + "", + ""); + I_Method0(osgAnimation::TemplateChannel< osgAnimation::DoubleStepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __TargetType_P1__getTargetTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::DoubleStepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); + I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleStepSampler >::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(osgAnimation::DoubleStepSampler *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(osgAnimation::DoubleStepSampler *, 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::DoubleStepSampler >::TargetType *, TargetTyped, + __TargetType_P1__getTargetTyped, + 0); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >) + 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::FloatCubicBezierSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::FloatCubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >::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(osgAnimation::FloatCubicBezierSampler *, 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(osgAnimation::FloatCubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method0(const osgAnimation::FloatCubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __C5_SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method1(void, setSampler, IN, osgAnimation::FloatCubicBezierSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -421,6 +629,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -439,10 +652,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, + I_SimpleProperty(osgAnimation::FloatCubicBezierSampler *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::FloatCubicBezierSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -450,7 +663,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); @@ -459,13 +672,28 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::FloatLinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -478,7 +706,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::FloatLinearSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -493,17 +726,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::FloatLinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::FloatLinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::FloatLinearSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -513,6 +746,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -531,10 +769,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, + I_SimpleProperty(osgAnimation::FloatLinearSampler *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::FloatLinearSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -542,22 +780,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >) +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatStepSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::FloatStepSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::FloatStepSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatStepSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -570,7 +823,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::FloatStepSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -585,17 +843,251 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::FloatStepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::FloatStepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::FloatStepSampler *, sampler, + Properties::NON_VIRTUAL, + __void__setSampler__SamplerType_P1, + "", + ""); + I_Method0(osgAnimation::TemplateChannel< osgAnimation::FloatStepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __TargetType_P1__getTargetTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::FloatStepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); + I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::FloatStepSampler >::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(osgAnimation::FloatStepSampler *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(osgAnimation::FloatStepSampler *, 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::FloatStepSampler >::TargetType *, TargetTyped, + __TargetType_P1__getTargetTyped, + 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, osgAnimation::MatrixLinearSampler *, 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(osgAnimation::MatrixLinearSampler *, 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(osgAnimation::MatrixLinearSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method0(const osgAnimation::MatrixLinearSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __C5_SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method1(void, setSampler, IN, osgAnimation::MatrixLinearSampler *, 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(osgAnimation::MatrixLinearSampler *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(osgAnimation::MatrixLinearSampler *, 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 + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >) + 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::QuatSphericalLinearSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::QuatSphericalLinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >::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(osgAnimation::QuatSphericalLinearSampler *, 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(osgAnimation::QuatSphericalLinearSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method0(const osgAnimation::QuatSphericalLinearSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __C5_SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method1(void, setSampler, IN, osgAnimation::QuatSphericalLinearSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -605,6 +1097,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -623,10 +1120,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, + I_SimpleProperty(osgAnimation::QuatSphericalLinearSampler *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::QuatSphericalLinearSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -634,22 +1131,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >) +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatStepSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::QuatStepSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::QuatStepSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::QuatStepSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -662,7 +1174,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::QuatStepSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -677,17 +1194,134 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::QuatStepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::QuatStepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::QuatStepSampler *, sampler, + Properties::NON_VIRTUAL, + __void__setSampler__SamplerType_P1, + "", + ""); + I_Method0(osgAnimation::TemplateChannel< osgAnimation::QuatStepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __TargetType_P1__getTargetTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::QuatStepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); + I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::QuatStepSampler >::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(osgAnimation::QuatStepSampler *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(osgAnimation::QuatStepSampler *, 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::QuatStepSampler >::TargetType *, TargetTyped, + __TargetType_P1__getTargetTyped, + 0); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >) + 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::Vec2CubicBezierSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec2CubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >::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(osgAnimation::Vec2CubicBezierSampler *, 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(osgAnimation::Vec2CubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method0(const osgAnimation::Vec2CubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __C5_SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method1(void, setSampler, IN, osgAnimation::Vec2CubicBezierSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -697,6 +1331,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -715,10 +1354,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, - 0, - __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec2CubicBezierSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -726,7 +1365,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); @@ -735,13 +1374,28 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec2LinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -754,7 +1408,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::Vec2LinearSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -769,17 +1428,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::Vec2LinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::Vec2LinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::Vec2LinearSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -789,6 +1448,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -807,10 +1471,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, - 0, - __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec2LinearSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -818,22 +1482,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >) +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2StepSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::Vec2StepSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec2StepSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2StepSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -846,7 +1525,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::Vec2StepSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -861,17 +1545,134 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::Vec2StepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::Vec2StepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::Vec2StepSampler *, sampler, + Properties::NON_VIRTUAL, + __void__setSampler__SamplerType_P1, + "", + ""); + I_Method0(osgAnimation::TemplateChannel< osgAnimation::Vec2StepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __TargetType_P1__getTargetTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec2StepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); + I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2StepSampler >::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(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec2StepSampler *, 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::Vec2StepSampler >::TargetType *, TargetTyped, + __TargetType_P1__getTargetTyped, + 0); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >) + 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::Vec3CubicBezierSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec3CubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >::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(osgAnimation::Vec3CubicBezierSampler *, 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(osgAnimation::Vec3CubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method0(const osgAnimation::Vec3CubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __C5_SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method1(void, setSampler, IN, osgAnimation::Vec3CubicBezierSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -881,6 +1682,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -899,10 +1705,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, - 0, - __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec3CubicBezierSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -910,7 +1716,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); @@ -919,13 +1725,28 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec3LinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -938,7 +1759,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::Vec3LinearSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -953,17 +1779,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::Vec3LinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::Vec3LinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::Vec3LinearSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -973,6 +1799,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -991,10 +1822,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, - 0, - __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec3LinearSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -1002,22 +1833,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >) +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3StepSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::Vec3StepSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec3StepSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3StepSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -1030,7 +1876,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::Vec3StepSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -1045,17 +1896,134 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::Vec3StepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::Vec3StepSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::Vec3StepSampler *, sampler, + Properties::NON_VIRTUAL, + __void__setSampler__SamplerType_P1, + "", + ""); + I_Method0(osgAnimation::TemplateChannel< osgAnimation::Vec3StepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __TargetType_P1__getTargetTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec3StepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); + I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3StepSampler >::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(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec3StepSampler *, 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::Vec3StepSampler >::TargetType *, TargetTyped, + __TargetType_P1__getTargetTyped, + 0); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >) + 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::Vec4CubicBezierSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec4CubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >::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(osgAnimation::Vec4CubicBezierSampler *, 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(osgAnimation::Vec4CubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method0(const osgAnimation::Vec4CubicBezierSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __C5_SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method1(void, setSampler, IN, osgAnimation::Vec4CubicBezierSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -1065,6 +2033,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -1083,10 +2056,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, - 0, - __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec4CubicBezierSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -1094,7 +2067,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); @@ -1103,13 +2076,28 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >::TargetType *, target, 0, + I_Method0(osgAnimation::Channel *, clone, + Properties::VIRTUAL, + __Channel_P1__clone, + "", + ""); + I_Constructor1(IN, const osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec4LinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); - I_Method1(void, update, IN, float, time, + I_Method0(bool, createKeyframeContainerFromTargetValue, Properties::VIRTUAL, - __void__update__float, + __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, @@ -1122,7 +2110,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa __Target_P1__getTarget, "", ""); - I_Method0(SamplerType *, getOrCreateSampler, + I_Method1(bool, setTarget, IN, osgAnimation::Target *, target, + Properties::VIRTUAL, + __bool__setTarget__Target_P1, + "", + ""); + I_Method0(osgAnimation::Vec4LinearSampler *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -1137,17 +2130,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa __C5_Sampler_P1__getSampler, "", ""); - I_Method0(SamplerType *, getSamplerTyped, + I_Method0(osgAnimation::Vec4LinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const SamplerType *, getSamplerTyped, + I_Method0(const osgAnimation::Vec4LinearSampler *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, SamplerType *, sampler, + I_Method1(void, setSampler, IN, osgAnimation::Vec4LinearSampler *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -1157,6 +2150,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa __TargetType_P1__getTargetTyped, "", ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >::TargetType *, target, Properties::NON_VIRTUAL, __void__setTarget__TargetType_P1, @@ -1175,10 +2173,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(SamplerType *, Sampler, - 0, - __void__setSampler__SamplerType_P1); - I_SimpleProperty(SamplerType *, SamplerTyped, + I_SimpleProperty(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec4LinearSampler *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -1186,11 +2184,128 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa 0); I_SimpleProperty(osgAnimation::Target *, Target, __Target_P1__getTarget, - 0); + __bool__setTarget__Target_P1); I_SimpleProperty(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >::TargetType *, TargetTyped, __TargetType_P1__getTargetTyped, 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4StepSampler >) + 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::Vec4StepSampler > &, channel, + Properties::NON_EXPLICIT, + ____TemplateChannel__C5_TemplateChannel_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, osgAnimation::Vec4StepSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4StepSampler >::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(osgAnimation::Vec4StepSampler *, 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(osgAnimation::Vec4StepSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method0(const osgAnimation::Vec4StepSampler *, getSamplerTyped, + Properties::NON_VIRTUAL, + __C5_SamplerType_P1__getSamplerTyped, + "", + ""); + I_Method1(void, setSampler, IN, osgAnimation::Vec4StepSampler *, sampler, + Properties::NON_VIRTUAL, + __void__setSampler__SamplerType_P1, + "", + ""); + I_Method0(osgAnimation::TemplateChannel< osgAnimation::Vec4StepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __TargetType_P1__getTargetTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateChannel< osgAnimation::Vec4StepSampler >::TargetType *, getTargetTyped, + Properties::NON_VIRTUAL, + __C5_TargetType_P1__getTargetTyped, + "", + ""); + I_Method1(void, setTarget, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4StepSampler >::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(osgAnimation::Sampler *, Sampler, + __Sampler_P1__getSampler, + 0); + I_SimpleProperty(osgAnimation::Vec4StepSampler *, 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::Vec4StepSampler >::TargetType *, TargetTyped, + __TargetType_P1__getTargetTyped, + 0); +END_REFLECTOR + STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgAnimation::Channel > >) diff --git a/src/osgWrappers/osgAnimation/CubicBezier.cpp b/src/osgWrappers/osgAnimation/CubicBezier.cpp index 098f0c6d3..4c7a2f38e 100644 --- a/src/osgWrappers/osgAnimation/CubicBezier.cpp +++ b/src/osgWrappers/osgAnimation/CubicBezier.cpp @@ -10,6 +10,9 @@ #include #include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -32,296 +35,351 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezier< osg::Vec4 >, osgAnimation::Ve BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< double >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const T &, getP0, - Properties::NON_VIRTUAL, - __C5_T_R1__getP0, - "", - ""); - I_Method0(const T &, getP1, - Properties::NON_VIRTUAL, - __C5_T_R1__getP1, - "", - ""); - I_Method0(const T &, getP2, - Properties::NON_VIRTUAL, - __C5_T_R1__getP2, - "", - ""); - I_Constructor3(IN, const T &, v0, IN, const T &, v1, IN, const T &, v2, - ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, - "", - ""); I_Constructor0(____TemplateCubicBezier, "", ""); - I_Method0(const T &, getPosition, + I_Constructor3(IN, const double &, p, IN, const double &, i, IN, const double &, o, + ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, + "", + ""); + I_Constructor1(IN, const double &, p, + Properties::NON_EXPLICIT, + ____TemplateCubicBezier__C5_T_R1, + "", + ""); + I_Method0(const double &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const T &, getTangentPoint1, + I_Method0(const double &, getControlPointIn, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint1, + __C5_T_R1__getControlPointIn, "", ""); - I_Method0(const T &, getTangentPoint2, + I_Method0(const double &, getControlPointOut, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint2, + __C5_T_R1__getControlPointOut, "", ""); - I_SimpleProperty(const T &, P0, - __C5_T_R1__getP0, - 0); - I_SimpleProperty(const T &, P1, - __C5_T_R1__getP1, - 0); - I_SimpleProperty(const T &, P2, - __C5_T_R1__getP2, - 0); - I_SimpleProperty(const T &, Position, + I_Method0(double &, getPosition, + Properties::NON_VIRTUAL, + __T_R1__getPosition, + "", + ""); + I_Method0(double &, getControlPointIn, + Properties::NON_VIRTUAL, + __T_R1__getControlPointIn, + "", + ""); + I_Method0(double &, getControlPointOut, + Properties::NON_VIRTUAL, + __T_R1__getControlPointOut, + "", + ""); + I_Method1(void, setPosition, IN, const double &, v, + Properties::NON_VIRTUAL, + __void__setPosition__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointIn, IN, const double &, v, + Properties::NON_VIRTUAL, + __void__setControlPointIn__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointOut, IN, const double &, v, + Properties::NON_VIRTUAL, + __void__setControlPointOut__C5_T_R1, + "", + ""); + I_SimpleProperty(const double &, ControlPointIn, + __C5_T_R1__getControlPointIn, + __void__setControlPointIn__C5_T_R1); + I_SimpleProperty(const double &, ControlPointOut, + __C5_T_R1__getControlPointOut, + __void__setControlPointOut__C5_T_R1); + I_SimpleProperty(const double &, Position, __C5_T_R1__getPosition, - 0); - I_SimpleProperty(const T &, TangentPoint1, - __C5_T_R1__getTangentPoint1, - 0); - I_SimpleProperty(const T &, TangentPoint2, - __C5_T_R1__getTangentPoint2, - 0); + __void__setPosition__C5_T_R1); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< float >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const T &, getP0, - Properties::NON_VIRTUAL, - __C5_T_R1__getP0, - "", - ""); - I_Method0(const T &, getP1, - Properties::NON_VIRTUAL, - __C5_T_R1__getP1, - "", - ""); - I_Method0(const T &, getP2, - Properties::NON_VIRTUAL, - __C5_T_R1__getP2, - "", - ""); - I_Constructor3(IN, const T &, v0, IN, const T &, v1, IN, const T &, v2, - ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, - "", - ""); I_Constructor0(____TemplateCubicBezier, "", ""); - I_Method0(const T &, getPosition, + I_Constructor3(IN, const float &, p, IN, const float &, i, IN, const float &, o, + ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, + "", + ""); + I_Constructor1(IN, const float &, p, + Properties::NON_EXPLICIT, + ____TemplateCubicBezier__C5_T_R1, + "", + ""); + I_Method0(const float &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const T &, getTangentPoint1, + I_Method0(const float &, getControlPointIn, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint1, + __C5_T_R1__getControlPointIn, "", ""); - I_Method0(const T &, getTangentPoint2, + I_Method0(const float &, getControlPointOut, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint2, + __C5_T_R1__getControlPointOut, "", ""); - I_SimpleProperty(const T &, P0, - __C5_T_R1__getP0, - 0); - I_SimpleProperty(const T &, P1, - __C5_T_R1__getP1, - 0); - I_SimpleProperty(const T &, P2, - __C5_T_R1__getP2, - 0); - I_SimpleProperty(const T &, Position, + I_Method0(float &, getPosition, + Properties::NON_VIRTUAL, + __T_R1__getPosition, + "", + ""); + I_Method0(float &, getControlPointIn, + Properties::NON_VIRTUAL, + __T_R1__getControlPointIn, + "", + ""); + I_Method0(float &, getControlPointOut, + Properties::NON_VIRTUAL, + __T_R1__getControlPointOut, + "", + ""); + I_Method1(void, setPosition, IN, const float &, v, + Properties::NON_VIRTUAL, + __void__setPosition__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointIn, IN, const float &, v, + Properties::NON_VIRTUAL, + __void__setControlPointIn__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointOut, IN, const float &, v, + Properties::NON_VIRTUAL, + __void__setControlPointOut__C5_T_R1, + "", + ""); + I_SimpleProperty(const float &, ControlPointIn, + __C5_T_R1__getControlPointIn, + __void__setControlPointIn__C5_T_R1); + I_SimpleProperty(const float &, ControlPointOut, + __C5_T_R1__getControlPointOut, + __void__setControlPointOut__C5_T_R1); + I_SimpleProperty(const float &, Position, __C5_T_R1__getPosition, - 0); - I_SimpleProperty(const T &, TangentPoint1, - __C5_T_R1__getTangentPoint1, - 0); - I_SimpleProperty(const T &, TangentPoint2, - __C5_T_R1__getTangentPoint2, - 0); + __void__setPosition__C5_T_R1); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< osg::Vec2 >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const T &, getP0, - Properties::NON_VIRTUAL, - __C5_T_R1__getP0, - "", - ""); - I_Method0(const T &, getP1, - Properties::NON_VIRTUAL, - __C5_T_R1__getP1, - "", - ""); - I_Method0(const T &, getP2, - Properties::NON_VIRTUAL, - __C5_T_R1__getP2, - "", - ""); - I_Constructor3(IN, const T &, v0, IN, const T &, v1, IN, const T &, v2, - ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, - "", - ""); I_Constructor0(____TemplateCubicBezier, "", ""); - I_Method0(const T &, getPosition, + I_Constructor3(IN, const osg::Vec2 &, p, IN, const osg::Vec2 &, i, IN, const osg::Vec2 &, o, + ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, + "", + ""); + I_Constructor1(IN, const osg::Vec2 &, p, + Properties::NON_EXPLICIT, + ____TemplateCubicBezier__C5_T_R1, + "", + ""); + I_Method0(const osg::Vec2 &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const T &, getTangentPoint1, + I_Method0(const osg::Vec2 &, getControlPointIn, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint1, + __C5_T_R1__getControlPointIn, "", ""); - I_Method0(const T &, getTangentPoint2, + I_Method0(const osg::Vec2 &, getControlPointOut, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint2, + __C5_T_R1__getControlPointOut, "", ""); - I_SimpleProperty(const T &, P0, - __C5_T_R1__getP0, - 0); - I_SimpleProperty(const T &, P1, - __C5_T_R1__getP1, - 0); - I_SimpleProperty(const T &, P2, - __C5_T_R1__getP2, - 0); - I_SimpleProperty(const T &, Position, + I_Method0(osg::Vec2 &, getPosition, + Properties::NON_VIRTUAL, + __T_R1__getPosition, + "", + ""); + I_Method0(osg::Vec2 &, getControlPointIn, + Properties::NON_VIRTUAL, + __T_R1__getControlPointIn, + "", + ""); + I_Method0(osg::Vec2 &, getControlPointOut, + Properties::NON_VIRTUAL, + __T_R1__getControlPointOut, + "", + ""); + I_Method1(void, setPosition, IN, const osg::Vec2 &, v, + Properties::NON_VIRTUAL, + __void__setPosition__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointIn, IN, const osg::Vec2 &, v, + Properties::NON_VIRTUAL, + __void__setControlPointIn__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointOut, IN, const osg::Vec2 &, v, + Properties::NON_VIRTUAL, + __void__setControlPointOut__C5_T_R1, + "", + ""); + I_SimpleProperty(const osg::Vec2 &, ControlPointIn, + __C5_T_R1__getControlPointIn, + __void__setControlPointIn__C5_T_R1); + I_SimpleProperty(const osg::Vec2 &, ControlPointOut, + __C5_T_R1__getControlPointOut, + __void__setControlPointOut__C5_T_R1); + I_SimpleProperty(const osg::Vec2 &, Position, __C5_T_R1__getPosition, - 0); - I_SimpleProperty(const T &, TangentPoint1, - __C5_T_R1__getTangentPoint1, - 0); - I_SimpleProperty(const T &, TangentPoint2, - __C5_T_R1__getTangentPoint2, - 0); + __void__setPosition__C5_T_R1); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< osg::Vec3 >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const T &, getP0, - Properties::NON_VIRTUAL, - __C5_T_R1__getP0, - "", - ""); - I_Method0(const T &, getP1, - Properties::NON_VIRTUAL, - __C5_T_R1__getP1, - "", - ""); - I_Method0(const T &, getP2, - Properties::NON_VIRTUAL, - __C5_T_R1__getP2, - "", - ""); - I_Constructor3(IN, const T &, v0, IN, const T &, v1, IN, const T &, v2, - ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, - "", - ""); I_Constructor0(____TemplateCubicBezier, "", ""); - I_Method0(const T &, getPosition, + I_Constructor3(IN, const osg::Vec3 &, p, IN, const osg::Vec3 &, i, IN, const osg::Vec3 &, o, + ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, + "", + ""); + I_Constructor1(IN, const osg::Vec3 &, p, + Properties::NON_EXPLICIT, + ____TemplateCubicBezier__C5_T_R1, + "", + ""); + I_Method0(const osg::Vec3 &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const T &, getTangentPoint1, + I_Method0(const osg::Vec3 &, getControlPointIn, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint1, + __C5_T_R1__getControlPointIn, "", ""); - I_Method0(const T &, getTangentPoint2, + I_Method0(const osg::Vec3 &, getControlPointOut, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint2, + __C5_T_R1__getControlPointOut, "", ""); - I_SimpleProperty(const T &, P0, - __C5_T_R1__getP0, - 0); - I_SimpleProperty(const T &, P1, - __C5_T_R1__getP1, - 0); - I_SimpleProperty(const T &, P2, - __C5_T_R1__getP2, - 0); - I_SimpleProperty(const T &, Position, + I_Method0(osg::Vec3 &, getPosition, + Properties::NON_VIRTUAL, + __T_R1__getPosition, + "", + ""); + I_Method0(osg::Vec3 &, getControlPointIn, + Properties::NON_VIRTUAL, + __T_R1__getControlPointIn, + "", + ""); + I_Method0(osg::Vec3 &, getControlPointOut, + Properties::NON_VIRTUAL, + __T_R1__getControlPointOut, + "", + ""); + I_Method1(void, setPosition, IN, const osg::Vec3 &, v, + Properties::NON_VIRTUAL, + __void__setPosition__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointIn, IN, const osg::Vec3 &, v, + Properties::NON_VIRTUAL, + __void__setControlPointIn__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointOut, IN, const osg::Vec3 &, v, + Properties::NON_VIRTUAL, + __void__setControlPointOut__C5_T_R1, + "", + ""); + I_SimpleProperty(const osg::Vec3 &, ControlPointIn, + __C5_T_R1__getControlPointIn, + __void__setControlPointIn__C5_T_R1); + I_SimpleProperty(const osg::Vec3 &, ControlPointOut, + __C5_T_R1__getControlPointOut, + __void__setControlPointOut__C5_T_R1); + I_SimpleProperty(const osg::Vec3 &, Position, __C5_T_R1__getPosition, - 0); - I_SimpleProperty(const T &, TangentPoint1, - __C5_T_R1__getTangentPoint1, - 0); - I_SimpleProperty(const T &, TangentPoint2, - __C5_T_R1__getTangentPoint2, - 0); + __void__setPosition__C5_T_R1); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< osg::Vec4 >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const T &, getP0, - Properties::NON_VIRTUAL, - __C5_T_R1__getP0, - "", - ""); - I_Method0(const T &, getP1, - Properties::NON_VIRTUAL, - __C5_T_R1__getP1, - "", - ""); - I_Method0(const T &, getP2, - Properties::NON_VIRTUAL, - __C5_T_R1__getP2, - "", - ""); - I_Constructor3(IN, const T &, v0, IN, const T &, v1, IN, const T &, v2, - ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, - "", - ""); I_Constructor0(____TemplateCubicBezier, "", ""); - I_Method0(const T &, getPosition, + I_Constructor3(IN, const osg::Vec4 &, p, IN, const osg::Vec4 &, i, IN, const osg::Vec4 &, o, + ____TemplateCubicBezier__C5_T_R1__C5_T_R1__C5_T_R1, + "", + ""); + I_Constructor1(IN, const osg::Vec4 &, p, + Properties::NON_EXPLICIT, + ____TemplateCubicBezier__C5_T_R1, + "", + ""); + I_Method0(const osg::Vec4 &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const T &, getTangentPoint1, + I_Method0(const osg::Vec4 &, getControlPointIn, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint1, + __C5_T_R1__getControlPointIn, "", ""); - I_Method0(const T &, getTangentPoint2, + I_Method0(const osg::Vec4 &, getControlPointOut, Properties::NON_VIRTUAL, - __C5_T_R1__getTangentPoint2, + __C5_T_R1__getControlPointOut, "", ""); - I_SimpleProperty(const T &, P0, - __C5_T_R1__getP0, - 0); - I_SimpleProperty(const T &, P1, - __C5_T_R1__getP1, - 0); - I_SimpleProperty(const T &, P2, - __C5_T_R1__getP2, - 0); - I_SimpleProperty(const T &, Position, + I_Method0(osg::Vec4 &, getPosition, + Properties::NON_VIRTUAL, + __T_R1__getPosition, + "", + ""); + I_Method0(osg::Vec4 &, getControlPointIn, + Properties::NON_VIRTUAL, + __T_R1__getControlPointIn, + "", + ""); + I_Method0(osg::Vec4 &, getControlPointOut, + Properties::NON_VIRTUAL, + __T_R1__getControlPointOut, + "", + ""); + I_Method1(void, setPosition, IN, const osg::Vec4 &, v, + Properties::NON_VIRTUAL, + __void__setPosition__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointIn, IN, const osg::Vec4 &, v, + Properties::NON_VIRTUAL, + __void__setControlPointIn__C5_T_R1, + "", + ""); + I_Method1(void, setControlPointOut, IN, const osg::Vec4 &, v, + Properties::NON_VIRTUAL, + __void__setControlPointOut__C5_T_R1, + "", + ""); + I_SimpleProperty(const osg::Vec4 &, ControlPointIn, + __C5_T_R1__getControlPointIn, + __void__setControlPointIn__C5_T_R1); + I_SimpleProperty(const osg::Vec4 &, ControlPointOut, + __C5_T_R1__getControlPointOut, + __void__setControlPointOut__C5_T_R1); + I_SimpleProperty(const osg::Vec4 &, Position, __C5_T_R1__getPosition, - 0); - I_SimpleProperty(const T &, TangentPoint1, - __C5_T_R1__getTangentPoint1, - 0); - I_SimpleProperty(const T &, TangentPoint2, - __C5_T_R1__getTangentPoint2, - 0); + __void__setPosition__C5_T_R1); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/EaseMotion.cpp b/src/osgWrappers/osgAnimation/EaseMotion.cpp index c158b4f81..e59dc5b08 100644 --- a/src/osgWrappers/osgAnimation/EaseMotion.cpp +++ b/src/osgWrappers/osgAnimation/EaseMotion.cpp @@ -50,6 +50,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::CompositeMotion) I_PublicMemberProperty(osgAnimation::CompositeMotion::MotionList, _motions); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::InBackFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InBackFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::InBounceFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____InBounceFunction, @@ -61,6 +72,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::InBounceFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::InCircFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InCircFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::InCubicFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____InCubicFunction, @@ -72,6 +94,39 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::InCubicFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::InElasticFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InElasticFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::InExpoFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InExpoFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::InOutBackFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InOutBackFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::InOutBounceFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____InOutBounceFunction, @@ -83,6 +138,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::InOutBounceFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::InOutCircFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InOutCircFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::InOutCubicFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____InOutCubicFunction, @@ -94,6 +160,28 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::InOutCubicFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::InOutElasticFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InOutElasticFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::InOutExpoFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InOutExpoFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::InOutQuadFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____InOutQuadFunction, @@ -116,6 +204,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::InOutQuartFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::InOutSineFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InOutSineFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::InQuadFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____InQuadFunction, @@ -138,6 +237,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::InQuartFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::InSineFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____InSineFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::LinearFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____LinearFunction, @@ -149,14 +259,14 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::LinearFunction) ""); END_REFLECTOR +TYPE_NAME_ALIAS(float, osgAnimation::Motion::value_type) + BEGIN_ENUM_REFLECTOR(osgAnimation::Motion::TimeBehaviour) I_DeclaringFile("osgAnimation/EaseMotion"); I_EnumLabel(osgAnimation::Motion::CLAMP); I_EnumLabel(osgAnimation::Motion::LOOP); END_REFLECTOR -TYPE_NAME_ALIAS(float, osgAnimation::Motion::value_type) - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Motion) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osg::Referenced); @@ -230,6 +340,17 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Motion) 0); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::OutBackFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____OutBackFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::OutBounceFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____OutBounceFunction, @@ -241,6 +362,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::OutBounceFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::OutCircFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____OutCircFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::OutCubicFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____OutCubicFunction, @@ -252,6 +384,28 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::OutCubicFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::OutElasticFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____OutElasticFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::OutExpoFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____OutExpoFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgAnimation::OutQuadFunction) I_DeclaringFile("osgAnimation/EaseMotion"); I_Constructor0(____OutQuadFunction, @@ -274,6 +428,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::OutQuartFunction) ""); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgAnimation::OutSineFunction) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_Constructor0(____OutSineFunction, + "", + ""); + I_StaticMethod2(void, getValueAt, IN, float, t, IN, float &, result, + __void__getValueAt__float__float_R1_S, + "", + ""); +END_REFLECTOR + TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::LinearFunction >, osgAnimation::LinearMotion) TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::OutQuadFunction >, osgAnimation::OutQuadMotion) @@ -300,6 +465,36 @@ TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InBounceFunction TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InOutBounceFunction >, osgAnimation::InOutBounceMotion) +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::OutElasticFunction >, osgAnimation::OutElasticMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InElasticFunction >, osgAnimation::InElasticMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InOutElasticFunction >, osgAnimation::InOutElasticMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::OutSineFunction >, osgAnimation::OutSineMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InSineFunction >, osgAnimation::InSineMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InOutSineFunction >, osgAnimation::InOutSineMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::OutBackFunction >, osgAnimation::OutBackMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InBackFunction >, osgAnimation::InBackMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InOutBackFunction >, osgAnimation::InOutBackMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::OutCircFunction >, osgAnimation::OutCircMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InCircFunction >, osgAnimation::InCircMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InOutCircFunction >, osgAnimation::InOutCircMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::OutExpoFunction >, osgAnimation::OutExpoMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InExpoFunction >, osgAnimation::InExpoMotion) + +TYPE_NAME_ALIAS(osgAnimation::MathMotionTemplate< osgAnimation::InOutExpoFunction >, osgAnimation::InOutExpoMotion) + BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Motion >) I_DeclaringFile("osg/ref_ptr"); I_Constructor0(____ref_ptr, @@ -340,6 +535,20 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Motion >) 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InBackFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InBounceFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -354,6 +563,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InBounceF ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InCircFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InCubicFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -368,6 +591,48 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InCubicFu ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InElasticFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InExpoFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutBackFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutBounceFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -382,6 +647,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutBoun ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutCircFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutCubicFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -396,6 +675,34 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutCubi ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutElasticFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutExpoFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutQuadFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -424,6 +731,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutQuar ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InOutSineFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InQuadFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -452,6 +773,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InQuartFu ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::InSineFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::LinearFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -466,6 +801,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::LinearFun ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutBackFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutBounceFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -480,6 +829,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutBounce ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutCircFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutCubicFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -494,6 +857,34 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutCubicF ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutElasticFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutExpoFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutQuadFunction >) I_DeclaringFile("osgAnimation/EaseMotion"); I_BaseType(osgAnimation::Motion); @@ -522,5 +913,19 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutQuartF ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::MathMotionTemplate< osgAnimation::OutSineFunction >) + I_DeclaringFile("osgAnimation/EaseMotion"); + I_BaseType(osgAnimation::Motion); + I_ConstructorWithDefaults4(IN, float, startValue, 0, IN, float, duration, 1, IN, float, changeValue, 1, IN, osgAnimation::Motion::TimeBehaviour, tb, osgAnimation::Motion::CLAMP, + ____MathMotionTemplate__float__float__float__TimeBehaviour, + "", + ""); + I_Method2(void, getValueInNormalizedRange, IN, float, t, IN, osgAnimation::Motion::value_type &, result, + Properties::VIRTUAL, + __void__getValueInNormalizedRange__float__value_type_R1, + "", + ""); +END_REFLECTOR + STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgAnimation::Motion > >) diff --git a/src/osgWrappers/osgAnimation/FrameAction.cpp b/src/osgWrappers/osgAnimation/FrameAction.cpp new file mode 100644 index 000000000..b93506cb0 --- /dev/null +++ b/src/osgWrappers/osgAnimation/FrameAction.cpp @@ -0,0 +1,67 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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 + +TYPE_NAME_ALIAS(std::pair< unsigned int COMMA osg::ref_ptr< osgAnimation::Action > >, osgAnimation::FrameAction) + +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Action >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgAnimation::Action *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgAnimation::Action > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgAnimation::Action *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osgAnimation::Action *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgAnimation::Action > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osgAnimation::Action *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_PAIR_REFLECTOR(std::pair< unsigned int COMMA osg::ref_ptr< osgAnimation::Action > >) + diff --git a/src/osgWrappers/osgAnimation/Interpolator.cpp b/src/osgWrappers/osgAnimation/Interpolator.cpp index 71af594e4..d19738d30 100644 --- a/src/osgWrappers/osgAnimation/Interpolator.cpp +++ b/src/osgWrappers/osgAnimation/Interpolator.cpp @@ -10,7 +10,14 @@ #include #include +#include +#include +#include +#include +#include +#include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -20,6 +27,20 @@ #undef OUT #endif +TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< double COMMA double >, osgAnimation::DoubleStepInterpolator) + +TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< float COMMA float >, osgAnimation::FloatStepInterpolator) + +TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< osg::Vec2 COMMA osg::Vec2 >, osgAnimation::Vec2StepInterpolator) + +TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< osg::Vec3 COMMA osg::Vec3 >, osgAnimation::Vec3StepInterpolator) + +TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< osg::Vec3 COMMA osgAnimation::Vec3Packed >, osgAnimation::Vec3PackedStepInterpolator) + +TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< osg::Vec4 COMMA osg::Vec4 >, osgAnimation::Vec4StepInterpolator) + +TYPE_NAME_ALIAS(osgAnimation::TemplateStepInterpolator< osg::Quat COMMA osg::Quat >, osgAnimation::QuatStepInterpolator) + TYPE_NAME_ALIAS(osgAnimation::TemplateLinearInterpolator< double COMMA double >, osgAnimation::DoubleLinearInterpolator) TYPE_NAME_ALIAS(osgAnimation::TemplateLinearInterpolator< float COMMA float >, osgAnimation::FloatLinearInterpolator) @@ -34,6 +55,8 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateLinearInterpolator< osg::Vec4 COMMA osg:: TYPE_NAME_ALIAS(osgAnimation::TemplateSphericalLinearInterpolator< osg::Quat COMMA osg::Quat >, osgAnimation::QuatSphericalLinearInterpolator) +TYPE_NAME_ALIAS(osgAnimation::TemplateLinearInterpolator< osg::Matrixf COMMA osg::Matrixf >, osgAnimation::MatrixLinearInterpolator) + TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezierInterpolator< float COMMA osgAnimation::FloatCubicBezier >, osgAnimation::FloatCubicBezierInterpolator) TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezierInterpolator< double COMMA osgAnimation::DoubleCubicBezier >, osgAnimation::DoubleCubicBezierInterpolator) @@ -50,7 +73,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< double COM I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::DoubleCubicBezier > &, keyframes, IN, float, time, IN, double &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -63,7 +86,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< float COMM I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::FloatCubicBezier > &, keyframes, IN, float, time, IN, float &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -76,7 +99,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec2 I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec2CubicBezier > &, keyframes, IN, float, time, IN, osg::Vec2 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -89,7 +112,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec3 I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec3CubicBezier > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -102,7 +125,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec4 I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec4CubicBezier > &, keyframes, IN, float, time, IN, osg::Vec4 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -115,7 +138,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< double COMMA d I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< double > &, keyframes, IN, float, time, IN, double &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -128,7 +151,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< float COMMA fl I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< float > &, keyframes, IN, float, time, IN, float &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +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< osg::Matrixf > &, keyframes, IN, float, time, IN, osg::Matrixf &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -141,7 +177,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec2 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec2 > &, keyframes, IN, float, time, IN, osg::Vec2 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -154,7 +190,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec3 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec3 > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -167,7 +203,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec3 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec3Packed > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -180,7 +216,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec4 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec4 > &, keyframes, IN, float, time, IN, osg::Vec4 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -193,7 +229,98 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSphericalLinearInterpolator< osg::Q I_Constructor0(____TemplateSphericalLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Quat > &, keyframes, IN, float, time, IN, osg::Quat &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateStepInterpolator< double COMMA double >) + I_DeclaringFile("osgAnimation/Interpolator"); + I_BaseType(osgAnimation::TemplateInterpolatorBase); + I_Constructor0(____TemplateStepInterpolator, + "", + ""); + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< double > &, keyframes, IN, float, time, IN, double &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateStepInterpolator< float COMMA float >) + I_DeclaringFile("osgAnimation/Interpolator"); + I_BaseType(osgAnimation::TemplateInterpolatorBase); + I_Constructor0(____TemplateStepInterpolator, + "", + ""); + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< float > &, keyframes, IN, float, time, IN, float &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateStepInterpolator< osg::Quat COMMA osg::Quat >) + I_DeclaringFile("osgAnimation/Interpolator"); + I_BaseType(osgAnimation::TemplateInterpolatorBase); + I_Constructor0(____TemplateStepInterpolator, + "", + ""); + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Quat > &, keyframes, IN, float, time, IN, osg::Quat &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateStepInterpolator< osg::Vec2 COMMA osg::Vec2 >) + I_DeclaringFile("osgAnimation/Interpolator"); + I_BaseType(osgAnimation::TemplateInterpolatorBase); + I_Constructor0(____TemplateStepInterpolator, + "", + ""); + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec2 > &, keyframes, IN, float, time, IN, osg::Vec2 &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateStepInterpolator< osg::Vec3 COMMA osg::Vec3 >) + I_DeclaringFile("osgAnimation/Interpolator"); + I_BaseType(osgAnimation::TemplateInterpolatorBase); + I_Constructor0(____TemplateStepInterpolator, + "", + ""); + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec3 > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateStepInterpolator< osg::Vec3 COMMA osgAnimation::Vec3Packed >) + I_DeclaringFile("osgAnimation/Interpolator"); + I_BaseType(osgAnimation::TemplateInterpolatorBase); + I_Constructor0(____TemplateStepInterpolator, + "", + ""); + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec3Packed > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, + Properties::NON_VIRTUAL, + __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, + "", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateStepInterpolator< osg::Vec4 COMMA osg::Vec4 >) + I_DeclaringFile("osgAnimation/Interpolator"); + I_BaseType(osgAnimation::TemplateInterpolatorBase); + I_Constructor0(____TemplateStepInterpolator, + "", + ""); + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec4 > &, keyframes, IN, float, time, IN, osg::Vec4 &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", diff --git a/src/osgWrappers/osgAnimation/Keyframe.cpp b/src/osgWrappers/osgAnimation/Keyframe.cpp index 15f6255b4..34b06e14e 100644 --- a/src/osgWrappers/osgAnimation/Keyframe.cpp +++ b/src/osgWrappers/osgAnimation/Keyframe.cpp @@ -10,7 +10,14 @@ #include #include +#include +#include +#include +#include +#include +#include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -57,6 +64,10 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< float >, osgAnimation::FloatKeyf TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< float >, osgAnimation::FloatKeyframeContainer) +TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< double >, osgAnimation::DoubleKeyframe) + +TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< double >, osgAnimation::DoubleKeyframeContainer) + TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< osg::Vec2 >, osgAnimation::Vec2Keyframe) TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< osg::Vec2 >, osgAnimation::Vec2KeyframeContainer) @@ -73,6 +84,10 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< osg::Quat >, osgAnimation::QuatK TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< osg::Quat >, osgAnimation::QuatKeyframeContainer) +TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< osg::Matrixf >, osgAnimation::MatrixKeyframe) + +TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< osg::Matrixf >, osgAnimation::MatrixKeyframeContainer) + TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< osgAnimation::Vec3Packed >, osgAnimation::Vec3PackedKeyframe) TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec3Packed >, osgAnimation::Vec3PackedKeyframeContainer) @@ -97,27 +112,77 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframe< osgAnimation::Vec4CubicBezier >, TYPE_NAME_ALIAS(osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec4CubicBezier >, osgAnimation::Vec4CubicBezierKeyframeContainer) +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< double >) + I_DeclaringFile("osgAnimation/Keyframe"); + I_BaseType(osgAnimation::Keyframe); + I_Constructor0(____TemplateKeyframe, + "", + ""); + I_Constructor2(IN, float, time, IN, const double &, value, + ____TemplateKeyframe__float__C5_T_R1, + "", + ""); + I_Method1(void, setValue, IN, const double &, value, + Properties::NON_VIRTUAL, + __void__setValue__C5_T_R1, + "", + ""); + I_Method0(const double &, getValue, + Properties::NON_VIRTUAL, + __C5_T_R1__getValue, + "", + ""); + I_SimpleProperty(const double &, Value, + __C5_T_R1__getValue, + __void__setValue__C5_T_R1); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< float >) I_DeclaringFile("osgAnimation/Keyframe"); I_BaseType(osgAnimation::Keyframe); I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const float &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const float &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const float &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const float &, Value, + __C5_T_R1__getValue, + __void__setValue__C5_T_R1); +END_REFLECTOR + +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 osg::Matrixf &, value, + ____TemplateKeyframe__float__C5_T_R1, + "", + ""); + I_Method1(void, setValue, IN, const osg::Matrixf &, value, + Properties::NON_VIRTUAL, + __void__setValue__C5_T_R1, + "", + ""); + I_Method0(const osg::Matrixf &, getValue, + Properties::NON_VIRTUAL, + __C5_T_R1__getValue, + "", + ""); + I_SimpleProperty(const osg::Matrixf &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -128,21 +193,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Quat >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osg::Quat &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Quat &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osg::Quat &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Quat &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -153,21 +218,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Vec2 >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osg::Vec2 &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Vec2 &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osg::Vec2 &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Vec2 &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -178,21 +243,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Vec3 >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osg::Vec3 &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Vec3 &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osg::Vec3 &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Vec3 &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -203,21 +268,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Vec4 >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osg::Vec4 &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Vec4 &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osg::Vec4 &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Vec4 &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -228,21 +293,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::DoubleCubic I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osgAnimation::DoubleCubicBezier &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osgAnimation::DoubleCubicBezier &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osgAnimation::DoubleCubicBezier &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osgAnimation::DoubleCubicBezier &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -253,21 +318,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::FloatCubicB I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osgAnimation::FloatCubicBezier &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osgAnimation::FloatCubicBezier &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osgAnimation::FloatCubicBezier &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osgAnimation::FloatCubicBezier &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -278,21 +343,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec2CubicBe I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osgAnimation::Vec2CubicBezier &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osgAnimation::Vec2CubicBezier &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osgAnimation::Vec2CubicBezier &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osgAnimation::Vec2CubicBezier &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -303,21 +368,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec3CubicBe I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osgAnimation::Vec3CubicBezier &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osgAnimation::Vec3CubicBezier &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osgAnimation::Vec3CubicBezier &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osgAnimation::Vec3CubicBezier &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -328,21 +393,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec3Packed I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osgAnimation::Vec3Packed &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osgAnimation::Vec3Packed &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osgAnimation::Vec3Packed &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osgAnimation::Vec3Packed &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -353,25 +418,38 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec4CubicBe I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const T &, value, + I_Constructor2(IN, float, time, IN, const osgAnimation::Vec4CubicBezier &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osgAnimation::Vec4CubicBezier &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method0(const osgAnimation::Vec4CubicBezier &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osgAnimation::Vec4CubicBezier &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframeContainer< double >) + I_DeclaringFile("osgAnimation/Keyframe"); + I_BaseType(osgAnimation::KeyframeContainer); + I_Constructor0(____TemplateKeyframeContainer, + "", + ""); + I_Method0(unsigned int, size, + Properties::VIRTUAL, + __unsigned_int__size, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframeContainer< float >) I_DeclaringFile("osgAnimation/Keyframe"); I_BaseType(osgAnimation::KeyframeContainer); @@ -385,6 +463,19 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframeContainer< float >) ""); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframeContainer< osg::Matrixf >) + I_DeclaringFile("osgAnimation/Keyframe"); + I_BaseType(osgAnimation::KeyframeContainer); + I_Constructor0(____TemplateKeyframeContainer, + "", + ""); + I_Method0(unsigned int, size, + Properties::VIRTUAL, + __unsigned_int__size, + "", + ""); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframeContainer< osg::Quat >) I_DeclaringFile("osgAnimation/Keyframe"); I_BaseType(osgAnimation::KeyframeContainer); diff --git a/src/osgWrappers/osgAnimation/LinkVisitor.cpp b/src/osgWrappers/osgAnimation/LinkVisitor.cpp index dc6d91602..1aa4366fb 100644 --- a/src/osgWrappers/osgAnimation/LinkVisitor.cpp +++ b/src/osgWrappers/osgAnimation/LinkVisitor.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -25,14 +26,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::LinkVisitor) I_DeclaringFile("osgAnimation/LinkVisitor"); I_BaseType(osg::NodeVisitor); - I_Constructor1(IN, osgAnimation::Animation *, animation, - Properties::NON_EXPLICIT, - ____LinkVisitor__Animation_P1, - "", - ""); - I_Constructor1(IN, const osgAnimation::AnimationList &, animations, - Properties::NON_EXPLICIT, - ____LinkVisitor__C5_AnimationList_R1, + I_Constructor0(____LinkVisitor, "", ""); I_Method0(const char *, libraryName, @@ -50,7 +44,43 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::LinkVisitor) __void__apply__osg_Node_R1, "", ""); - I_PublicMemberProperty(osgAnimation::AnimationList, _animations); - I_PublicMemberProperty(unsigned int, _nbLinkedTarget); + I_Method1(void, apply, IN, osg::Geode &, node, + Properties::VIRTUAL, + __void__apply__osg_Geode_R1, + "", + ""); + I_Method0(osgAnimation::AnimationList &, getAnimationList, + Properties::NON_VIRTUAL, + __AnimationList_R1__getAnimationList, + "", + ""); + I_Method0(void, reset, + Properties::VIRTUAL, + __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, + __void__handle_stateset__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod1(void, link, IN, osgAnimation::AnimationUpdateCallbackBase *, cb, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__link__osgAnimation_AnimationUpdateCallbackBase_P1, + "", + ""); + 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/MorphGeometry.cpp b/src/osgWrappers/osgAnimation/MorphGeometry.cpp new file mode 100644 index 000000000..dc0f71f8e --- /dev/null +++ b/src/osgWrappers/osgAnimation/MorphGeometry.cpp @@ -0,0 +1,251 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#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 + +TYPE_NAME_ALIAS(std::vector< osgAnimation::MorphGeometry::MorphTarget >, osgAnimation::MorphGeometry::MorphTargetList) + +BEGIN_ENUM_REFLECTOR(osgAnimation::MorphGeometry::Method) + I_DeclaringFile("osgAnimation/MorphGeometry"); + I_EnumLabel(osgAnimation::MorphGeometry::NORMALIZED); + I_EnumLabel(osgAnimation::MorphGeometry::RELATIVE); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::MorphGeometry) + I_DeclaringFile("osgAnimation/MorphGeometry"); + I_BaseType(osg::Geometry); + I_Constructor0(____MorphGeometry, + "", + ""); + I_Constructor1(IN, const osg::Geometry &, b, + Properties::NON_EXPLICIT, + ____MorphGeometry__C5_osg_Geometry_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgAnimation::MorphGeometry &, b, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____MorphGeometry__C5_MorphGeometry_R1__C5_osg_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 &, copyop, + 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_Method0(void, transformSoftwareMethod, + Properties::VIRTUAL, + __void__transformSoftwareMethod, + "", + ""); + I_Method1(void, setMethod, IN, osgAnimation::MorphGeometry::Method, method, + Properties::NON_VIRTUAL, + __void__setMethod__Method, + "Set the morphing method. ", + ""); + I_Method0(osgAnimation::MorphGeometry::Method, getMethod, + Properties::NON_VIRTUAL, + __Method__getMethod, + "Get the morphing method. ", + ""); + I_Method1(void, setMorphNormals, IN, bool, morphNormals, + Properties::NON_VIRTUAL, + __void__setMorphNormals__bool, + "Set flag for morphing normals. ", + ""); + I_Method0(bool, getMorphNormals, + Properties::NON_VIRTUAL, + __bool__getMorphNormals, + "Get the flag for morphing normals. ", + ""); + I_MethodWithDefaults2(void, addMorphTarget, IN, osg::Geometry *, morphTarget, , IN, float, weight, 1.0, + Properties::VIRTUAL, + __void__addMorphTarget__osg_Geometry_P1__float, + "Add a MorphTarget to the MorphGeometry. ", + " param morphTarget The MorphTarget to be added to the MorphGeometry. weight The weight to be added to the MorphGeometry. return true for success; false otherwise. "); + I_Method2(void, setWeight, IN, unsigned int, index, IN, float, morphWeight, + Properties::NON_VIRTUAL, + __void__setWeight__unsigned_int__float, + "", + ""); + I_Method0(void, dirty, + Properties::NON_VIRTUAL, + __void__dirty, + "Set the MorphGeometry dirty. ", + ""); + I_Method0(const osgAnimation::MorphGeometry::MorphTargetList &, getMorphTargetList, + Properties::NON_VIRTUAL, + __C5_MorphTargetList_R1__getMorphTargetList, + "Get the list of MorphTargets. ", + ""); + I_Method0(osgAnimation::MorphGeometry::MorphTargetList &, getMorphTargetList, + Properties::NON_VIRTUAL, + __MorphTargetList_R1__getMorphTargetList, + "Get the list of MorphTargets. ", + "Warning if you modify this array you will have to call dirty() "); + I_Method1(const osgAnimation::MorphGeometry::MorphTarget &, getMorphTarget, IN, unsigned int, i, + Properties::NON_VIRTUAL, + __C5_MorphTarget_R1__getMorphTarget__unsigned_int, + "Return the MorphTarget at position i. ", + ""); + I_Method1(osgAnimation::MorphGeometry::MorphTarget &, getMorphTarget, IN, unsigned int, i, + Properties::NON_VIRTUAL, + __MorphTarget_R1__getMorphTarget__unsigned_int, + "Return the MorphTarget at position i. ", + ""); + I_SimpleProperty(osgAnimation::MorphGeometry::Method, Method, + __Method__getMethod, + __void__setMethod__Method); + I_SimpleProperty(bool, MorphNormals, + __bool__getMorphNormals, + __void__setMorphNormals__bool); + I_SimpleProperty(osgAnimation::MorphGeometry::MorphTargetList &, MorphTargetList, + __MorphTargetList_R1__getMorphTargetList, + 0); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::MorphGeometry::MorphTarget) + I_DeclaringFile("osgAnimation/MorphGeometry"); + I_ConstructorWithDefaults2(IN, osg::Geometry *, geom, , IN, float, w, 1.0, + ____MorphTarget__osg_Geometry_P1__float, + "", + ""); + I_Method1(void, setWeight, IN, float, weight, + Properties::NON_VIRTUAL, + __void__setWeight__float, + "", + ""); + I_Method0(const float, getWeight, + Properties::NON_VIRTUAL, + __C5_float__getWeight, + "", + ""); + I_Method0(osg::Geometry *, getGeometry, + Properties::NON_VIRTUAL, + __osg_Geometry_P1__getGeometry, + "", + ""); + I_Method0(const osg::Geometry *, getGeometry, + Properties::NON_VIRTUAL, + __C5_osg_Geometry_P1__getGeometry, + "", + ""); + I_Method1(void, setGeometry, IN, osg::Geometry *, geom, + Properties::NON_VIRTUAL, + __void__setGeometry__osg_Geometry_P1, + "", + ""); + I_SimpleProperty(osg::Geometry *, Geometry, + __osg_Geometry_P1__getGeometry, + __void__setGeometry__osg_Geometry_P1); + I_SimpleProperty(float, Weight, + 0, + __void__setWeight__float); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::MorphGeometry::UpdateVertex) + I_DeclaringFile("osgAnimation/MorphGeometry"); + I_BaseType(osg::Drawable::UpdateCallback); + I_Constructor0(____UpdateVertex, + "", + ""); + I_Method2(void, update, IN, osg::NodeVisitor *, x, IN, osg::Drawable *, drw, + Properties::VIRTUAL, + __void__update__osg_NodeVisitor_P1__osg_Drawable_P1, + "do customized update code. ", + ""); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateMorph) + I_DeclaringFile("osgAnimation/MorphGeometry"); + I_BaseType(osgAnimation::AnimationUpdateCallback); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "", + ""); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "", + ""); + 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, + "", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "", + ""); + I_ConstructorWithDefaults1(IN, const std::string &, name, "", + Properties::NON_EXPLICIT, + ____UpdateMorph__C5_std_string_R1, + "", + ""); + I_Constructor2(IN, const osgAnimation::UpdateMorph &, apc, IN, const osg::CopyOp &, copyop, + ____UpdateMorph__C5_UpdateMorph_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(bool, needLink, + Properties::NON_VIRTUAL, + __bool__needLink, + "", + ""); + I_Method1(bool, link, IN, osgAnimation::Channel *, channel, + Properties::NON_VIRTUAL, + __bool__link__osgAnimation_Channel_P1, + "", + ""); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osgAnimation::MorphGeometry::MorphTarget >) + diff --git a/src/osgWrappers/osgAnimation/RigGeometry.cpp b/src/osgWrappers/osgAnimation/RigGeometry.cpp index a3e9ef201..478d098b8 100644 --- a/src/osgWrappers/osgAnimation/RigGeometry.cpp +++ b/src/osgWrappers/osgAnimation/RigGeometry.cpp @@ -12,9 +12,11 @@ #include #include +#include #include -#include +#include #include +#include #include #include @@ -32,11 +34,6 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry) I_Constructor0(____RigGeometry, "", ""); - I_Constructor1(IN, const osg::Geometry &, b, - Properties::NON_EXPLICIT, - ____RigGeometry__C5_osg_Geometry_R1, - "", - ""); I_ConstructorWithDefaults2(IN, const osgAnimation::RigGeometry &, b, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, ____RigGeometry__C5_RigGeometry_R1__C5_osg_CopyOp_R1, "", @@ -46,7 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -68,17 +65,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry) "Must be defined by derived classes. "); I_Method1(void, setInfluenceMap, IN, osgAnimation::VertexInfluenceMap *, vertexInfluenceMap, Properties::NON_VIRTUAL, - __void__setInfluenceMap__osgAnimation_VertexInfluenceMap_P1, + __void__setInfluenceMap__VertexInfluenceMap_P1, "", ""); I_Method0(const osgAnimation::VertexInfluenceMap *, getInfluenceMap, Properties::NON_VIRTUAL, - __C5_osgAnimation_VertexInfluenceMap_P1__getInfluenceMap, + __C5_VertexInfluenceMap_P1__getInfluenceMap, "", ""); I_Method0(osgAnimation::VertexInfluenceMap *, getInfluenceMap, Properties::NON_VIRTUAL, - __osgAnimation_VertexInfluenceMap_P1__getInfluenceMap, + __VertexInfluenceMap_P1__getInfluenceMap, "", ""); I_Method0(const osgAnimation::Skeleton *, getSkeleton, @@ -91,6 +88,11 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry) __Skeleton_P1__getSkeleton, "", ""); + I_Method1(void, setSkeleton, IN, osgAnimation::Skeleton *, x, + Properties::NON_VIRTUAL, + __void__setSkeleton__Skeleton_P1, + "", + ""); I_Method1(void, setNeedToComputeMatrix, IN, bool, state, Properties::NON_VIRTUAL, __void__setNeedToComputeMatrix__bool, @@ -101,14 +103,14 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry) __bool__getNeedToComputeMatrix, "", ""); - I_Method0(void, buildVertexSet, + I_Method0(void, buildVertexInfluenceSet, Properties::NON_VIRTUAL, - __void__buildVertexSet, + __void__buildVertexInfluenceSet, "", ""); - I_Method1(void, buildTransformer, IN, osgAnimation::Skeleton *, root, + I_Method0(const osgAnimation::VertexInfluenceSet &, getVertexInfluenceSet, Properties::NON_VIRTUAL, - __void__buildTransformer__Skeleton_P1, + __C5_VertexInfluenceSet_R1__getVertexInfluenceSet, "", ""); I_Method0(void, computeMatrixFromRootSkeleton, @@ -116,43 +118,79 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::RigGeometry) __void__computeMatrixFromRootSkeleton, "", ""); - I_Method0(void, transformSoftwareMethod, + I_Method1(void, setRigTransformImplementation, IN, osgAnimation::RigTransform *, x, + Properties::NON_VIRTUAL, + __void__setRigTransformImplementation__RigTransform_P1, + "", + ""); + I_Method0(osgAnimation::RigTransform *, getRigTransformImplementation, + Properties::NON_VIRTUAL, + __RigTransform_P1__getRigTransformImplementation, + "", + ""); + I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo, Properties::VIRTUAL, - __void__transformSoftwareMethod, + __void__drawImplementation__osg_RenderInfo_R1, + "Draw Geometry directly ignoring an OpenGL display list which could be attached. ", + "This is the internal draw method which does the drawing itself, and is the method to override when deriving from Geometry for user-drawn objects. "); + I_Method0(void, update, + Properties::NON_VIRTUAL, + __void__update, "", ""); - I_Method0(const osgAnimation::VertexInfluenceSet &, getVertexInfluenceSet, + I_Method0(const osg::Matrix &, getMatrixFromSkeletonToGeometry, Properties::NON_VIRTUAL, - __C5_osgAnimation_VertexInfluenceSet_R1__getVertexInfluenceSet, + __C5_osg_Matrix_R1__getMatrixFromSkeletonToGeometry, "", ""); - I_Method0(const std::vector< osg::Vec3 > &, getPositionSource, + I_Method0(const osg::Matrix &, getInvMatrixFromSkeletonToGeometry, Properties::NON_VIRTUAL, - __C5_std_vectorT1_osg_Vec3__R1__getPositionSource, + __C5_osg_Matrix_R1__getInvMatrixFromSkeletonToGeometry, "", ""); - I_Method0(const std::vector< osg::Vec3 > &, getNormalSource, + I_Method0(osg::Geometry *, getSourceGeometry, Properties::NON_VIRTUAL, - __C5_std_vectorT1_osg_Vec3__R1__getNormalSource, + __osg_Geometry_P1__getSourceGeometry, + "", + ""); + I_Method0(const osg::Geometry *, getSourceGeometry, + Properties::NON_VIRTUAL, + __C5_osg_Geometry_P1__getSourceGeometry, + "", + ""); + I_Method1(void, setSourceGeometry, IN, osg::Geometry *, geometry, + Properties::NON_VIRTUAL, + __void__setSourceGeometry__osg_Geometry_P1, + "", + ""); + I_Method1(void, copyFrom, IN, osg::Geometry &, from, + Properties::NON_VIRTUAL, + __void__copyFrom__osg_Geometry_R1, "", ""); I_SimpleProperty(osgAnimation::VertexInfluenceMap *, InfluenceMap, - __osgAnimation_VertexInfluenceMap_P1__getInfluenceMap, - __void__setInfluenceMap__osgAnimation_VertexInfluenceMap_P1); + __VertexInfluenceMap_P1__getInfluenceMap, + __void__setInfluenceMap__VertexInfluenceMap_P1); + I_SimpleProperty(const osg::Matrix &, InvMatrixFromSkeletonToGeometry, + __C5_osg_Matrix_R1__getInvMatrixFromSkeletonToGeometry, + 0); + I_SimpleProperty(const osg::Matrix &, MatrixFromSkeletonToGeometry, + __C5_osg_Matrix_R1__getMatrixFromSkeletonToGeometry, + 0); I_SimpleProperty(bool, NeedToComputeMatrix, __bool__getNeedToComputeMatrix, __void__setNeedToComputeMatrix__bool); - I_SimpleProperty(const std::vector< osg::Vec3 > &, NormalSource, - __C5_std_vectorT1_osg_Vec3__R1__getNormalSource, - 0); - I_SimpleProperty(const std::vector< osg::Vec3 > &, PositionSource, - __C5_std_vectorT1_osg_Vec3__R1__getPositionSource, - 0); + I_SimpleProperty(osgAnimation::RigTransform *, RigTransformImplementation, + __RigTransform_P1__getRigTransformImplementation, + __void__setRigTransformImplementation__RigTransform_P1); I_SimpleProperty(osgAnimation::Skeleton *, Skeleton, __Skeleton_P1__getSkeleton, - 0); + __void__setSkeleton__Skeleton_P1); + I_SimpleProperty(osg::Geometry *, SourceGeometry, + __osg_Geometry_P1__getSourceGeometry, + __void__setSourceGeometry__osg_Geometry_P1); I_SimpleProperty(const osgAnimation::VertexInfluenceSet &, VertexInfluenceSet, - __C5_osgAnimation_VertexInfluenceSet_R1__getVertexInfluenceSet, + __C5_VertexInfluenceSet_R1__getVertexInfluenceSet, 0); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/RigTransform.cpp b/src/osgWrappers/osgAnimation/RigTransform.cpp new file mode 100644 index 000000000..8dcd7bdd3 --- /dev/null +++ b/src/osgWrappers/osgAnimation/RigTransform.cpp @@ -0,0 +1,31 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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(osgAnimation::RigTransform) + I_DeclaringFile("osgAnimation/RigTransform"); + I_BaseType(osg::Referenced); + I_Constructor0(____RigTransform, + "", + ""); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/RigTransformHardware.cpp b/src/osgWrappers/osgAnimation/RigTransformHardware.cpp new file mode 100644 index 000000000..c64cc0f76 --- /dev/null +++ b/src/osgWrappers/osgAnimation/RigTransformHardware.cpp @@ -0,0 +1,237 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#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 + +TYPE_NAME_ALIAS(osg::Matrix, osgAnimation::RigTransformHardware::MatrixType) + +TYPE_NAME_ALIAS(osgAnimation::Bone, osgAnimation::RigTransformHardware::BoneType) + +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Vec4Array > >, osgAnimation::RigTransformHardware::BoneWeightAttribList) + +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgAnimation::RigTransformHardware::BoneType > >, osgAnimation::RigTransformHardware::BonePalette) + +TYPE_NAME_ALIAS(std::vector< osg::Matrix >, osgAnimation::RigTransformHardware::MatrixPalette) + +TYPE_NAME_ALIAS(std::vector< std::vector< osgAnimation::RigTransformHardware::IndexWeightEntry > >, osgAnimation::RigTransformHardware::VertexIndexWeightList) + +BEGIN_OBJECT_REFLECTOR(osgAnimation::RigTransformHardware) + I_DeclaringFile("osgAnimation/RigTransformHardware"); + I_BaseType(osgAnimation::RigTransform); + I_Constructor0(____RigTransformHardware, + "", + ""); + I_Method1(osg::Vec4Array *, getVertexAttrib, IN, int, index, + Properties::NON_VIRTUAL, + __osg_Vec4Array_P1__getVertexAttrib__int, + "", + ""); + I_Method0(int, getNumVertexAttrib, + Properties::NON_VIRTUAL, + __int__getNumVertexAttrib, + "", + ""); + I_Method0(osg::Uniform *, getMatrixPaletteUniform, + Properties::NON_VIRTUAL, + __osg_Uniform_P1__getMatrixPaletteUniform, + "", + ""); + I_Method2(void, computeMatrixPaletteUniform, IN, const osg::Matrix &, transformFromSkeletonToGeometry, IN, const osg::Matrix &, invTransformFromSkeletonToGeometry, + Properties::NON_VIRTUAL, + __void__computeMatrixPaletteUniform__C5_osg_Matrix_R1__C5_osg_Matrix_R1, + "", + ""); + I_Method0(int, getNumBonesPerVertex, + Properties::NON_VIRTUAL, + __int__getNumBonesPerVertex, + "", + ""); + I_Method0(int, getNumVertexes, + Properties::NON_VIRTUAL, + __int__getNumVertexes, + "", + ""); + I_Method3(bool, createPalette, IN, int, nbVertexes, IN, osgAnimation::BoneMap, boneMap, IN, const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap &, vertexIndexToBoneWeightMap, + Properties::NON_VIRTUAL, + __bool__createPalette__int__BoneMap__C5_VertexInfluenceSet_VertexIndexToBoneWeightMap_R1, + "", + ""); + I_Method1(void, setShader, IN, osg::Shader *, x, + Properties::NON_VIRTUAL, + __void__setShader__osg_Shader_P1, + "", + ""); + I_ProtectedMethod1(bool, init, IN, osgAnimation::RigGeometry &, x, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__init__RigGeometry_R1, + "", + ""); + I_ProtectedMethod0(osgAnimation::RigTransformHardware::BoneWeightAttribList, createVertexAttribList, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __BoneWeightAttribList__createVertexAttribList, + "", + ""); + I_ProtectedMethod0(osg::Uniform *, createVertexUniform, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Uniform_P1__createVertexUniform, + "", + ""); + I_SimpleProperty(osg::Uniform *, MatrixPaletteUniform, + __osg_Uniform_P1__getMatrixPaletteUniform, + 0); + I_SimpleProperty(osg::Shader *, Shader, + 0, + __void__setShader__osg_Shader_P1); + I_ArrayProperty(osg::Vec4Array *, VertexAttrib, + __osg_Vec4Array_P1__getVertexAttrib__int, + 0, + __int__getNumVertexAttrib, + 0, + 0, + 0); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::RigTransformHardware::IndexWeightEntry) + I_DeclaringFile("osgAnimation/RigTransformHardware"); + I_Constructor0(____IndexWeightEntry, + "", + ""); + I_Constructor2(IN, int, index, IN, float, weight, + ____IndexWeightEntry__int__float, + "", + ""); + I_Method0(int, getIndex, + Properties::NON_VIRTUAL, + __int__getIndex, + "", + ""); + I_Method0(float, getWeight, + Properties::NON_VIRTUAL, + __float__getWeight, + "", + ""); + I_SimpleProperty(int, Index, + __int__getIndex, + 0); + I_SimpleProperty(float, Weight, + __float__getWeight, + 0); + I_PublicMemberProperty(int, _boneIndex); + I_PublicMemberProperty(float, _boneWeight); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Vec4Array >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osg::Vec4Array *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osg::Vec4Array > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osg::Vec4Array *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osg::Vec4Array *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osg::Vec4Array > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osg::Vec4Array *, , + __T_P1__get, + 0); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::RigTransformHardware::BoneType >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osgAnimation::RigTransformHardware::BoneType *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osgAnimation::RigTransformHardware::BoneType > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osgAnimation::RigTransformHardware::BoneType *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osgAnimation::RigTransformHardware::BoneType *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osgAnimation::RigTransformHardware::BoneType > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osgAnimation::RigTransformHardware::BoneType *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::Vec4Array > >) + +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgAnimation::RigTransformHardware::BoneType > >) + +STD_VECTOR_REFLECTOR(std::vector< osgAnimation::RigTransformHardware::IndexWeightEntry >) + +STD_VECTOR_REFLECTOR(std::vector< std::vector< osgAnimation::RigTransformHardware::IndexWeightEntry > >) + diff --git a/src/osgWrappers/osgAnimation/RigTransformSoftware.cpp b/src/osgWrappers/osgAnimation/RigTransformSoftware.cpp new file mode 100644 index 000000000..0f6833570 --- /dev/null +++ b/src/osgWrappers/osgAnimation/RigTransformSoftware.cpp @@ -0,0 +1,128 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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 + +TYPE_NAME_ALIAS(std::vector< osgAnimation::RigTransformSoftware::BoneWeight >, osgAnimation::RigTransformSoftware::BoneWeightList) + +TYPE_NAME_ALIAS(std::vector< int >, osgAnimation::RigTransformSoftware::VertexList) + +BEGIN_OBJECT_REFLECTOR(osgAnimation::RigTransformSoftware) + I_DeclaringFile("osgAnimation/RigTransformSoftware"); + I_BaseType(osgAnimation::RigTransform); + I_Constructor0(____RigTransformSoftware, + "", + ""); + I_ProtectedMethod1(bool, init, IN, osgAnimation::RigGeometry &, x, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__init__RigGeometry_R1, + "", + ""); + I_ProtectedMethod2(void, initVertexSetFromBones, IN, const osgAnimation::BoneMap &, map, IN, const osgAnimation::VertexInfluenceSet::UniqVertexSetToBoneSetList &, influence, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__initVertexSetFromBones__C5_BoneMap_R1__C5_VertexInfluenceSet_UniqVertexSetToBoneSetList_R1, + "", + ""); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::RigTransformSoftware::BoneWeight) + I_DeclaringFile("osgAnimation/RigTransformSoftware"); + I_Constructor2(IN, osgAnimation::Bone *, bone, IN, float, weight, + ____BoneWeight__Bone_P1__float, + "", + ""); + I_Method0(const osgAnimation::Bone *, getBone, + Properties::NON_VIRTUAL, + __C5_Bone_P1__getBone, + "", + ""); + I_Method0(float, getWeight, + Properties::NON_VIRTUAL, + __float__getWeight, + "", + ""); + I_Method1(void, setWeight, IN, float, w, + Properties::NON_VIRTUAL, + __void__setWeight__float, + "", + ""); + I_SimpleProperty(const osgAnimation::Bone *, Bone, + __C5_Bone_P1__getBone, + 0); + I_SimpleProperty(float, Weight, + __float__getWeight, + __void__setWeight__float); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgAnimation::RigTransformSoftware::UniqBoneSetVertexSet) + I_DeclaringFile("osgAnimation/RigTransformSoftware"); + I_Constructor0(____UniqBoneSetVertexSet, + "", + ""); + I_Method0(osgAnimation::RigTransformSoftware::BoneWeightList &, getBones, + Properties::NON_VIRTUAL, + __BoneWeightList_R1__getBones, + "", + ""); + I_Method0(osgAnimation::RigTransformSoftware::VertexList &, getVertexes, + Properties::NON_VIRTUAL, + __VertexList_R1__getVertexes, + "", + ""); + I_Method0(void, resetMatrix, + Properties::NON_VIRTUAL, + __void__resetMatrix, + "", + ""); + I_Method3(void, accummulateMatrix, IN, const osg::Matrix &, invBindMatrix, IN, const osg::Matrix &, matrix, IN, osg::Matrix::value_type, weight, + Properties::NON_VIRTUAL, + __void__accummulateMatrix__C5_osg_Matrix_R1__C5_osg_Matrix_R1__osg_Matrix_value_type, + "", + ""); + I_Method0(void, computeMatrixForVertexSet, + Properties::NON_VIRTUAL, + __void__computeMatrixForVertexSet, + "", + ""); + I_Method0(const osg::Matrix &, getMatrix, + Properties::NON_VIRTUAL, + __C5_osg_Matrix_R1__getMatrix, + "", + ""); + I_SimpleProperty(osgAnimation::RigTransformSoftware::BoneWeightList &, Bones, + __BoneWeightList_R1__getBones, + 0); + I_SimpleProperty(const osg::Matrix &, Matrix, + __C5_osg_Matrix_R1__getMatrix, + 0); + I_SimpleProperty(osgAnimation::RigTransformSoftware::VertexList &, Vertexes, + __VertexList_R1__getVertexes, + 0); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< int >) + +STD_VECTOR_REFLECTOR(std::vector< osgAnimation::RigTransformSoftware::BoneWeight >) + diff --git a/src/osgWrappers/osgAnimation/Sampler.cpp b/src/osgWrappers/osgAnimation/Sampler.cpp index 50972c2c0..1c387cff3 100644 --- a/src/osgWrappers/osgAnimation/Sampler.cpp +++ b/src/osgWrappers/osgAnimation/Sampler.cpp @@ -43,6 +43,18 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Sampler) 0); END_REFLECTOR +TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >, osgAnimation::DoubleStepSampler) + +TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >, osgAnimation::FloatStepSampler) + +TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::Vec2StepInterpolator >, osgAnimation::Vec2StepSampler) + +TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::Vec3StepInterpolator >, osgAnimation::Vec3StepSampler) + +TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::Vec4StepInterpolator >, osgAnimation::Vec4StepSampler) + +TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::QuatStepInterpolator >, osgAnimation::QuatStepSampler) + TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::DoubleLinearInterpolator >, osgAnimation::DoubleLinearSampler) TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::FloatLinearInterpolator >, osgAnimation::FloatLinearSampler) @@ -55,6 +67,8 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::Vec4LinearInterpola TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::QuatSphericalLinearInterpolator >, osgAnimation::QuatSphericalLinearSampler) +TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::MatrixLinearInterpolator >, osgAnimation::MatrixLinearSampler) + TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::FloatCubicBezierInterpolator >, osgAnimation::FloatCubicBezierSampler) TYPE_NAME_ALIAS(osgAnimation::TemplateSampler< osgAnimation::DoubleCubicBezierInterpolator >, osgAnimation::DoubleCubicBezierSampler) @@ -195,6 +209,71 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleLinear 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >) + I_DeclaringFile("osgAnimation/Sampler"); + I_BaseType(osgAnimation::Sampler); + I_Constructor0(____TemplateSampler, + "", + ""); + I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::UsingType &, result, + Properties::NON_VIRTUAL, + __void__getValueAt__float__UsingType_R1, + "", + ""); + I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::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::DoubleStepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __C5_KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(osgAnimation::TemplateSampler< osgAnimation::DoubleStepInterpolator >::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::DoubleStepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + 0); + I_SimpleProperty(float, StartTime, + __float__getStartTime, + 0); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatCubicBezierInterpolator >) I_DeclaringFile("osgAnimation/Sampler"); I_BaseType(osgAnimation::Sampler); @@ -325,6 +404,136 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatLinearI 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >) + I_DeclaringFile("osgAnimation/Sampler"); + I_BaseType(osgAnimation::Sampler); + I_Constructor0(____TemplateSampler, + "", + ""); + I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::UsingType &, result, + Properties::NON_VIRTUAL, + __void__getValueAt__float__UsingType_R1, + "", + ""); + I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::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::FloatStepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __C5_KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(osgAnimation::TemplateSampler< osgAnimation::FloatStepInterpolator >::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::FloatStepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + 0); + I_SimpleProperty(float, StartTime, + __float__getStartTime, + 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); @@ -390,6 +599,71 @@ 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); @@ -520,6 +794,71 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec2LinearIn 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec2StepInterpolator >) + I_DeclaringFile("osgAnimation/Sampler"); + I_BaseType(osgAnimation::Sampler); + I_Constructor0(____TemplateSampler, + "", + ""); + I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::Vec2StepInterpolator >::UsingType &, result, + Properties::NON_VIRTUAL, + __void__getValueAt__float__UsingType_R1, + "", + ""); + I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::Vec2StepInterpolator >::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::Vec2StepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateSampler< osgAnimation::Vec2StepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __C5_KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(osgAnimation::TemplateSampler< osgAnimation::Vec2StepInterpolator >::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::Vec2StepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + 0); + I_SimpleProperty(float, StartTime, + __float__getStartTime, + 0); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec3CubicBezierInterpolator >) I_DeclaringFile("osgAnimation/Sampler"); I_BaseType(osgAnimation::Sampler); @@ -650,6 +989,71 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec3LinearIn 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec3StepInterpolator >) + I_DeclaringFile("osgAnimation/Sampler"); + I_BaseType(osgAnimation::Sampler); + I_Constructor0(____TemplateSampler, + "", + ""); + I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::Vec3StepInterpolator >::UsingType &, result, + Properties::NON_VIRTUAL, + __void__getValueAt__float__UsingType_R1, + "", + ""); + I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::Vec3StepInterpolator >::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::Vec3StepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateSampler< osgAnimation::Vec3StepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __C5_KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(osgAnimation::TemplateSampler< osgAnimation::Vec3StepInterpolator >::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::Vec3StepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + 0); + I_SimpleProperty(float, StartTime, + __float__getStartTime, + 0); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec4CubicBezierInterpolator >) I_DeclaringFile("osgAnimation/Sampler"); I_BaseType(osgAnimation::Sampler); @@ -780,3 +1184,68 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec4LinearIn 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSampler< osgAnimation::Vec4StepInterpolator >) + I_DeclaringFile("osgAnimation/Sampler"); + I_BaseType(osgAnimation::Sampler); + I_Constructor0(____TemplateSampler, + "", + ""); + I_Method2(void, getValueAt, IN, float, time, IN, osgAnimation::TemplateSampler< osgAnimation::Vec4StepInterpolator >::UsingType &, result, + Properties::NON_VIRTUAL, + __void__getValueAt__float__UsingType_R1, + "", + ""); + I_Method1(void, setKeyframeContainer, IN, osgAnimation::TemplateSampler< osgAnimation::Vec4StepInterpolator >::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::Vec4StepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(const osgAnimation::TemplateSampler< osgAnimation::Vec4StepInterpolator >::KeyframeContainerType *, getKeyframeContainerTyped, + Properties::NON_VIRTUAL, + __C5_KeyframeContainerType_P1__getKeyframeContainerTyped, + "", + ""); + I_Method0(osgAnimation::TemplateSampler< osgAnimation::Vec4StepInterpolator >::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::Vec4StepInterpolator >::KeyframeContainerType *, KeyframeContainerTyped, + __KeyframeContainerType_P1__getKeyframeContainerTyped, + 0); + I_SimpleProperty(float, StartTime, + __float__getStartTime, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/Skeleton.cpp b/src/osgWrappers/osgAnimation/Skeleton.cpp index 6eceaec70..f16622cd6 100644 --- a/src/osgWrappers/osgAnimation/Skeleton.cpp +++ b/src/osgWrappers/osgAnimation/Skeleton.cpp @@ -26,7 +26,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Skeleton) I_DeclaringFile("osgAnimation/Skeleton"); - I_BaseType(osgAnimation::Bone); + I_BaseType(osg::MatrixTransform); I_Method0(osg::Object *, cloneType, Properties::VIRTUAL, __osg_Object_P1__cloneType, @@ -57,23 +57,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Skeleton) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_ConstructorWithDefaults2(IN, const osgAnimation::Skeleton &, b, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____Skeleton__C5_Skeleton_R1__C5_osg_CopyOp_R1, - "", - ""); I_Constructor0(____Skeleton, "", ""); + I_Constructor2(IN, const osgAnimation::Skeleton &, x, IN, const osg::CopyOp &, x, + ____Skeleton__C5_Skeleton_R1__C5_osg_CopyOp_R1, + "", + ""); I_Method0(void, setDefaultUpdateCallback, Properties::NON_VIRTUAL, __void__setDefaultUpdateCallback, "", ""); - I_Method0(void, computeBindMatrix, - Properties::VIRTUAL, - __void__computeBindMatrix, - "", - ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::Skeleton::UpdateSkeleton) @@ -84,7 +79,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Skeleton::UpdateSkeleton) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -107,9 +102,14 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Skeleton::UpdateSkeleton) I_Constructor0(____UpdateSkeleton, "", ""); - I_ConstructorWithDefaults2(IN, const osgAnimation::Skeleton::UpdateSkeleton &, us, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____UpdateSkeleton__C5_UpdateSkeleton_R1__C5_osg_CopyOp_R1, - "", - ""); + I_Constructor2(IN, const osgAnimation::Skeleton::UpdateSkeleton &, x, IN, const osg::CopyOp &, x, + ____UpdateSkeleton__C5_UpdateSkeleton_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(bool, needToValidate, + Properties::NON_VIRTUAL, + __bool__needToValidate, + "", + ""); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/Skinning.cpp b/src/osgWrappers/osgAnimation/Skinning.cpp index 9f8088e7c..d855ec889 100644 --- a/src/osgWrappers/osgAnimation/Skinning.cpp +++ b/src/osgWrappers/osgAnimation/Skinning.cpp @@ -119,7 +119,5 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::TransformVertexFunctor::UniqBoneSetVertexSet 0); END_REFLECTOR -STD_VECTOR_REFLECTOR(std::vector< int >) - STD_VECTOR_REFLECTOR(std::vector< osgAnimation::TransformVertexFunctor::BoneWeight >) diff --git a/src/osgWrappers/osgAnimation/StackedMatrixElement.cpp b/src/osgWrappers/osgAnimation/StackedMatrixElement.cpp new file mode 100644 index 000000000..6c5701f37 --- /dev/null +++ b/src/osgWrappers/osgAnimation/StackedMatrixElement.cpp @@ -0,0 +1,126 @@ +// *************************************************************************** +// +// 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(osgAnimation::StackedMatrixElement) + I_DeclaringFile("osgAnimation/StackedMatrixElement"); + I_BaseType(osgAnimation::StackedTransformElement); + 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 &, copyop, + 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_Constructor0(____StackedMatrixElement, + "", + ""); + I_Constructor2(IN, const osgAnimation::StackedMatrixElement &, x, IN, const osg::CopyOp &, x, + ____StackedMatrixElement__C5_StackedMatrixElement_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Constructor2(IN, const std::string &, name, IN, const osg::Matrix &, matrix, + ____StackedMatrixElement__C5_std_string_R1__C5_osg_Matrix_R1, + "", + ""); + I_Constructor1(IN, const osg::Matrix &, matrix, + Properties::NON_EXPLICIT, + ____StackedMatrixElement__C5_osg_Matrix_R1, + "", + ""); + I_Method1(void, applyToMatrix, IN, osg::Matrix &, matrix, + Properties::VIRTUAL, + __void__applyToMatrix__osg_Matrix_R1, + "", + ""); + I_Method0(osg::Matrix, getAsMatrix, + Properties::VIRTUAL, + __osg_Matrix__getAsMatrix, + "", + ""); + I_Method0(const osg::Matrix &, getMatrix, + Properties::NON_VIRTUAL, + __C5_osg_Matrix_R1__getMatrix, + "", + ""); + I_Method1(void, setMatrix, IN, const osg::Matrix &, matrix, + Properties::NON_VIRTUAL, + __void__setMatrix__C5_osg_Matrix_R1, + "", + ""); + I_Method0(bool, isIdentity, + Properties::VIRTUAL, + __bool__isIdentity, + "", + ""); + I_Method0(void, update, + Properties::VIRTUAL, + __void__update, + "", + ""); + I_Method0(osgAnimation::Target *, getOrCreateTarget, + Properties::VIRTUAL, + __Target_P1__getOrCreateTarget, + "", + ""); + I_Method0(osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __Target_P1__getTarget, + "", + ""); + I_Method0(const osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __C5_Target_P1__getTarget, + "", + ""); + I_SimpleProperty(osg::Matrix, AsMatrix, + __osg_Matrix__getAsMatrix, + 0); + I_SimpleProperty(const osg::Matrix &, Matrix, + __C5_osg_Matrix_R1__getMatrix, + __void__setMatrix__C5_osg_Matrix_R1); + I_SimpleProperty(osgAnimation::Target *, Target, + __Target_P1__getTarget, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/StackedQuaternionElement.cpp b/src/osgWrappers/osgAnimation/StackedQuaternionElement.cpp new file mode 100644 index 000000000..6c752cf8e --- /dev/null +++ b/src/osgWrappers/osgAnimation/StackedQuaternionElement.cpp @@ -0,0 +1,127 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#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(osgAnimation::StackedQuaternionElement) + I_DeclaringFile("osgAnimation/StackedQuaternionElement"); + I_BaseType(osgAnimation::StackedTransformElement); + 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 &, copyop, + 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_Constructor0(____StackedQuaternionElement, + "", + ""); + I_Constructor2(IN, const osgAnimation::StackedQuaternionElement &, x, IN, const osg::CopyOp &, x, + ____StackedQuaternionElement__C5_StackedQuaternionElement_R1__C5_osg_CopyOp_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, const std::string &, x, , IN, const osg::Quat &, q, osg::Quat(0, 0, 0, 1), + ____StackedQuaternionElement__C5_std_string_R1__C5_osg_Quat_R1, + "", + ""); + I_Constructor1(IN, const osg::Quat &, x, + Properties::NON_EXPLICIT, + ____StackedQuaternionElement__C5_osg_Quat_R1, + "", + ""); + I_Method1(void, applyToMatrix, IN, osg::Matrix &, matrix, + Properties::VIRTUAL, + __void__applyToMatrix__osg_Matrix_R1, + "", + ""); + I_Method0(osg::Matrix, getAsMatrix, + Properties::VIRTUAL, + __osg_Matrix__getAsMatrix, + "", + ""); + I_Method0(bool, isIdentity, + Properties::VIRTUAL, + __bool__isIdentity, + "", + ""); + I_Method0(void, update, + Properties::VIRTUAL, + __void__update, + "", + ""); + I_Method0(const osg::Quat &, getQuaternion, + Properties::NON_VIRTUAL, + __C5_osg_Quat_R1__getQuaternion, + "", + ""); + I_Method1(void, setQuaternion, IN, const osg::Quat &, x, + Properties::NON_VIRTUAL, + __void__setQuaternion__C5_osg_Quat_R1, + "", + ""); + I_Method0(osgAnimation::Target *, getOrCreateTarget, + Properties::VIRTUAL, + __Target_P1__getOrCreateTarget, + "", + ""); + I_Method0(osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __Target_P1__getTarget, + "", + ""); + I_Method0(const osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __C5_Target_P1__getTarget, + "", + ""); + I_SimpleProperty(osg::Matrix, AsMatrix, + __osg_Matrix__getAsMatrix, + 0); + I_SimpleProperty(const osg::Quat &, Quaternion, + __C5_osg_Quat_R1__getQuaternion, + __void__setQuaternion__C5_osg_Quat_R1); + I_SimpleProperty(osgAnimation::Target *, Target, + __Target_P1__getTarget, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/StackedRotateAxisElement.cpp b/src/osgWrappers/osgAnimation/StackedRotateAxisElement.cpp new file mode 100644 index 000000000..99754d7fb --- /dev/null +++ b/src/osgWrappers/osgAnimation/StackedRotateAxisElement.cpp @@ -0,0 +1,139 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#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(osgAnimation::StackedRotateAxisElement) + I_DeclaringFile("osgAnimation/StackedRotateAxisElement"); + I_BaseType(osgAnimation::StackedTransformElement); + 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 &, copyop, + 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_Constructor0(____StackedRotateAxisElement, + "", + ""); + I_Constructor2(IN, const osgAnimation::StackedRotateAxisElement &, x, IN, const osg::CopyOp &, x, + ____StackedRotateAxisElement__C5_StackedRotateAxisElement_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Constructor3(IN, const std::string &, name, IN, const osg::Vec3 &, axis, IN, double, angle, + ____StackedRotateAxisElement__C5_std_string_R1__C5_osg_Vec3_R1__double, + "", + ""); + I_Constructor2(IN, const osg::Vec3 &, axis, IN, double, angle, + ____StackedRotateAxisElement__C5_osg_Vec3_R1__double, + "", + ""); + I_Method1(void, applyToMatrix, IN, osg::Matrix &, matrix, + Properties::VIRTUAL, + __void__applyToMatrix__osg_Matrix_R1, + "", + ""); + I_Method0(osg::Matrix, getAsMatrix, + Properties::VIRTUAL, + __osg_Matrix__getAsMatrix, + "", + ""); + I_Method0(bool, isIdentity, + Properties::VIRTUAL, + __bool__isIdentity, + "", + ""); + I_Method0(void, update, + Properties::VIRTUAL, + __void__update, + "", + ""); + I_Method0(const osg::Vec3 &, getAxis, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getAxis, + "", + ""); + I_Method0(const double, getAngle, + Properties::NON_VIRTUAL, + __C5_double__getAngle, + "", + ""); + I_Method1(void, setAxis, IN, const osg::Vec3 &, x, + Properties::NON_VIRTUAL, + __void__setAxis__C5_osg_Vec3_R1, + "", + ""); + I_Method1(void, setAngle, IN, const double &, x, + Properties::NON_VIRTUAL, + __void__setAngle__C5_double_R1, + "", + ""); + I_Method0(osgAnimation::Target *, getOrCreateTarget, + Properties::VIRTUAL, + __Target_P1__getOrCreateTarget, + "", + ""); + I_Method0(osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __Target_P1__getTarget, + "", + ""); + I_Method0(const osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __C5_Target_P1__getTarget, + "", + ""); + I_SimpleProperty(const double &, Angle, + 0, + __void__setAngle__C5_double_R1); + I_SimpleProperty(osg::Matrix, AsMatrix, + __osg_Matrix__getAsMatrix, + 0); + I_SimpleProperty(const osg::Vec3 &, Axis, + __C5_osg_Vec3_R1__getAxis, + __void__setAxis__C5_osg_Vec3_R1); + I_SimpleProperty(osgAnimation::Target *, Target, + __Target_P1__getTarget, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/StackedScaleElement.cpp b/src/osgWrappers/osgAnimation/StackedScaleElement.cpp new file mode 100644 index 000000000..4e4e5ea2a --- /dev/null +++ b/src/osgWrappers/osgAnimation/StackedScaleElement.cpp @@ -0,0 +1,127 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#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(osgAnimation::StackedScaleElement) + I_DeclaringFile("osgAnimation/StackedScaleElement"); + I_BaseType(osgAnimation::StackedTransformElement); + 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 &, copyop, + 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_Constructor0(____StackedScaleElement, + "", + ""); + I_Constructor2(IN, const osgAnimation::StackedScaleElement &, x, IN, const osg::CopyOp &, x, + ____StackedScaleElement__C5_StackedScaleElement_R1__C5_osg_CopyOp_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, const std::string &, name, , IN, const osg::Vec3 &, scale, osg::Vec3(1, 1, 1), + ____StackedScaleElement__C5_std_string_R1__C5_osg_Vec3_R1, + "", + ""); + I_Constructor1(IN, const osg::Vec3 &, scale, + Properties::NON_EXPLICIT, + ____StackedScaleElement__C5_osg_Vec3_R1, + "", + ""); + I_Method1(void, applyToMatrix, IN, osg::Matrix &, matrix, + Properties::VIRTUAL, + __void__applyToMatrix__osg_Matrix_R1, + "", + ""); + I_Method0(osg::Matrix, getAsMatrix, + Properties::VIRTUAL, + __osg_Matrix__getAsMatrix, + "", + ""); + I_Method0(bool, isIdentity, + Properties::VIRTUAL, + __bool__isIdentity, + "", + ""); + I_Method0(void, update, + Properties::VIRTUAL, + __void__update, + "", + ""); + I_Method0(const osg::Vec3 &, getScale, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getScale, + "", + ""); + I_Method1(void, setScale, IN, const osg::Vec3 &, scale, + Properties::NON_VIRTUAL, + __void__setScale__C5_osg_Vec3_R1, + "", + ""); + I_Method0(osgAnimation::Target *, getOrCreateTarget, + Properties::VIRTUAL, + __Target_P1__getOrCreateTarget, + "", + ""); + I_Method0(osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __Target_P1__getTarget, + "", + ""); + I_Method0(const osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __C5_Target_P1__getTarget, + "", + ""); + I_SimpleProperty(osg::Matrix, AsMatrix, + __osg_Matrix__getAsMatrix, + 0); + I_SimpleProperty(const osg::Vec3 &, Scale, + __C5_osg_Vec3_R1__getScale, + __void__setScale__C5_osg_Vec3_R1); + I_SimpleProperty(osgAnimation::Target *, Target, + __Target_P1__getTarget, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/StackedTransform.cpp b/src/osgWrappers/osgAnimation/StackedTransform.cpp new file mode 100644 index 000000000..8fa99be1e --- /dev/null +++ b/src/osgWrappers/osgAnimation/StackedTransform.cpp @@ -0,0 +1,49 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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(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/osgAnimation/StackedTransformElement.cpp b/src/osgWrappers/osgAnimation/StackedTransformElement.cpp new file mode 100644 index 000000000..7e5485559 --- /dev/null +++ b/src/osgWrappers/osgAnimation/StackedTransformElement.cpp @@ -0,0 +1,78 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::StackedTransformElement) + I_DeclaringFile("osgAnimation/StackedTransformElement"); + I_BaseType(osg::Object); + I_Constructor0(____StackedTransformElement, + "", + ""); + I_Constructor2(IN, const osgAnimation::StackedTransformElement &, rhs, IN, const osg::CopyOp &, c, + ____StackedTransformElement__C5_StackedTransformElement_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method1(void, applyToMatrix, IN, osg::Matrix &, matrix, + Properties::PURE_VIRTUAL, + __void__applyToMatrix__osg_Matrix_R1, + "", + ""); + I_Method0(osg::Matrix, getAsMatrix, + Properties::PURE_VIRTUAL, + __osg_Matrix__getAsMatrix, + "", + ""); + I_Method0(bool, isIdentity, + Properties::PURE_VIRTUAL, + __bool__isIdentity, + "", + ""); + I_Method0(void, update, + Properties::PURE_VIRTUAL, + __void__update, + "", + ""); + I_Method0(osgAnimation::Target *, getOrCreateTarget, + Properties::VIRTUAL, + __Target_P1__getOrCreateTarget, + "", + ""); + I_Method0(osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __Target_P1__getTarget, + "", + ""); + I_Method0(const osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __C5_Target_P1__getTarget, + "", + ""); + I_SimpleProperty(osg::Matrix, AsMatrix, + __osg_Matrix__getAsMatrix, + 0); + I_SimpleProperty(osgAnimation::Target *, Target, + __Target_P1__getTarget, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/StackedTranslateElement.cpp b/src/osgWrappers/osgAnimation/StackedTranslateElement.cpp new file mode 100644 index 000000000..40caa223b --- /dev/null +++ b/src/osgWrappers/osgAnimation/StackedTranslateElement.cpp @@ -0,0 +1,127 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#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(osgAnimation::StackedTranslateElement) + I_DeclaringFile("osgAnimation/StackedTranslateElement"); + I_BaseType(osgAnimation::StackedTransformElement); + 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 &, copyop, + 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_Constructor0(____StackedTranslateElement, + "", + ""); + I_Constructor2(IN, const osgAnimation::StackedTranslateElement &, x, IN, const osg::CopyOp &, x, + ____StackedTranslateElement__C5_StackedTranslateElement_R1__C5_osg_CopyOp_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, const std::string &, x, , IN, const osg::Vec3 &, translate, osg::Vec3(0, 0, 0), + ____StackedTranslateElement__C5_std_string_R1__C5_osg_Vec3_R1, + "", + ""); + I_Constructor1(IN, const osg::Vec3 &, translate, + Properties::NON_EXPLICIT, + ____StackedTranslateElement__C5_osg_Vec3_R1, + "", + ""); + I_Method1(void, applyToMatrix, IN, osg::Matrix &, matrix, + Properties::VIRTUAL, + __void__applyToMatrix__osg_Matrix_R1, + "", + ""); + I_Method0(osg::Matrix, getAsMatrix, + Properties::VIRTUAL, + __osg_Matrix__getAsMatrix, + "", + ""); + I_Method0(bool, isIdentity, + Properties::VIRTUAL, + __bool__isIdentity, + "", + ""); + I_Method0(void, update, + Properties::VIRTUAL, + __void__update, + "", + ""); + I_Method0(const osg::Vec3 &, getTranslate, + Properties::NON_VIRTUAL, + __C5_osg_Vec3_R1__getTranslate, + "", + ""); + I_Method1(void, setTranslate, IN, const osg::Vec3 &, x, + Properties::NON_VIRTUAL, + __void__setTranslate__C5_osg_Vec3_R1, + "", + ""); + I_Method0(osgAnimation::Target *, getOrCreateTarget, + Properties::VIRTUAL, + __Target_P1__getOrCreateTarget, + "", + ""); + I_Method0(osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __Target_P1__getTarget, + "", + ""); + I_Method0(const osgAnimation::Target *, getTarget, + Properties::VIRTUAL, + __C5_Target_P1__getTarget, + "", + ""); + I_SimpleProperty(osg::Matrix, AsMatrix, + __osg_Matrix__getAsMatrix, + 0); + I_SimpleProperty(osgAnimation::Target *, Target, + __Target_P1__getTarget, + 0); + I_SimpleProperty(const osg::Vec3 &, Translate, + __C5_osg_Vec3_R1__getTranslate, + __void__setTranslate__C5_osg_Vec3_R1); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/StatsHandler.cpp b/src/osgWrappers/osgAnimation/StatsHandler.cpp new file mode 100644 index 000000000..f05b5dc51 --- /dev/null +++ b/src/osgWrappers/osgAnimation/StatsHandler.cpp @@ -0,0 +1,145 @@ +// *************************************************************************** +// +// 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_ENUM_REFLECTOR(osgAnimation::StatsHandler::StatsType) + I_DeclaringFile("osgAnimation/StatsHandler"); + I_EnumLabel(osgAnimation::StatsHandler::NO_STATS); + I_EnumLabel(osgAnimation::StatsHandler::FRAME_RATE); + I_EnumLabel(osgAnimation::StatsHandler::LAST); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::StatsHandler) + I_DeclaringFile("osgAnimation/StatsHandler"); + I_BaseType(osgGA::GUIEventHandler); + I_Constructor0(____StatsHandler, + "", + ""); + I_Method1(void, setKeyEventTogglesOnScreenStats, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventTogglesOnScreenStats__int, + "", + ""); + I_Method0(int, getKeyEventTogglesOnScreenStats, + Properties::NON_VIRTUAL, + __int__getKeyEventTogglesOnScreenStats, + "", + ""); + I_Method1(void, setKeyEventPrintsOutStats, IN, int, key, + Properties::NON_VIRTUAL, + __void__setKeyEventPrintsOutStats__int, + "", + ""); + I_Method0(int, getKeyEventPrintsOutStats, + Properties::NON_VIRTUAL, + __int__getKeyEventPrintsOutStats, + "", + ""); + I_Method0(double, getBlockMultiplier, + Properties::NON_VIRTUAL, + __double__getBlockMultiplier, + "", + ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method0(osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __osg_Camera_P1__getCamera, + "", + ""); + I_Method0(const osg::Camera *, getCamera, + Properties::NON_VIRTUAL, + __C5_osg_Camera_P1__getCamera, + "", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + Properties::VIRTUAL, + __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + "Deprecated, Handle events, return true if handled, false otherwise. ", + ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_ProtectedMethod1(void, setUpHUDCamera, IN, osgViewer::ViewerBase *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpHUDCamera__osgViewer_ViewerBase_P1, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createBackgroundRectangle, IN, const osg::Vec3 &, pos, IN, const float, width, IN, const float, height, IN, osg::Vec4 &, color, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createBackgroundRectangle__C5_osg_Vec3_R1__C5_float__C5_float__osg_Vec4_R1, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createGeometry, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numBlocks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createGeometry__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createFrameMarkers, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numBlocks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createFrameMarkers__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod4(osg::Geometry *, createTick, IN, const osg::Vec3 &, pos, IN, float, height, IN, const osg::Vec4 &, colour, IN, unsigned int, numTicks, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Geometry_P1__createTick__C5_osg_Vec3_R1__float__C5_osg_Vec4_R1__unsigned_int, + "", + ""); + I_ProtectedMethod7(osg::Node *, createCameraTimeStats, IN, const std::string &, font, IN, osg::Vec3 &, pos, IN, float, startBlocks, IN, bool, acquireGPUStats, IN, float, characterSize, IN, osg::Stats *, viewerStats, IN, osg::Camera *, camera, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __osg_Node_P1__createCameraTimeStats__C5_std_string_R1__osg_Vec3_R1__float__bool__float__osg_Stats_P1__osg_Camera_P1, + "", + ""); + I_ProtectedMethod1(void, setUpScene, IN, osgViewer::Viewer *, viewer, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__setUpScene__osgViewer_Viewer_P1, + "", + ""); + I_SimpleProperty(double, BlockMultiplier, + __double__getBlockMultiplier, + 0); + I_SimpleProperty(osg::Camera *, Camera, + __osg_Camera_P1__getCamera, + 0); + I_SimpleProperty(int, KeyEventPrintsOutStats, + __int__getKeyEventPrintsOutStats, + __void__setKeyEventPrintsOutStats__int); + I_SimpleProperty(int, KeyEventTogglesOnScreenStats, + __int__getKeyEventTogglesOnScreenStats, + __void__setKeyEventTogglesOnScreenStats__int); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/StatsVisitor.cpp b/src/osgWrappers/osgAnimation/StatsVisitor.cpp new file mode 100644 index 000000000..3ee1afc92 --- /dev/null +++ b/src/osgWrappers/osgAnimation/StatsVisitor.cpp @@ -0,0 +1,110 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#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(osgAnimation::StatsActionVisitor) + I_DeclaringFile("osgAnimation/StatsVisitor"); + I_BaseType(osgAnimation::UpdateActionVisitor); + I_Method2(, META_ActionVisitor, IN, osgAnimation, x, IN, osgAnimation::StatsActionVisitor, x, + Properties::NON_VIRTUAL, + ____META_ActionVisitor__osgAnimation__StatsActionVisitor, + "", + ""); + I_Constructor0(____StatsActionVisitor, + "", + ""); + I_Constructor2(IN, osg::Stats *, stats, IN, unsigned int, frame, + ____StatsActionVisitor__osg_Stats_P1__unsigned_int, + "", + ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method0(const std::vector< std::string > &, getChannels, + Properties::NON_VIRTUAL, + __C5_std_vectorT1_std_string__R1__getChannels, + "", + ""); + I_Method0(osg::Stats *, getStats, + Properties::NON_VIRTUAL, + __osg_Stats_P1__getStats, + "", + ""); + I_Method1(void, setStats, IN, osg::Stats *, stats, + Properties::NON_VIRTUAL, + __void__setStats__osg_Stats_P1, + "", + ""); + I_Method1(void, setFrame, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __void__setFrame__unsigned_int, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Timeline &, action, + Properties::VIRTUAL, + __void__apply__Timeline_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::Action &, action, + Properties::VIRTUAL, + __void__apply__Action_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionBlendIn &, action, + Properties::VIRTUAL, + __void__apply__ActionBlendIn_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionBlendOut &, action, + Properties::VIRTUAL, + __void__apply__ActionBlendOut_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionAnimation &, action, + Properties::VIRTUAL, + __void__apply__ActionAnimation_R1, + "", + ""); + I_Method1(void, apply, IN, osgAnimation::ActionStripAnimation &, action, + Properties::VIRTUAL, + __void__apply__ActionStripAnimation_R1, + "", + ""); + I_SimpleProperty(const std::vector< std::string > &, Channels, + __C5_std_vectorT1_std_string__R1__getChannels, + 0); + I_SimpleProperty(unsigned int, Frame, + 0, + __void__setFrame__unsigned_int); + I_SimpleProperty(osg::Stats *, Stats, + __osg_Stats_P1__getStats, + __void__setStats__osg_Stats_P1); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/Target.cpp b/src/osgWrappers/osgAnimation/Target.cpp index c0e98c39e..480ca71fc 100644 --- a/src/osgWrappers/osgAnimation/Target.cpp +++ b/src/osgWrappers/osgAnimation/Target.cpp @@ -10,6 +10,11 @@ #include #include +#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -20,22 +25,12 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Target) +BEGIN_OBJECT_REFLECTOR(osgAnimation::Target) I_DeclaringFile("osgAnimation/Target"); I_BaseType(osg::Referenced); I_Constructor0(____Target, "", ""); - I_Method0(void, normalize, - Properties::PURE_VIRTUAL, - __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); @@ -60,6 +54,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Target) 0); END_REFLECTOR +TYPE_NAME_ALIAS(osgAnimation::TemplateTarget< osg::Matrixf >, osgAnimation::MatrixTarget) + TYPE_NAME_ALIAS(osgAnimation::TemplateTarget< osg::Quat >, osgAnimation::QuatTarget) TYPE_NAME_ALIAS(osgAnimation::TemplateTarget< osg::Vec3 >, osgAnimation::Vec3Target) @@ -78,32 +74,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< double >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const T &, v, + I_Constructor1(IN, const double &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const T &, val, + I_Constructor1(IN, const osgAnimation::TemplateTarget< double > &, v, + Properties::NON_EXPLICIT, + ____TemplateTarget__C5_TemplateTarget_R1, + "", + ""); + I_Method3(void, lerp, IN, float, t, IN, const double &, a, IN, const double &, b, Properties::NON_VIRTUAL, - __void__update__float__C5_T_R1, + __void__lerp__float__C5_T_R1__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method3(void, update, IN, float, weight, IN, const double &, 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 double &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_Method0(void, normalize, - Properties::VIRTUAL, - __void__normalize, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const double &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const double &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -114,32 +115,78 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< float >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const T &, v, + I_Constructor1(IN, const float &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const T &, val, + I_Constructor1(IN, const osgAnimation::TemplateTarget< float > &, v, + Properties::NON_EXPLICIT, + ____TemplateTarget__C5_TemplateTarget_R1, + "", + ""); + I_Method3(void, lerp, IN, float, t, IN, const float &, a, IN, const float &, b, Properties::NON_VIRTUAL, - __void__update__float__C5_T_R1, + __void__lerp__float__C5_T_R1__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method3(void, update, IN, float, weight, IN, const float &, 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 float &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_Method0(void, normalize, - Properties::VIRTUAL, - __void__normalize, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const float &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const float &, Value, + __C5_T_R1__getValue, + __void__setValue__C5_T_R1); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Matrixf >) + I_DeclaringFile("osgAnimation/Target"); + I_BaseType(osgAnimation::Target); + I_Constructor0(____TemplateTarget, + "", + ""); + I_Constructor1(IN, const osg::Matrixf &, 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 osg::Matrixf &, a, IN, const osg::Matrixf &, b, + Properties::NON_VIRTUAL, + __void__lerp__float__C5_T_R1__C5_T_R1, + "", + ""); + I_Method3(void, update, IN, float, weight, IN, const osg::Matrixf &, 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 osg::Matrixf &, getValue, + Properties::NON_VIRTUAL, + __C5_T_R1__getValue, + "", + ""); + I_Method1(void, setValue, IN, const osg::Matrixf &, value, + Properties::NON_VIRTUAL, + __void__setValue__C5_T_R1, + "", + ""); + I_SimpleProperty(const osg::Matrixf &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -150,32 +197,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Quat >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const T &, v, + I_Constructor1(IN, const osg::Quat &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const T &, val, + I_Constructor1(IN, const osgAnimation::TemplateTarget< osg::Quat > &, v, + Properties::NON_EXPLICIT, + ____TemplateTarget__C5_TemplateTarget_R1, + "", + ""); + I_Method3(void, lerp, IN, float, t, IN, const osg::Quat &, a, IN, const osg::Quat &, b, Properties::NON_VIRTUAL, - __void__update__float__C5_T_R1, + __void__lerp__float__C5_T_R1__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method3(void, update, IN, float, weight, IN, const osg::Quat &, 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 osg::Quat &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_Method0(void, normalize, - Properties::VIRTUAL, - __void__normalize, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Quat &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Quat &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -186,32 +238,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec2 >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const T &, v, + I_Constructor1(IN, const osg::Vec2 &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const T &, val, + I_Constructor1(IN, const osgAnimation::TemplateTarget< osg::Vec2 > &, v, + Properties::NON_EXPLICIT, + ____TemplateTarget__C5_TemplateTarget_R1, + "", + ""); + I_Method3(void, lerp, IN, float, t, IN, const osg::Vec2 &, a, IN, const osg::Vec2 &, b, Properties::NON_VIRTUAL, - __void__update__float__C5_T_R1, + __void__lerp__float__C5_T_R1__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method3(void, update, IN, float, weight, IN, const osg::Vec2 &, 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 osg::Vec2 &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_Method0(void, normalize, - Properties::VIRTUAL, - __void__normalize, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Vec2 &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Vec2 &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -222,32 +279,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec3 >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const T &, v, + I_Constructor1(IN, const osg::Vec3 &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const T &, val, + I_Constructor1(IN, const osgAnimation::TemplateTarget< osg::Vec3 > &, v, + Properties::NON_EXPLICIT, + ____TemplateTarget__C5_TemplateTarget_R1, + "", + ""); + I_Method3(void, lerp, IN, float, t, IN, const osg::Vec3 &, a, IN, const osg::Vec3 &, b, Properties::NON_VIRTUAL, - __void__update__float__C5_T_R1, + __void__lerp__float__C5_T_R1__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method3(void, update, IN, float, weight, IN, const osg::Vec3 &, 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 osg::Vec3 &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_Method0(void, normalize, - Properties::VIRTUAL, - __void__normalize, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Vec3 &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Vec3 &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -258,32 +320,37 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec4 >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const T &, v, + I_Constructor1(IN, const osg::Vec4 &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const T &, val, + I_Constructor1(IN, const osgAnimation::TemplateTarget< osg::Vec4 > &, v, + Properties::NON_EXPLICIT, + ____TemplateTarget__C5_TemplateTarget_R1, + "", + ""); + I_Method3(void, lerp, IN, float, t, IN, const osg::Vec4 &, a, IN, const osg::Vec4 &, b, Properties::NON_VIRTUAL, - __void__update__float__C5_T_R1, + __void__lerp__float__C5_T_R1__C5_T_R1, "", ""); - I_Method0(const T &, getValue, + I_Method3(void, update, IN, float, weight, IN, const osg::Vec4 &, 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 osg::Vec4 &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_Method0(void, normalize, - Properties::VIRTUAL, - __void__normalize, - "", - ""); - I_Method1(void, setValue, IN, const T &, value, + I_Method1(void, setValue, IN, const osg::Vec4 &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const T &, Value, + I_SimpleProperty(const osg::Vec4 &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/Timeline.cpp b/src/osgWrappers/osgAnimation/Timeline.cpp index 5f5e347e9..79648c654 100644 --- a/src/osgWrappers/osgAnimation/Timeline.cpp +++ b/src/osgWrappers/osgAnimation/Timeline.cpp @@ -11,9 +11,11 @@ #include #include -#include -#include -#include +#include +#include +#include +#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -24,330 +26,19 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::map< unsigned int COMMA osg::ref_ptr< osgAnimation::Action::Callback > >, osgAnimation::Action::FrameCallback) +TYPE_NAME_ALIAS(std::vector< osgAnimation::FrameAction >, osgAnimation::Timeline::ActionList) -BEGIN_OBJECT_REFLECTOR(osgAnimation::Action) +TYPE_NAME_ALIAS(std::map< int COMMA osgAnimation::Timeline::ActionList >, osgAnimation::Timeline::ActionLayers) + +BEGIN_ENUM_REFLECTOR(osgAnimation::Timeline::TimelineStatus) I_DeclaringFile("osgAnimation/Timeline"); - I_BaseType(osg::Object); - 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_Constructor0(____Action, - "", - ""); - I_Constructor2(IN, const osgAnimation::Action &, x, IN, const osg::CopyOp &, x, - ____Action__C5_Action_R1__C5_osg_CopyOp_R1, - "", - ""); - I_Method2(void, setCallback, IN, double, when, IN, osgAnimation::Action::Callback *, callback, - Properties::NON_VIRTUAL, - __void__setCallback__double__Callback_P1, - "", - ""); - I_Method2(void, setCallback, IN, unsigned int, frame, IN, osgAnimation::Action::Callback *, callback, - Properties::NON_VIRTUAL, - __void__setCallback__unsigned_int__Callback_P1, - "", - ""); - I_Method1(osgAnimation::Action::Callback *, getCallback, IN, unsigned int, frame, - Properties::NON_VIRTUAL, - __Callback_P1__getCallback__unsigned_int, - "", - ""); - I_Method1(void, setNumFrames, IN, unsigned int, numFrames, - Properties::NON_VIRTUAL, - __void__setNumFrames__unsigned_int, - "", - ""); - I_Method1(void, setDuration, IN, double, duration, - Properties::NON_VIRTUAL, - __void__setDuration__double, - "", - ""); - I_Method0(unsigned int, getNumFrames, - Properties::NON_VIRTUAL, - __unsigned_int__getNumFrames, - "", - ""); - I_Method0(double, getDuration, - Properties::NON_VIRTUAL, - __double__getDuration, - "", - ""); - I_Method1(void, setLoop, IN, int, nb, - Properties::VIRTUAL, - __void__setLoop__int, - "", - ""); - I_Method0(unsigned int, getLoop, - Properties::VIRTUAL, - __unsigned_int__getLoop, - "", - ""); - I_Method3(bool, evaluateFrame, IN, unsigned int, frame, IN, unsigned int &, resultframe, IN, unsigned int &, nbloop, - Properties::NON_VIRTUAL, - __bool__evaluateFrame__unsigned_int__unsigned_int_R1__unsigned_int_R1, - "", - ""); - I_Method1(void, evaluate, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluate__unsigned_int, - "", - ""); - I_Method1(void, evaluateCallback, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluateCallback__unsigned_int, - "", - ""); - I_IndexedProperty(osgAnimation::Action::Callback *, Callback, - __Callback_P1__getCallback__unsigned_int, - __void__setCallback__unsigned_int__Callback_P1, - 0); - I_SimpleProperty(double, Duration, - __double__getDuration, - __void__setDuration__double); - I_SimpleProperty(int, Loop, - 0, - __void__setLoop__int); - I_SimpleProperty(unsigned int, NumFrames, - 0, - __void__setNumFrames__unsigned_int); + I_EnumLabel(osgAnimation::Timeline::Play); + I_EnumLabel(osgAnimation::Timeline::Stop); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::Action::Callback) - I_DeclaringFile("osgAnimation/Timeline"); - I_BaseType(osg::Object); - I_Constructor0(____Callback, - "", - ""); - I_Constructor2(IN, const osgAnimation::Action::Callback &, x, IN, const osg::CopyOp &, x, - ____Callback__C5_Callback_R1__C5_osg_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_Method1(void, addNestedCallback, IN, osgAnimation::Action::Callback *, callback, - Properties::NON_VIRTUAL, - __void__addNestedCallback__Callback_P1, - "", - ""); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgAnimation::ActionAnimation) +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::Timeline) I_DeclaringFile("osgAnimation/Timeline"); I_BaseType(osgAnimation::Action); - I_Constructor1(IN, osgAnimation::Animation *, animation, - Properties::NON_EXPLICIT, - ____ActionAnimation__Animation_P1, - "", - ""); - I_Method1(void, evaluate, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluate__unsigned_int, - "", - ""); - I_Method0(osgAnimation::Animation *, getAnimation, - Properties::NON_VIRTUAL, - __Animation_P1__getAnimation, - "", - ""); - I_SimpleProperty(osgAnimation::Animation *, Animation, - __Animation_P1__getAnimation, - 0); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgAnimation::BlendIn) - I_DeclaringFile("osgAnimation/Timeline"); - I_BaseType(osgAnimation::Action); - I_Constructor3(IN, osgAnimation::Animation *, animation, IN, double, duration, IN, double, weight, - ____BlendIn__Animation_P1__double__double, - "", - ""); - I_Method0(double, getWeight, - Properties::NON_VIRTUAL, - __double__getWeight, - "", - ""); - I_Method1(void, evaluate, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluate__unsigned_int, - "", - ""); - I_SimpleProperty(double, Weight, - __double__getWeight, - 0); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgAnimation::BlendOut) - I_DeclaringFile("osgAnimation/Timeline"); - I_BaseType(osgAnimation::Action); - I_Constructor2(IN, osgAnimation::Animation *, animation, IN, double, duration, - ____BlendOut__Animation_P1__double, - "", - ""); - I_Method0(double, getWeight, - Properties::NON_VIRTUAL, - __double__getWeight, - "", - ""); - I_Method1(void, evaluate, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluate__unsigned_int, - "", - ""); - I_SimpleProperty(double, Weight, - __double__getWeight, - 0); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgAnimation::RunAction) - I_DeclaringFile("osgAnimation/Timeline"); - I_BaseType(osgAnimation::Action::Callback); - I_Constructor2(IN, osgAnimation::Timeline *, tm, IN, osgAnimation::Action *, a, - ____RunAction__Timeline_P1__Action_P1, - "", - ""); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgAnimation::StripAnimation) - I_DeclaringFile("osgAnimation/Timeline"); - I_BaseType(osgAnimation::Action); - I_ConstructorWithDefaults4(IN, osgAnimation::Animation *, animation, , IN, double, blendInDuration, , IN, double, blendOutDuration, , IN, double, blendInWeightTarget, 1.0, - ____StripAnimation__Animation_P1__double__double__double, - "", - ""); - I_Method0(osgAnimation::ActionAnimation *, getActionAnimation, - Properties::NON_VIRTUAL, - __ActionAnimation_P1__getActionAnimation, - "", - ""); - I_Method0(osgAnimation::BlendIn *, getBlendIn, - Properties::NON_VIRTUAL, - __BlendIn_P1__getBlendIn, - "", - ""); - I_Method0(osgAnimation::BlendOut *, getBlendOut, - Properties::NON_VIRTUAL, - __BlendOut_P1__getBlendOut, - "", - ""); - I_Method0(const osgAnimation::ActionAnimation *, getActionAnimation, - Properties::NON_VIRTUAL, - __C5_ActionAnimation_P1__getActionAnimation, - "", - ""); - I_Method0(const osgAnimation::BlendIn *, getBlendIn, - Properties::NON_VIRTUAL, - __C5_BlendIn_P1__getBlendIn, - "", - ""); - I_Method0(const osgAnimation::BlendOut *, getBlendOut, - Properties::NON_VIRTUAL, - __C5_BlendOut_P1__getBlendOut, - "", - ""); - I_Method0(unsigned int, getLoop, - Properties::VIRTUAL, - __unsigned_int__getLoop, - "", - ""); - I_Method1(void, setLoop, IN, unsigned int, loop, - Properties::NON_VIRTUAL, - __void__setLoop__unsigned_int, - "", - ""); - I_Method1(void, evaluate, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluate__unsigned_int, - "", - ""); - I_SimpleProperty(osgAnimation::ActionAnimation *, ActionAnimation, - __ActionAnimation_P1__getActionAnimation, - 0); - I_SimpleProperty(osgAnimation::BlendIn *, BlendIn, - __BlendIn_P1__getBlendIn, - 0); - I_SimpleProperty(osgAnimation::BlendOut *, BlendOut, - __BlendOut_P1__getBlendOut, - 0); - I_SimpleProperty(unsigned int, Loop, - __unsigned_int__getLoop, - __void__setLoop__unsigned_int); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osgAnimation::Timeline) - I_DeclaringFile("osgAnimation/Timeline"); - I_BaseType(osg::Object); - 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_Constructor0(____Timeline, "", ""); @@ -355,12 +46,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Timeline) ____Timeline__C5_Timeline_R1__C5_osg_CopyOp_R1, "", ""); - I_Method0(osg::State, getStatus, + I_Method2(, META_Action, IN, osgAnimation, x, IN, osgAnimation::Timeline, x, Properties::NON_VIRTUAL, - __State__getStatus, + ____META_Action__osgAnimation__Timeline, "", ""); - I_Method1(const ActionList &, getActionLayer, IN, int, i, + I_Method0(osgAnimation::Timeline::TimelineStatus, getStatus, + Properties::NON_VIRTUAL, + __TimelineStatus__getStatus, + "", + ""); + I_Method1(const osgAnimation::Timeline::ActionList &, getActionLayer, IN, int, i, Properties::NON_VIRTUAL, __C5_ActionList_R1__getActionLayer__int, "", @@ -415,14 +111,14 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Timeline) __void__addActionAt__double__Action_P1__int, "", ""); - I_Method1(void, evaluate, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluate__unsigned_int, - "", - ""); - I_Method1(void, evaluateCallback, IN, unsigned int, frame, - Properties::VIRTUAL, - __void__evaluateCallback__unsigned_int, + I_MethodWithDefaults2(void, addActionNow, IN, osgAnimation::Action *, action, , IN, int, priority, 0, + Properties::NON_VIRTUAL, + __void__addActionNow__Action_P1__int, + "", + ""); + I_Method0(void, clearActions, + Properties::NON_VIRTUAL, + __void__clearActions, "", ""); I_Method1(void, update, IN, double, simulationTime, @@ -430,30 +126,74 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Timeline) __void__update__double, "", ""); - I_ProtectedMethod1(void, setEvaluating, IN, bool, state, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__setEvaluating__bool, - "", - ""); - I_ProtectedMethod0(void, processPendingOperation, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__processPendingOperation, - "", - ""); + I_Method1(void, setLastFrameEvaluated, IN, unsigned int, frame, + Properties::NON_VIRTUAL, + __void__setLastFrameEvaluated__unsigned_int, + "", + ""); + I_Method1(void, setEvaluating, IN, bool, state, + Properties::NON_VIRTUAL, + __void__setEvaluating__bool, + "", + ""); + I_Method1(void, traverse, IN, osgAnimation::ActionVisitor &, visitor, + Properties::VIRTUAL, + __void__traverse__ActionVisitor_R1, + "", + ""); + I_Method1(void, setStats, IN, osg::Stats *, stats, + Properties::NON_VIRTUAL, + __void__setStats__osg_Stats_P1, + "", + ""); + I_Method0(osg::Stats *, getStats, + Properties::NON_VIRTUAL, + __osg_Stats_P1__getStats, + "", + ""); + I_Method1(void, collectStats, IN, bool, state, + Properties::NON_VIRTUAL, + __void__collectStats__bool, + "", + ""); + I_Method0(osgAnimation::StatsActionVisitor *, getStatsVisitor, + Properties::NON_VIRTUAL, + __osgAnimation_StatsActionVisitor_P1__getStatsVisitor, + "", + ""); + I_Method0(const osgAnimation::Timeline::ActionLayers &, getActionLayers, + Properties::NON_VIRTUAL, + __C5_ActionLayers_R1__getActionLayers, + "", + ""); + I_Method0(void, processPendingOperation, + Properties::NON_VIRTUAL, + __void__processPendingOperation, + "", + ""); + I_Method1(void, setAnimationManager, IN, osgAnimation::AnimationManagerBase *, x, + Properties::NON_VIRTUAL, + __void__setAnimationManager__AnimationManagerBase_P1, + "", + ""); I_ProtectedMethod1(void, internalRemoveAction, IN, osgAnimation::Action *, action, Properties::NON_VIRTUAL, Properties::NON_CONST, __void__internalRemoveAction__Action_P1, "", ""); - I_ProtectedMethod2(void, internalAddAction, IN, int, priority, IN, const FrameAction &, ftl, + I_ProtectedMethod2(void, internalAddAction, IN, int, priority, IN, const osgAnimation::FrameAction &, ftl, Properties::NON_VIRTUAL, Properties::NON_CONST, __void__internalAddAction__int__C5_FrameAction_R1, "", ""); + I_SimpleProperty(const osgAnimation::Timeline::ActionLayers &, ActionLayers, + __C5_ActionLayers_R1__getActionLayers, + 0); + I_SimpleProperty(osgAnimation::AnimationManagerBase *, AnimationManager, + 0, + __void__setAnimationManager__AnimationManagerBase_P1); I_SimpleProperty(unsigned int, CurrentFrame, __unsigned_int__getCurrentFrame, 0); @@ -462,51 +202,20 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Timeline) 0); I_SimpleProperty(bool, Evaluating, __bool__getEvaluating, + __void__setEvaluating__bool); + I_SimpleProperty(unsigned int, LastFrameEvaluated, + 0, + __void__setLastFrameEvaluated__unsigned_int); + I_SimpleProperty(osg::Stats *, Stats, + __osg_Stats_P1__getStats, + __void__setStats__osg_Stats_P1); + I_SimpleProperty(osgAnimation::StatsActionVisitor *, StatsVisitor, + __osgAnimation_StatsActionVisitor_P1__getStatsVisitor, 0); - I_SimpleProperty(osg::State, Status, - __State__getStatus, + I_SimpleProperty(osgAnimation::Timeline::TimelineStatus, Status, + __TimelineStatus__getStatus, 0); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Action::Callback >) - I_DeclaringFile("osg/ref_ptr"); - I_Constructor0(____ref_ptr, - "", - ""); - I_Constructor1(IN, osgAnimation::Action::Callback *, ptr, - Properties::NON_EXPLICIT, - ____ref_ptr__T_P1, - "", - ""); - I_Constructor1(IN, const osg::ref_ptr< osgAnimation::Action::Callback > &, rp, - Properties::NON_EXPLICIT, - ____ref_ptr__C5_ref_ptr_R1, - "", - ""); - I_Method0(osgAnimation::Action::Callback *, get, - Properties::NON_VIRTUAL, - __T_P1__get, - "", - ""); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "", - ""); - I_Method0(osgAnimation::Action::Callback *, release, - Properties::NON_VIRTUAL, - __T_P1__release, - "", - ""); - I_Method1(void, swap, IN, osg::ref_ptr< osgAnimation::Action::Callback > &, rp, - Properties::NON_VIRTUAL, - __void__swap__ref_ptr_R1, - "", - ""); - I_SimpleProperty(osgAnimation::Action::Callback *, , - __T_P1__get, - 0); -END_REFLECTOR - -STD_MAP_REFLECTOR(std::map< unsigned int COMMA osg::ref_ptr< osgAnimation::Action::Callback > >) +STD_MAP_REFLECTOR(std::map< int COMMA osgAnimation::Timeline::ActionList >) diff --git a/src/osgWrappers/osgAnimation/TimelineAnimationManager.cpp b/src/osgWrappers/osgAnimation/TimelineAnimationManager.cpp index f3d3f32dd..22ba0147e 100644 --- a/src/osgWrappers/osgAnimation/TimelineAnimationManager.cpp +++ b/src/osgWrappers/osgAnimation/TimelineAnimationManager.cpp @@ -32,7 +32,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TimelineAnimationManager) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgAnimation/UpdateBone.cpp b/src/osgWrappers/osgAnimation/UpdateBone.cpp new file mode 100644 index 000000000..e723c7ce6 --- /dev/null +++ b/src/osgWrappers/osgAnimation/UpdateBone.cpp @@ -0,0 +1,65 @@ +// *************************************************************************** +// +// 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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::UpdateBone) + I_DeclaringFile("osgAnimation/UpdateBone"); + I_BaseType(osgAnimation::UpdateMatrixTransform); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "", + ""); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "", + ""); + 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, + "", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "", + ""); + I_ConstructorWithDefaults1(IN, const std::string &, name, "", + Properties::NON_EXPLICIT, + ____UpdateBone__C5_std_string_R1, + "", + ""); + I_Constructor2(IN, const osgAnimation::UpdateBone &, x, IN, const osg::CopyOp &, x, + ____UpdateBone__C5_UpdateBone_R1__C5_osg_CopyOp_R1, + "", + ""); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/UpdateCallback.cpp b/src/osgWrappers/osgAnimation/UpdateCallback.cpp index 5b84652da..ad7b6f1af 100644 --- a/src/osgWrappers/osgAnimation/UpdateCallback.cpp +++ b/src/osgWrappers/osgAnimation/UpdateCallback.cpp @@ -32,6 +32,59 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationUpdateCallback) I_DeclaringFile("osgAnimation/UpdateCallback"); I_BaseType(osg::NodeCallback); + I_BaseType(osgAnimation::AnimationUpdateCallbackBase); + I_Constructor0(____AnimationUpdateCallback, + "", + ""); + I_Constructor1(IN, const std::string &, name, + Properties::NON_EXPLICIT, + ____AnimationUpdateCallback__C5_std_string_R1, + "", + ""); + I_Constructor2(IN, const osgAnimation::AnimationUpdateCallback &, apc, IN, const osg::CopyOp &, copyop, + ____AnimationUpdateCallback__C5_AnimationUpdateCallback_R1__C5_osg_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 &, copyop, + 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_Method0(const std::string &, getName, + Properties::NON_VIRTUAL, + __C5_std_string_R1__getName, + "Get the name of object. ", + ""); + I_Method1(bool, link, IN, osgAnimation::Channel *, channel, + Properties::VIRTUAL, + __bool__link__Channel_P1, + "", + ""); + I_Method1(int, link, IN, osgAnimation::Animation *, animation, + Properties::VIRTUAL, + __int__link__Animation_P1, + "", + ""); I_ConstructorWithDefaults1(IN, const std::string &, name, "", Properties::NON_EXPLICIT, ____AnimationUpdateCallback__C5_std_string_R1, @@ -69,17 +122,33 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationUpdateCallback) I_SimpleProperty(osgAnimation::AnimationManagerBase *, AnimationManager, __osgAnimation_AnimationManagerBase_P1__getAnimationManager, 0); + I_SimpleProperty(const std::string &, Name, + __C5_std_string_R1__getName, + 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateTransform) +BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationUpdateCallback) I_DeclaringFile("osgAnimation/UpdateCallback"); - I_BaseType(osgAnimation::AnimationUpdateCallback); + I_BaseType(osg::NodeCallback); + I_BaseType(osgAnimation::AnimationUpdateCallbackBase); + I_Constructor0(____AnimationUpdateCallback, + "", + ""); + I_Constructor1(IN, const std::string &, name, + Properties::NON_EXPLICIT, + ____AnimationUpdateCallback__C5_std_string_R1, + "", + ""); + I_Constructor2(IN, const osgAnimation::AnimationUpdateCallback &, apc, IN, const osg::CopyOp &, copyop, + ____AnimationUpdateCallback__C5_AnimationUpdateCallback_R1__C5_osg_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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -99,6 +168,91 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateTransform) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); + I_Method0(const std::string &, getName, + Properties::NON_VIRTUAL, + __C5_std_string_R1__getName, + "Get the name of object. ", + ""); + I_Method1(bool, link, IN, osgAnimation::Channel *, channel, + Properties::VIRTUAL, + __bool__link__Channel_P1, + "", + ""); + I_Method1(int, link, IN, osgAnimation::Animation *, animation, + Properties::VIRTUAL, + __int__link__Animation_P1, + "", + ""); + I_ConstructorWithDefaults1(IN, const std::string &, name, "", + Properties::NON_EXPLICIT, + ____AnimationUpdateCallback__C5_std_string_R1, + "", + ""); + I_Constructor2(IN, const osgAnimation::AnimationUpdateCallback &, apc, IN, const osg::CopyOp &, copyop, + ____AnimationUpdateCallback__C5_AnimationUpdateCallback_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osgAnimation::AnimationManagerBase *, getAnimationManager, + Properties::NON_VIRTUAL, + __osgAnimation_AnimationManagerBase_P1__getAnimationManager, + "", + ""); + I_Method0(bool, needLink, + Properties::PURE_VIRTUAL, + __bool__needLink, + "", + ""); + I_Method1(bool, link, IN, osgAnimation::Channel *, channel, + Properties::PURE_VIRTUAL, + __bool__link__osgAnimation_Channel_P1, + "", + ""); + I_Method1(int, link, IN, osgAnimation::Animation *, animation, + Properties::VIRTUAL, + __int__link__osgAnimation_Animation_P1, + "", + ""); + I_Method0(void, updateLink, + Properties::VIRTUAL, + __void__updateLink, + "", + ""); + I_SimpleProperty(osgAnimation::AnimationManagerBase *, AnimationManager, + __osgAnimation_AnimationManagerBase_P1__getAnimationManager, + 0); + I_SimpleProperty(const std::string &, Name, + __C5_std_string_R1__getName, + 0); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateTransform) + I_DeclaringFile("osgAnimation/UpdateCallback"); + I_BaseType(osgAnimation::AnimationUpdateCallback); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "", + ""); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "", + ""); + 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, + "", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "", + ""); I_ConstructorWithDefaults1(IN, const std::string &, name, "", Properties::NON_EXPLICIT, ____UpdateTransform__C5_std_string_R1, @@ -119,12 +273,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateTransform) "", ""); I_Method0(bool, needLink, - Properties::VIRTUAL, + Properties::NON_VIRTUAL, __bool__needLink, "", ""); I_Method1(bool, link, IN, osgAnimation::Channel *, channel, - Properties::VIRTUAL, + Properties::NON_VIRTUAL, __bool__link__osgAnimation_Channel_P1, "", ""); diff --git a/src/osgWrappers/osgAnimation/UpdateMaterial.cpp b/src/osgWrappers/osgAnimation/UpdateMaterial.cpp new file mode 100644 index 000000000..db25690a5 --- /dev/null +++ b/src/osgWrappers/osgAnimation/UpdateMaterial.cpp @@ -0,0 +1,86 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::UpdateMaterial) + I_DeclaringFile("osgAnimation/UpdateMaterial"); + I_BaseType(osgAnimation::AnimationUpdateCallback); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "", + ""); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "", + ""); + 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, + "", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "", + ""); + I_ConstructorWithDefaults1(IN, const std::string &, name, "", + Properties::NON_EXPLICIT, + ____UpdateMaterial__C5_std_string_R1, + "", + ""); + I_Constructor2(IN, const osgAnimation::UpdateMaterial &, apc, IN, const osg::CopyOp &, copyop, + ____UpdateMaterial__C5_UpdateMaterial_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method1(void, update, IN, osg::Material &, material, + Properties::NON_VIRTUAL, + __void__update__osg_Material_R1, + "", + ""); + I_Method1(bool, link, IN, osgAnimation::Channel *, channel, + Properties::NON_VIRTUAL, + __bool__link__Channel_P1, + "", + ""); + I_Method0(osgAnimation::Vec4Target *, getDiffuse, + Properties::NON_VIRTUAL, + __Vec4Target_P1__getDiffuse, + "", + ""); + I_SimpleProperty(osgAnimation::Vec4Target *, Diffuse, + __Vec4Target_P1__getDiffuse, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/UpdateMatrixTransform.cpp b/src/osgWrappers/osgAnimation/UpdateMatrixTransform.cpp new file mode 100644 index 000000000..546079b21 --- /dev/null +++ b/src/osgWrappers/osgAnimation/UpdateMatrixTransform.cpp @@ -0,0 +1,85 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#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_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::UpdateMatrixTransform) + I_DeclaringFile("osgAnimation/UpdateMatrixTransform"); + I_BaseType(osgAnimation::AnimationUpdateCallback); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "", + ""); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "", + ""); + 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, + "", + ""); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "", + ""); + I_ConstructorWithDefaults1(IN, const std::string &, name, "", + Properties::NON_EXPLICIT, + ____UpdateMatrixTransform__C5_std_string_R1, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgAnimation::UpdateMatrixTransform &, apc, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____UpdateMatrixTransform__C5_UpdateMatrixTransform_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method1(bool, link, IN, osgAnimation::Channel *, channel, + Properties::VIRTUAL, + __bool__link__osgAnimation_Channel_P1, + "", + ""); + I_Method0(osgAnimation::StackedTransform &, getStackedTransforms, + Properties::NON_VIRTUAL, + __StackedTransform_R1__getStackedTransforms, + "", + ""); + I_Method0(const osgAnimation::StackedTransform &, getStackedTransforms, + Properties::NON_VIRTUAL, + __C5_StackedTransform_R1__getStackedTransforms, + "", + ""); + I_SimpleProperty(osgAnimation::StackedTransform &, StackedTransforms, + __StackedTransform_R1__getStackedTransforms, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgAnimation/VertexInfluence.cpp b/src/osgWrappers/osgAnimation/VertexInfluence.cpp index 6f20b6c90..3a68cc7a5 100644 --- a/src/osgWrappers/osgAnimation/VertexInfluence.cpp +++ b/src/osgWrappers/osgAnimation/VertexInfluence.cpp @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::VertexInfluenceMap) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -117,9 +117,17 @@ BEGIN_VALUE_REFLECTOR(osgAnimation::VertexInfluenceSet) __void__clear, "", ""); + I_Method0(const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap &, getVertexToBoneList, + Properties::NON_VIRTUAL, + __C5_VertexIndexToBoneWeightMap_R1__getVertexToBoneList, + "", + ""); I_SimpleProperty(const osgAnimation::VertexInfluenceSet::UniqVertexSetToBoneSetList &, UniqVertexSetToBoneSetList, __C5_UniqVertexSetToBoneSetList_R1__getUniqVertexSetToBoneSetList, 0); + I_SimpleProperty(const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap &, VertexToBoneList, + __C5_VertexIndexToBoneWeightMap_R1__getVertexToBoneList, + 0); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::VertexInfluenceSet::BoneWeight) diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 5b7926dcb..598481480 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -29,14 +29,6 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osgDB::DatabasePager::DrawablePolicy) - I_DeclaringFile("osgDB/DatabasePager"); - I_EnumLabel(osgDB::DatabasePager::DO_NOT_MODIFY_DRAWABLE_SETTINGS); - I_EnumLabel(osgDB::DatabasePager::USE_DISPLAY_LISTS); - I_EnumLabel(osgDB::DatabasePager::USE_VERTEX_BUFFER_OBJECTS); - I_EnumLabel(osgDB::DatabasePager::USE_VERTEX_ARRAYS); -END_REFLECTOR - TYPE_NAME_ALIAS(OpenThreads::Thread::ThreadPriority, osgDB::DatabasePager::ThreadPriority) TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::PagedLOD > >, osgDB::DatabasePager::PagedLODList) @@ -53,6 +45,14 @@ TYPE_NAME_ALIAS(std::set< unsigned int >, osgDB::DatabasePager::ActiveGraphicsCo TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::GraphicsContext > >, osgDB::DatabasePager::CompileGraphicsContexts) +BEGIN_ENUM_REFLECTOR(osgDB::DatabasePager::DrawablePolicy) + I_DeclaringFile("osgDB/DatabasePager"); + I_EnumLabel(osgDB::DatabasePager::DO_NOT_MODIFY_DRAWABLE_SETTINGS); + I_EnumLabel(osgDB::DatabasePager::USE_DISPLAY_LISTS); + I_EnumLabel(osgDB::DatabasePager::USE_VERTEX_BUFFER_OBJECTS); + I_EnumLabel(osgDB::DatabasePager::USE_VERTEX_ARRAYS); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) I_DeclaringFile("osgDB/DatabasePager"); I_BaseType(osg::NodeVisitor::DatabaseRequestHandler); diff --git a/src/osgWrappers/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/osgDB/DotOsgWrapper.cpp index 13f9003b8..85e5dcefe 100644 --- a/src/osgWrappers/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/osgDB/DotOsgWrapper.cpp @@ -21,18 +21,18 @@ #undef OUT #endif -BEGIN_ENUM_REFLECTOR(osgDB::DotOsgWrapper::ReadWriteMode) - I_DeclaringFile("osgDB/DotOsgWrapper"); - I_EnumLabel(osgDB::DotOsgWrapper::READ_AND_WRITE); - I_EnumLabel(osgDB::DotOsgWrapper::READ_ONLY); -END_REFLECTOR - TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DotOsgWrapper::Associates) TYPE_NAME_ALIAS(bool (*)(osg::Object&,osgDB::Input&), osgDB::DotOsgWrapper::ReadFunc) TYPE_NAME_ALIAS(bool (*)(const osg::Object&,osgDB::Output&), osgDB::DotOsgWrapper::WriteFunc) +BEGIN_ENUM_REFLECTOR(osgDB::DotOsgWrapper::ReadWriteMode) + I_DeclaringFile("osgDB/DotOsgWrapper"); + I_EnumLabel(osgDB::DotOsgWrapper::READ_AND_WRITE); + I_EnumLabel(osgDB::DotOsgWrapper::READ_ONLY); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osgDB::DotOsgWrapper) I_DeclaringFile("osgDB/DotOsgWrapper"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osgDB/DynamicLibrary.cpp b/src/osgWrappers/osgDB/DynamicLibrary.cpp index 10dc1d29e..63c2a9e0b 100644 --- a/src/osgWrappers/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/osgDB/DynamicLibrary.cpp @@ -27,10 +27,6 @@ TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::PROC_ADDRESS) BEGIN_OBJECT_REFLECTOR(osgDB::DynamicLibrary) I_DeclaringFile("osgDB/DynamicLibrary"); I_BaseType(osg::Referenced); - I_StaticMethod1(osgDB::DynamicLibrary *, loadLibrary, IN, const std::string &, libraryName, - __DynamicLibrary_P1__loadLibrary__C5_std_string_R1_S, - "returns a pointer to a DynamicLibrary object on successfully opening of library returns NULL on failure. ", - ""); I_Method0(const std::string &, getName, Properties::NON_VIRTUAL, __C5_std_string_R1__getName, @@ -51,6 +47,10 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DynamicLibrary) __PROC_ADDRESS__getProcAddress__C5_std_string_R1, "return address of function located in library. ", ""); + I_StaticMethod1(osgDB::DynamicLibrary *, loadLibrary, IN, const std::string &, libraryName, + __DynamicLibrary_P1__loadLibrary__C5_std_string_R1_S, + "returns a pointer to a DynamicLibrary object on successfully opening of library returns NULL on failure. ", + ""); I_ProtectedConstructor0(____DynamicLibrary, "disallow default constructor. ", ""); diff --git a/src/osgWrappers/osgDB/FileCache.cpp b/src/osgWrappers/osgDB/FileCache.cpp new file mode 100644 index 000000000..d243c4c94 --- /dev/null +++ b/src/osgWrappers/osgDB/FileCache.cpp @@ -0,0 +1,62 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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(osgDB::FileCache) + I_DeclaringFile("osgDB/FileCache"); + I_BaseType(osg::Referenced); + I_Constructor1(IN, const std::string &, path, + Properties::NON_EXPLICIT, + ____FileCache__C5_std_string_R1, + "", + ""); + I_Method0(const std::string &, getFileCachePath, + Properties::NON_VIRTUAL, + __C5_std_string_R1__getFileCachePath, + "", + ""); + I_Method1(std::string, createCacheFileName, IN, const std::string &, originalFileName, + Properties::VIRTUAL, + __std_string__createCacheFileName__C5_std_string_R1, + "", + ""); + I_Method1(bool, existsInCache, IN, const std::string &, originalFileName, + Properties::VIRTUAL, + __bool__existsInCache__C5_std_string_R1, + "", + ""); + I_MethodWithDefaults3(osgDB::ReaderWriter::ReadResult, readNode, IN, const std::string &, originalFileName, , IN, const osgDB::ReaderWriter::Options *, options, , IN, bool, buildKdTreeIfRequired, true, + Properties::VIRTUAL, + __ReaderWriter_ReadResult__readNode__C5_std_string_R1__C5_osgDB_ReaderWriter_Options_P1__bool, + "", + ""); + I_Method3(osgDB::ReaderWriter::WriteResult, writeNode, IN, const osg::Node &, node, IN, const std::string &, originalFileName, IN, const osgDB::ReaderWriter::Options *, options, + Properties::VIRTUAL, + __ReaderWriter_WriteResult__writeNode__C5_osg_Node_R1__C5_std_string_R1__C5_osgDB_ReaderWriter_Options_P1, + "", + ""); + I_SimpleProperty(const std::string &, FileCachePath, + __C5_std_string_R1__getFileCachePath, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgDB/FileUtils.cpp b/src/osgWrappers/osgDB/FileUtils.cpp index 6e52fb00a..8b74bc34c 100644 --- a/src/osgWrappers/osgDB/FileUtils.cpp +++ b/src/osgWrappers/osgDB/FileUtils.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DirectoryContents) + BEGIN_ENUM_REFLECTOR(osgDB::CaseSensitivity) I_DeclaringFile("osgDB/FileUtils"); I_EnumLabel(osgDB::CASE_SENSITIVE); @@ -33,5 +35,3 @@ BEGIN_ENUM_REFLECTOR(osgDB::FileType) I_EnumLabel(osgDB::DIRECTORY); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< std::string >, osgDB::DirectoryContents) - diff --git a/src/osgWrappers/osgDB/ImageOptions.cpp b/src/osgWrappers/osgDB/ImageOptions.cpp index 472491999..b83c9679c 100644 --- a/src/osgWrappers/osgDB/ImageOptions.cpp +++ b/src/osgWrappers/osgDB/ImageOptions.cpp @@ -56,7 +56,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ImageOptions) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index 674148b09..8c216b609 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osgDB::ReaderWriter::FormatDescriptionMap) + BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ArchiveStatus) I_DeclaringFile("osgDB/ReaderWriter"); I_EnumLabel(osgDB::ReaderWriter::READ); @@ -35,8 +37,6 @@ BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ArchiveStatus) I_EnumLabel(osgDB::ReaderWriter::CREATE); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< std::string COMMA std::string >, osgDB::ReaderWriter::FormatDescriptionMap) - BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) I_DeclaringFile("osgDB/ReaderWriter"); I_BaseType(osg::Object); @@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -261,7 +261,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -356,6 +356,26 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options) __void__removePluginData__C5_std_string_R1, "Remove a value from the PluginData. ", ""); + I_Method2(void, setPluginStringData, IN, const std::string &, s, IN, const std::string &, v, + Properties::NON_VIRTUAL, + __void__setPluginStringData__C5_std_string_R1__C5_std_string_R1, + "Sets a plugindata value PluginData with a string. ", + ""); + I_Method1(std::string, getPluginStringData, IN, const std::string &, s, + Properties::NON_VIRTUAL, + __std_string__getPluginStringData__C5_std_string_R1, + "Get a string from the PluginStrData. ", + ""); + I_Method1(const std::string, getPluginStringData, IN, const std::string &, s, + Properties::NON_VIRTUAL, + __C5_std_string__getPluginStringData__C5_std_string_R1, + "Get a value from the PluginData. ", + ""); + I_Method1(void, removePluginStringData, IN, const std::string &, s, + Properties::NON_VIRTUAL, + __void__removePluginStringData__C5_std_string_R1, + "Remove a value from the PluginData. ", + ""); I_SimpleProperty(osgDB::AuthenticationMap *, AuthenticationMap, 0, __void__setAuthenticationMap__AuthenticationMap_P1); @@ -378,6 +398,10 @@ BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options) __void_P1__getPluginData__C5_std_string_R1, __void__setPluginData__C5_std_string_R1__void_P1, 0); + I_IndexedProperty(std::string, PluginStringData, + __std_string__getPluginStringData__C5_std_string_R1, + __void__setPluginStringData__C5_std_string_R1__C5_std_string_R1, + 0); END_REFLECTOR BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ReadResult::ReadStatus) diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index b6451521d..c49cdd61d 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -69,6 +70,8 @@ BEGIN_VALUE_REFLECTOR(osgDB::RegisterDotOsgWrapperProxy) ""); END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgDB::ReaderWriter > >, osgDB::Registry::ReaderWriterList) + BEGIN_ENUM_REFLECTOR(osgDB::Registry::LoadStatus) I_DeclaringFile("osgDB/Registry"); I_EnumLabel(osgDB::Registry::NOT_LOADED); @@ -76,15 +79,9 @@ BEGIN_ENUM_REFLECTOR(osgDB::Registry::LoadStatus) I_EnumLabel(osgDB::Registry::LOADED); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgDB::ReaderWriter > >, osgDB::Registry::ReaderWriterList) - BEGIN_OBJECT_REFLECTOR(osgDB::Registry) I_DeclaringFile("osgDB/Registry"); I_BaseType(osg::Referenced); - I_StaticMethodWithDefaults1(osgDB::Registry *, instance, IN, bool, erase, false, - __Registry_P1__instance__bool_S, - "", - ""); I_Method1(void, readCommandLine, IN, osg::ArgumentParser &, commandLine, Properties::NON_VIRTUAL, __void__readCommandLine__osg_ArgumentParser_R1, @@ -490,16 +487,26 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __C5_FilePathList_R1__getLibraryFilePathList, "get the const library file path which is used when search for library (dso/dll's) files. ", ""); - I_Method1(void, updateTimeStampOfObjectsInCacheWithExternalReferences, IN, double, currentTime, + I_Method1(void, updateTimeStampOfObjectsInCacheWithExternalReferences, IN, const osg::FrameStamp &, frameStamp, Properties::NON_VIRTUAL, - __void__updateTimeStampOfObjectsInCacheWithExternalReferences__double, + __void__updateTimeStampOfObjectsInCacheWithExternalReferences__C5_osg_FrameStamp_R1, "For each object in the cache which has an reference count greater than 1 (and therefore referenced by elsewhere in the application) set the time stamp for that object in the cache to specified time. ", - "This would typically be called once per frame by applications which are doing database paging, and need to prune objects that are no longer required. Time value is time in seconds. "); - I_Method1(void, removeExpiredObjectsInCache, IN, double, expiryTime, + "This would typically be called once per frame by applications which are doing database paging, and need to prune objects that are no longer required. The time used is taken from the FrameStamp::getReferenceTime(). "); + I_Method1(void, removeExpiredObjectsInCache, IN, const osg::FrameStamp &, frameStamp, Properties::NON_VIRTUAL, - __void__removeExpiredObjectsInCache__double, + __void__removeExpiredObjectsInCache__C5_osg_FrameStamp_R1, "Removed object in the cache which have a time stamp at or before the specified expiry time. ", - "This would typically be called once per frame by applications which are doing database paging, and need to prune objects that are no longer required, and called after the a called after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(currentTime). Note, the currentTime is not the expiryTime, one would typically set the expiry time to a fixed amount of time before currentTime, such as expiryTime = currentTime-10.0. Time value is time in seconds. "); + "This would typically be called once per frame by applications which are doing database paging, and need to prune objects that are no longer required, and called after the a called after the call to updateTimeStampOfObjectsInCacheWithExternalReferences(frameStamp). "); + I_Method1(void, setExpiryDelay, IN, double, expiryDelay, + Properties::NON_VIRTUAL, + __void__setExpiryDelay__double, + "set hint to viewer code calling removeExpiredObjectsInCache to specify how long it should give before expiring objects in Registry cache, ", + ""); + I_Method0(double, getExpiryDelay, + Properties::NON_VIRTUAL, + __double__getExpiryDelay, + "", + ""); I_Method0(void, clearObjectCache, Properties::NON_VIRTUAL, __void__clearObjectCache, @@ -565,6 +572,10 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) __void__addArchiveExtension__C5_std_string, "Add an Archive extension. ", ""); + I_StaticMethodWithDefaults1(osgDB::Registry *, instance, IN, bool, erase, false, + __Registry_P1__instance__bool_S, + "", + ""); I_ProtectedConstructor0(____Registry, "constructor is private, as its a singleton, preventing construction other than via the instance() method and therefore ensuring only one copy is ever constructed ", ""); @@ -601,6 +612,9 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry) I_SimpleProperty(const osgDB::FilePathList &, DataFilePathList, __C5_FilePathList_R1__getDataFilePathList, __void__setDataFilePathList__C5_FilePathList_R1); + I_SimpleProperty(double, ExpiryDelay, + __double__getExpiryDelay, + __void__setExpiryDelay__double); I_SimpleProperty(osgDB::FileCache *, FileCache, __FileCache_P1__getFileCache, __void__setFileCache__FileCache_P1); diff --git a/src/osgWrappers/osgFX/Registry.cpp b/src/osgWrappers/osgFX/Registry.cpp index 8c5781445..11c79cfa8 100644 --- a/src/osgWrappers/osgFX/Registry.cpp +++ b/src/osgWrappers/osgFX/Registry.cpp @@ -26,10 +26,6 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > BEGIN_OBJECT_REFLECTOR(osgFX::Registry) I_DeclaringFile("osgFX/Registry"); I_BaseType(osg::Referenced); - I_StaticMethod0(osgFX::Registry *, instance, - __Registry_P1__instance_S, - "", - ""); I_Method1(void, registerEffect, IN, const osgFX::Effect *, effect, Properties::NON_VIRTUAL, __void__registerEffect__C5_Effect_P1, @@ -40,6 +36,10 @@ BEGIN_OBJECT_REFLECTOR(osgFX::Registry) __C5_EffectMap_R1__getEffectMap, "", ""); + I_StaticMethod0(osgFX::Registry *, instance, + __Registry_P1__instance_S, + "", + ""); I_ProtectedConstructor0(____Registry, "", ""); diff --git a/src/osgWrappers/osgFX/Validator.cpp b/src/osgWrappers/osgFX/Validator.cpp index 2ebf6cce8..0d5b7355b 100644 --- a/src/osgWrappers/osgFX/Validator.cpp +++ b/src/osgWrappers/osgFX/Validator.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osgFX::Validator) __osg_Object_P1__cloneType, "Clone the type of an attribute, with Object* return type. ", "Must be defined by derived classes. "); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -70,12 +70,12 @@ BEGIN_OBJECT_REFLECTOR(osgFX::Validator) __Type__getType, "Return the Type identifier of the attribute's class type. ", ""); - I_Method1(void, apply, IN, osg::State &, x, + I_Method1(void, apply, IN, osg::State &, state, Properties::VIRTUAL, __void__apply__osg_State_R1, "apply the OpenGL state attributes. ", "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state. "); - I_Method1(void, compileGLObjects, IN, osg::State &, x, + I_Method1(void, compileGLObjects, IN, osg::State &, state, Properties::VIRTUAL, __void__compileGLObjects__osg_State_R1, "Default to nothing to compile - all state is applied immediately. ", diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index 7cff2a385..6355af4d9 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -93,17 +93,17 @@ BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) __bool__valid, "", ""); - I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Start/restart the manipulator. ", "FIXME: what does this actually mean? Provide examples. "); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Move the camera to the default position. ", "May be ignored by manipulators if home functionality is not appropriate. "); - I_Method1(void, home, IN, double, x, + I_Method1(void, home, IN, double, currentTime, Properties::VIRTUAL, __void__home__double, "Move the camera to the default position. ", diff --git a/src/osgWrappers/osgGA/CameraViewSwitchManipulator.cpp b/src/osgWrappers/osgGA/CameraViewSwitchManipulator.cpp new file mode 100644 index 000000000..b07329a51 --- /dev/null +++ b/src/osgWrappers/osgGA/CameraViewSwitchManipulator.cpp @@ -0,0 +1,150 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#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 + +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::CameraView > >, osgGA::CameraViewSwitchManipulator::CameraViewList) + +BEGIN_OBJECT_REFLECTOR(osgGA::CameraViewSwitchManipulator) + I_DeclaringFile("osgGA/CameraViewSwitchManipulator"); + I_BaseType(osgGA::MatrixManipulator); + I_Constructor0(____CameraViewSwitchManipulator, + "", + ""); + 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_Method1(void, setByMatrix, IN, const osg::Matrixd &, x, + Properties::VIRTUAL, + __void__setByMatrix__C5_osg_Matrixd_R1, + "set the position of the matrix manipulator using a 4x4 Matrix. ", + ""); + I_Method1(void, setByInverseMatrix, IN, const osg::Matrixd &, x, + Properties::VIRTUAL, + __void__setByInverseMatrix__C5_osg_Matrixd_R1, + "set the position of the matrix manipulator using a 4x4 Matrix. ", + ""); + I_Method0(osg::Matrixd, getMatrix, + Properties::VIRTUAL, + __osg_Matrixd__getMatrix, + "get the position of the manipulator as 4x4 Matrix. ", + ""); + I_Method0(osg::Matrixd, getInverseMatrix, + Properties::VIRTUAL, + __osg_Matrixd__getInverseMatrix, + "get the position of the manipulator as a inverse matrix of the manipulator, typically used as a model view matrix. ", + ""); + I_Method1(void, setNode, IN, osg::Node *, x, + Properties::VIRTUAL, + __void__setNode__osg_Node_P1, + "Attach a node to the manipulator. ", + "Automatically detaches previously attached node. setNode(NULL) detaches previously nodes. Is ignored by manipulators which do not require a reference model. "); + I_Method0(const osg::Node *, getNode, + Properties::VIRTUAL, + __C5_osg_Node_P1__getNode, + "Return node if attached. ", + ""); + I_Method0(osg::Node *, getNode, + Properties::VIRTUAL, + __osg_Node_P1__getNode, + "Return node if attached. ", + ""); + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + Properties::VIRTUAL, + __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "Start/restart the manipulator. ", + ""); + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + Properties::VIRTUAL, + __bool__handle__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, + "handle events, return true if handled, false otherwise. ", + ""); + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, + Properties::VIRTUAL, + __void__getUsage__osg_ApplicationUsage_R1, + "Get the keyboard and mouse usage of this manipulator. ", + ""); + I_SimpleProperty(const osg::Matrixd &, ByInverseMatrix, + 0, + __void__setByInverseMatrix__C5_osg_Matrixd_R1); + I_SimpleProperty(const osg::Matrixd &, ByMatrix, + 0, + __void__setByMatrix__C5_osg_Matrixd_R1); + I_SimpleProperty(osg::Matrixd, InverseMatrix, + __osg_Matrixd__getInverseMatrix, + 0); + I_SimpleProperty(osg::Matrixd, Matrix, + __osg_Matrixd__getMatrix, + 0); + I_SimpleProperty(osg::Node *, Node, + __osg_Node_P1__getNode, + __void__setNode__osg_Node_P1); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::CameraView >) + I_DeclaringFile("osg/ref_ptr"); + I_Constructor0(____ref_ptr, + "", + ""); + I_Constructor1(IN, osg::CameraView *, ptr, + Properties::NON_EXPLICIT, + ____ref_ptr__T_P1, + "", + ""); + I_Constructor1(IN, const osg::ref_ptr< osg::CameraView > &, rp, + Properties::NON_EXPLICIT, + ____ref_ptr__C5_ref_ptr_R1, + "", + ""); + I_Method0(osg::CameraView *, get, + Properties::NON_VIRTUAL, + __T_P1__get, + "", + ""); + I_Method0(bool, valid, + Properties::NON_VIRTUAL, + __bool__valid, + "", + ""); + I_Method0(osg::CameraView *, release, + Properties::NON_VIRTUAL, + __T_P1__release, + "", + ""); + I_Method1(void, swap, IN, osg::ref_ptr< osg::CameraView > &, rp, + Properties::NON_VIRTUAL, + __void__swap__ref_ptr_R1, + "", + ""); + I_SimpleProperty(osg::CameraView *, , + __T_P1__get, + 0); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::CameraView > >) + diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index ce77dede7..83aba6e55 100644 --- a/src/osgWrappers/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/osgGA/DriveManipulator.cpp @@ -76,12 +76,12 @@ BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) __void__computeHomePosition, "Compute the home position. ", ""); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Move the camera to the default position. ", "May be ignored by manipulators if home functionality is not appropriate. "); - I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Start/restart the manipulator. ", diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index a2028e91d..e5b0f670e 100644 --- a/src/osgWrappers/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/osgGA/FlightManipulator.cpp @@ -77,12 +77,12 @@ BEGIN_OBJECT_REFLECTOR(osgGA::FlightManipulator) __osg_Node_P1__getNode, "Return node if attached. ", ""); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Move the camera to the default position. ", "May be ignored by manipulators if home functionality is not appropriate. "); - I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, Properties::VIRTUAL, __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Start/restart the manipulator. ", diff --git a/src/osgWrappers/osgGA/GUIEventAdapter.cpp b/src/osgWrappers/osgGA/GUIEventAdapter.cpp index 9fd0e78ef..81c9d9354 100644 --- a/src/osgWrappers/osgGA/GUIEventAdapter.cpp +++ b/src/osgWrappers/osgGA/GUIEventAdapter.cpp @@ -242,7 +242,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventAdapter) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgGA/GUIEventHandler.cpp b/src/osgWrappers/osgGA/GUIEventHandler.cpp index 41266c7a9..a0e6f2f66 100644 --- a/src/osgWrappers/osgGA/GUIEventHandler.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandler.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index 40fd7f9be..88dcb8601 100644 --- a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp @@ -143,7 +143,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) __float__getFusionDistanceValue, "Get the FusionDistanceValue. ", "Used by SceneView for setting up stereo convergence. "); - I_Method1(void, setNode, IN, osg::Node *, x, + I_Method1(void, setNode, IN, osg::Node *, n, Properties::VIRTUAL, __void__setNode__osg_Node_P1, "Attach a node to the manipulator, automatically detaching any previously attached node. ", @@ -173,12 +173,12 @@ BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) __void__computeHomePosition, "Compute the home position. ", ""); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ee, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __void__home__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Move the camera to the default position. ", "May be ignored by manipulators if home functionality is not appropriate. "); - I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(void, init, IN, const osgGA::GUIEventAdapter &, ee, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __void__init__C5_GUIEventAdapter_R1__GUIActionAdapter_R1, "Start/restart the manipulator. ", diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index ccb338089..a35eb03e4 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -26,6 +26,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserverNodePath) + BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::TrackerMode) I_DeclaringFile("osgGA/NodeTrackerManipulator"); I_EnumLabel(osgGA::NodeTrackerManipulator::NODE_CENTER); @@ -39,8 +41,6 @@ BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::RotationMode) I_EnumLabel(osgGA::NodeTrackerManipulator::ELEVATION_AZIM); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osgGA::NodeTrackerManipulator::ObserverNodePath) - BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) I_DeclaringFile("osgGA/NodeTrackerManipulator"); I_BaseType(osgGA::MatrixManipulator); diff --git a/src/osgWrappers/osgParticle/AccelOperator.cpp b/src/osgWrappers/osgParticle/AccelOperator.cpp index 632321bbd..2b0cc511d 100644 --- a/src/osgWrappers/osgParticle/AccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AccelOperator.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::AccelOperator) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp index e10b218b3..31529b851 100644 --- a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::AngularAccelOperator) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/BoxPlacer.cpp b/src/osgWrappers/osgParticle/BoxPlacer.cpp index 7b8320094..2e0d3700c 100644 --- a/src/osgWrappers/osgParticle/BoxPlacer.cpp +++ b/src/osgWrappers/osgParticle/BoxPlacer.cpp @@ -85,7 +85,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::BoxPlacer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp index 6e0927717..ee6d48307 100644 --- a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ConnectedParticleSystem) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp index ca306f9d1..661bac69d 100644 --- a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp +++ b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp @@ -37,7 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ConstantRateCounter) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/ForceOperator.cpp b/src/osgWrappers/osgParticle/ForceOperator.cpp index ce8d64861..e60257f7d 100644 --- a/src/osgWrappers/osgParticle/ForceOperator.cpp +++ b/src/osgWrappers/osgParticle/ForceOperator.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ForceOperator) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/LinearInterpolator.cpp b/src/osgWrappers/osgParticle/LinearInterpolator.cpp index 852fa9482..c351f8d76 100644 --- a/src/osgWrappers/osgParticle/LinearInterpolator.cpp +++ b/src/osgWrappers/osgParticle/LinearInterpolator.cpp @@ -37,7 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::LinearInterpolator) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp index aae5f2319..7a728e66e 100644 --- a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index 78a157b40..a6ae7c8f9 100644 --- a/src/osgWrappers/osgParticle/ParticleProcessor.cpp +++ b/src/osgWrappers/osgParticle/ParticleProcessor.cpp @@ -153,7 +153,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleProcessor) __bool__isAlive, "Check whether the processor is alive with respect to start time and life duration. ", "Note that this method may return true even if the processor has been disabled by calling setEnabled(false). To test whether the processor is actually processing particles or not, you should evaluate (isEnabled() && isAlive()). "); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index e6d2b1370..495196152 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -26,6 +27,12 @@ #undef OUT #endif +TYPE_NAME_ALIAS(OpenThreads::Mutex, osgParticle::ParticleSystem::ReadWriterMutex) + +TYPE_NAME_ALIAS(OpenThreads::ScopedLock< OpenThreads::Mutex >, osgParticle::ParticleSystem::ScopedReadLock) + +TYPE_NAME_ALIAS(OpenThreads::ScopedLock< OpenThreads::Mutex >, osgParticle::ParticleSystem::ScopedWriteLock) + BEGIN_ENUM_REFLECTOR(osgParticle::ParticleSystem::Alignment) I_DeclaringFile("osgParticle/ParticleSystem"); I_EnumLabel(osgParticle::ParticleSystem::BILLBOARD); @@ -38,12 +45,6 @@ BEGIN_ENUM_REFLECTOR(osgParticle::ParticleSystem::ParticleScaleReferenceFrame) I_EnumLabel(osgParticle::ParticleSystem::WORLD_COORDINATES); END_REFLECTOR -TYPE_NAME_ALIAS(OpenThreads::Mutex, osgParticle::ParticleSystem::ReadWriterMutex) - -TYPE_NAME_ALIAS(OpenThreads::ScopedLock< OpenThreads::Mutex >, osgParticle::ParticleSystem::ScopedReadLock) - -TYPE_NAME_ALIAS(OpenThreads::ScopedLock< OpenThreads::Mutex >, osgParticle::ParticleSystem::ScopedWriteLock) - BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem) I_DeclaringFile("osgParticle/ParticleSystem"); I_BaseType(osg::Drawable); @@ -59,7 +60,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp index 61a14f4ed..2cfb2e7d3 100644 --- a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp @@ -115,7 +115,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater) __unsigned_int__getParticleSystemIndex__C5_ParticleSystem_P1, "get index number of ParticleSystem. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgParticle/PointPlacer.cpp b/src/osgWrappers/osgParticle/PointPlacer.cpp index a04235c5b..d170bb862 100644 --- a/src/osgWrappers/osgParticle/PointPlacer.cpp +++ b/src/osgWrappers/osgParticle/PointPlacer.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::PointPlacer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index 525249a85..16d2c1e9a 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -60,7 +60,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", @@ -316,7 +316,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/RadialShooter.cpp b/src/osgWrappers/osgParticle/RadialShooter.cpp index d445cf3f0..a67a82610 100644 --- a/src/osgWrappers/osgParticle/RadialShooter.cpp +++ b/src/osgWrappers/osgParticle/RadialShooter.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::RadialShooter) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/RandomRateCounter.cpp b/src/osgWrappers/osgParticle/RandomRateCounter.cpp index 5ef437b8c..1b7729d66 100644 --- a/src/osgWrappers/osgParticle/RandomRateCounter.cpp +++ b/src/osgWrappers/osgParticle/RandomRateCounter.cpp @@ -37,7 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::RandomRateCounter) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/SectorPlacer.cpp b/src/osgWrappers/osgParticle/SectorPlacer.cpp index e97710619..5509218ea 100644 --- a/src/osgWrappers/osgParticle/SectorPlacer.cpp +++ b/src/osgWrappers/osgParticle/SectorPlacer.cpp @@ -70,7 +70,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::SectorPlacer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/osgParticle/SegmentPlacer.cpp index 63cd26e35..e701b9031 100644 --- a/src/osgWrappers/osgParticle/SegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/SegmentPlacer.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::SegmentPlacer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/DebugShadowMap.cpp b/src/osgWrappers/osgShadow/DebugShadowMap.cpp index fca80f90d..bc0308207 100644 --- a/src/osgWrappers/osgShadow/DebugShadowMap.cpp +++ b/src/osgWrappers/osgShadow/DebugShadowMap.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::DebugShadowMap) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/LightSpacePerspectiveShadowMap.cpp b/src/osgWrappers/osgShadow/LightSpacePerspectiveShadowMap.cpp index 27bc40ffa..66982a780 100644 --- a/src/osgWrappers/osgShadow/LightSpacePerspectiveShadowMap.cpp +++ b/src/osgWrappers/osgShadow/LightSpacePerspectiveShadowMap.cpp @@ -50,11 +50,11 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::LightSpacePerspectiveShadowMapCB) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, 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, @@ -63,13 +63,13 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::LightSpacePerspectiveShadowMapCB) 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 TYPE_NAME_ALIAS(osgShadow::ProjectionShadowMap< osgShadow::MinimalDrawBoundsShadowMap COMMA osgShadow::LightSpacePerspectiveShadowMapAlgorithm >, osgShadow::LightSpacePerspectiveShadowMapDB::BaseClass) @@ -88,11 +88,11 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::LightSpacePerspectiveShadowMapDB) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, 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, @@ -101,13 +101,13 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::LightSpacePerspectiveShadowMapDB) 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 TYPE_NAME_ALIAS(osgShadow::ProjectionShadowMap< osgShadow::MinimalShadowMap COMMA osgShadow::LightSpacePerspectiveShadowMapAlgorithm >, osgShadow::LightSpacePerspectiveShadowMapVB::BaseClass) @@ -126,11 +126,11 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::LightSpacePerspectiveShadowMapVB) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, 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, @@ -139,13 +139,13 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::LightSpacePerspectiveShadowMapVB) 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 TYPE_NAME_ALIAS(osgShadow::LightSpacePerspectiveShadowMapDB, osgShadow::LightSpacePerspectiveShadowMap) diff --git a/src/osgWrappers/osgShadow/MinimalCullBoundsShadowMap.cpp b/src/osgWrappers/osgShadow/MinimalCullBoundsShadowMap.cpp index bf25e0cce..bb80746cf 100644 --- a/src/osgWrappers/osgShadow/MinimalCullBoundsShadowMap.cpp +++ b/src/osgWrappers/osgShadow/MinimalCullBoundsShadowMap.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::MinimalCullBoundsShadowMap) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/MinimalDrawBoundsShadowMap.cpp b/src/osgWrappers/osgShadow/MinimalDrawBoundsShadowMap.cpp index 493243f86..2ec0ef009 100644 --- a/src/osgWrappers/osgShadow/MinimalDrawBoundsShadowMap.cpp +++ b/src/osgWrappers/osgShadow/MinimalDrawBoundsShadowMap.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::MinimalDrawBoundsShadowMap) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/MinimalShadowMap.cpp b/src/osgWrappers/osgShadow/MinimalShadowMap.cpp index cd7ce0a30..53e918af4 100644 --- a/src/osgWrappers/osgShadow/MinimalShadowMap.cpp +++ b/src/osgWrappers/osgShadow/MinimalShadowMap.cpp @@ -23,6 +23,10 @@ #undef OUT #endif +TYPE_NAME_ALIAS(osgShadow::MinimalShadowMap, osgShadow::MinimalShadowMap::ThisClass) + +TYPE_NAME_ALIAS(osgShadow::StandardShadowMap, osgShadow::MinimalShadowMap::BaseClass) + BEGIN_ENUM_REFLECTOR(osgShadow::MinimalShadowMap::ShadowReceivingCoarseBoundAccuracy) I_DeclaringFile("osgShadow/MinimalShadowMap"); I_EnumLabel(osgShadow::MinimalShadowMap::EMPTY_BOX); @@ -31,10 +35,6 @@ BEGIN_ENUM_REFLECTOR(osgShadow::MinimalShadowMap::ShadowReceivingCoarseBoundAccu I_EnumLabel(osgShadow::MinimalShadowMap::DEFAULT_ACCURACY); END_REFLECTOR -TYPE_NAME_ALIAS(osgShadow::MinimalShadowMap, osgShadow::MinimalShadowMap::ThisClass) - -TYPE_NAME_ALIAS(osgShadow::StandardShadowMap, osgShadow::MinimalShadowMap::BaseClass) - BEGIN_OBJECT_REFLECTOR(osgShadow::MinimalShadowMap) I_DeclaringFile("osgShadow/MinimalShadowMap"); I_BaseType(osgShadow::StandardShadowMap); @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::MinimalShadowMap) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/OccluderGeometry.cpp b/src/osgWrappers/osgShadow/OccluderGeometry.cpp index f99af8b82..0f51f34ee 100644 --- a/src/osgWrappers/osgShadow/OccluderGeometry.cpp +++ b/src/osgWrappers/osgShadow/OccluderGeometry.cpp @@ -48,7 +48,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -162,6 +162,10 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) __void__setBoundingPolytope__C5_osg_Polytope_R1); END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::ShadowVolumeGeometry::Vec3List) + +TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::ShadowVolumeGeometry::UIntList) + BEGIN_ENUM_REFLECTOR(osgShadow::ShadowVolumeGeometry::DrawMode) I_DeclaringFile("osgShadow/OccluderGeometry"); I_EnumLabel(osgShadow::ShadowVolumeGeometry::GEOMETRY); @@ -169,10 +173,6 @@ BEGIN_ENUM_REFLECTOR(osgShadow::ShadowVolumeGeometry::DrawMode) I_EnumLabel(osgShadow::ShadowVolumeGeometry::STENCIL_TWO_SIDED); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::ShadowVolumeGeometry::Vec3List) - -TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::ShadowVolumeGeometry::UIntList) - BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowVolumeGeometry) I_DeclaringFile("osgShadow/OccluderGeometry"); I_BaseType(osg::Drawable); @@ -188,7 +188,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowVolumeGeometry) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp b/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp index c1524cb9a..34d0f02f7 100644 --- a/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp +++ b/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ParallelSplitShadowMap) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/ShadowMap.cpp b/src/osgWrappers/osgShadow/ShadowMap.cpp index 4e770f77b..52f030c0c 100644 --- a/src/osgWrappers/osgShadow/ShadowMap.cpp +++ b/src/osgWrappers/osgShadow/ShadowMap.cpp @@ -49,7 +49,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowMap) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/ShadowTechnique.cpp b/src/osgWrappers/osgShadow/ShadowTechnique.cpp index 4ff55dd95..ed84d509c 100644 --- a/src/osgWrappers/osgShadow/ShadowTechnique.cpp +++ b/src/osgWrappers/osgShadow/ShadowTechnique.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowTechnique) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/ShadowTexture.cpp b/src/osgWrappers/osgShadow/ShadowTexture.cpp index 803c60085..1a3294979 100644 --- a/src/osgWrappers/osgShadow/ShadowTexture.cpp +++ b/src/osgWrappers/osgShadow/ShadowTexture.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowTexture) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/ShadowVolume.cpp b/src/osgWrappers/osgShadow/ShadowVolume.cpp index 3150301f1..2e7d2235f 100644 --- a/src/osgWrappers/osgShadow/ShadowVolume.cpp +++ b/src/osgWrappers/osgShadow/ShadowVolume.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowVolume) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/ShadowedScene.cpp b/src/osgWrappers/osgShadow/ShadowedScene.cpp index f76077422..a17de04f1 100644 --- a/src/osgWrappers/osgShadow/ShadowedScene.cpp +++ b/src/osgWrappers/osgShadow/ShadowedScene.cpp @@ -66,7 +66,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowedScene) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgShadow/SoftShadowMap.cpp b/src/osgWrappers/osgShadow/SoftShadowMap.cpp index 96dabac9c..ebc834aea 100644 --- a/src/osgWrappers/osgShadow/SoftShadowMap.cpp +++ b/src/osgWrappers/osgShadow/SoftShadowMap.cpp @@ -37,7 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::SoftShadowMap) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/StandardShadowMap.cpp b/src/osgWrappers/osgShadow/StandardShadowMap.cpp index d1f55555f..1aee41ce7 100644 --- a/src/osgWrappers/osgShadow/StandardShadowMap.cpp +++ b/src/osgWrappers/osgShadow/StandardShadowMap.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::StandardShadowMap) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgShadow/ViewDependentShadowTechnique.cpp b/src/osgWrappers/osgShadow/ViewDependentShadowTechnique.cpp index d64053c43..f2779117a 100644 --- a/src/osgWrappers/osgShadow/ViewDependentShadowTechnique.cpp +++ b/src/osgWrappers/osgShadow/ViewDependentShadowTechnique.cpp @@ -28,8 +28,8 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ViewDependentShadowTechnique) I_DeclaringFile("osgShadow/ViewDependentShadowTechnique"); I_BaseType(osgShadow::ShadowTechnique); I_Constructor0(____ViewDependentShadowTechnique, - "osgShadow::ShadowTechnique equivalent methods for view dependent techniques ", - "Classic OSG constructor "); + "Classic OSG constructor. ", + ""); I_ConstructorWithDefaults2(IN, const osgShadow::ViewDependentShadowTechnique &, vdst, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, ____ViewDependentShadowTechnique__C5_ViewDependentShadowTechnique_R1__C5_osg_CopyOp_R1, "Classic OSG cloning constructor. ", @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgShadow::ViewDependentShadowTechnique) __osg_Object_P1__cloneType, "Declaration of standard OSG object methods. ", ""); - I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgSim/BlinkSequence.cpp b/src/osgWrappers/osgSim/BlinkSequence.cpp index 642bc7b7c..6bbf2e220 100644 --- a/src/osgWrappers/osgSim/BlinkSequence.cpp +++ b/src/osgWrappers/osgSim/BlinkSequence.cpp @@ -38,7 +38,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::BlinkSequence) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -149,7 +149,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::SequenceGroup) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgSim/DOFTransform.cpp b/src/osgWrappers/osgSim/DOFTransform.cpp index 3ce27c610..e801c706c 100644 --- a/src/osgWrappers/osgSim/DOFTransform.cpp +++ b/src/osgWrappers/osgSim/DOFTransform.cpp @@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::DOFTransform) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index 169261c5b..a77fb4c65 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -68,7 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgSim/LightPointNode.cpp b/src/osgWrappers/osgSim/LightPointNode.cpp index 1ab60cf7c..e656e22d5 100644 --- a/src/osgWrappers/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/osgSim/LightPointNode.cpp @@ -68,7 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::LightPointNode) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgSim/LightPointSystem.cpp b/src/osgWrappers/osgSim/LightPointSystem.cpp index 6a49074ed..0d1239cad 100644 --- a/src/osgWrappers/osgSim/LightPointSystem.cpp +++ b/src/osgWrappers/osgSim/LightPointSystem.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::LightPointSystem) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index dcf15b50a..e34c62e60 100644 --- a/src/osgWrappers/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/osgSim/MultiSwitch.cpp @@ -68,7 +68,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::MultiSwitch) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgSim/ObjectRecordData.cpp b/src/osgWrappers/osgSim/ObjectRecordData.cpp index b3eefb3fe..b12f5ce01 100644 --- a/src/osgWrappers/osgSim/ObjectRecordData.cpp +++ b/src/osgWrappers/osgSim/ObjectRecordData.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ObjectRecordData) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index 238b3032e..e7a63bfb3 100644 --- a/src/osgWrappers/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -76,7 +76,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgSim/ScalarBar.cpp b/src/osgWrappers/osgSim/ScalarBar.cpp index 9aaf40025..83bcdc08b 100644 --- a/src/osgWrappers/osgSim/ScalarBar.cpp +++ b/src/osgWrappers/osgSim/ScalarBar.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ScalarBar) I_ConstructorWithDefaults7(IN, int, numColors, , IN, int, numLabels, , IN, osgSim::ScalarsToColors *, stc, , IN, const std::string &, title, , IN, osgSim::ScalarBar::Orientation, orientation, osgSim::ScalarBar::HORIZONTAL, IN, float, aspectRatio, 0.25, IN, osgSim::ScalarBar::ScalarPrinter *, sp, new osgSim::ScalarBar::ScalarPrinter, ____ScalarBar__int__int__ScalarsToColors_P1__C5_std_string_R1__Orientation__float__ScalarPrinter_P1, "Construct a ScalarBar with the supplied parameters. ", - " param numColors Specify the number of colors in the scalar bar. Color interpolation occurs where necessary. numLabels Specify the number of labels in the scalar bar. stc The ScalarsToColors defining the range of scalars and the colors they map to. title The title to be used when displaying the ScalarBar. Specify \"\" for no title. orientation The orientation of the ScalarBar. param aspectRatio The aspect ration (y/x) for the displayed bar. Bear in mind you may want to change this if you change the orientation. sp A ScalarPrinter object for the ScalarBar. For every displayed ScalarBar label, the scalar value will be passed to the ScalarPrinter object to turn it into a string. Users may override the default ScalarPrinter object to map scalars to whatever strings they wish. see Orientation. see ScalarPrinter "); + " param numColors Specify the number of colors in the scalar bar. Color interpolation occurs where necessary. numLabels Specify the number of labels in the scalar bar. stc The ScalarsToColors defining the range of scalars and the colors they map to. title The title to be used when displaying the ScalarBar. Specify \"\" for no title. orientation The orientation of the ScalarBar. param aspectRatio The aspect ration (y/x) for the displayed bar. Bear in mind you may want to change this if you change the orientation. sp A ScalarPrinter object for the ScalarBar. For every displayed ScalarBar label, the scalar value will be passed to the ScalarPrinter object to turn it into a string. Users may override the default ScalarPrinter object to map scalars to whatever strings they wish. see Orientation. see ScalarPrinter "); I_Constructor2(IN, const osgSim::ScalarBar &, rhs, IN, const osg::CopyOp &, co, ____ScalarBar__C5_ScalarBar_R1__C5_osg_CopyOp_R1, "Copy constructor. ", @@ -159,7 +159,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ScalarBar) Properties::NON_VIRTUAL, __void__setScalarPrinter__ScalarPrinter_P1, "Set a ScalarPrinter object for the ScalarBar. ", - "For every displayed ScalarBar label, the scalar value will be passed to the ScalarPrinter object to turn it into a string. Users may override the default ScalarPrinter object to map scalars to whatever strings they wish. ScalarPrinter "); + "For every displayed ScalarBar label, the scalar value will be passed to the ScalarPrinter object to turn it into a string. Users may override the default ScalarPrinter object to map scalars to whatever strings they wish.ScalarPrinter "); I_Method0(const osgSim::ScalarBar::ScalarPrinter *, getScalarPrinter, Properties::NON_VIRTUAL, __C5_ScalarPrinter_P1__getScalarPrinter, diff --git a/src/osgWrappers/osgSim/Sector.cpp b/src/osgWrappers/osgSim/Sector.cpp index 8d14b7cc8..ef3ead9d7 100644 --- a/src/osgWrappers/osgSim/Sector.cpp +++ b/src/osgWrappers/osgSim/Sector.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::AzimElevationSector) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -108,7 +108,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::AzimSector) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -149,7 +149,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ConeSector) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -224,7 +224,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::DirectionalSector) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -377,7 +377,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ElevationSector) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgSim/ShapeAttribute.cpp b/src/osgWrappers/osgSim/ShapeAttribute.cpp index c4c3e8bda..ece313eba 100644 --- a/src/osgWrappers/osgSim/ShapeAttribute.cpp +++ b/src/osgWrappers/osgSim/ShapeAttribute.cpp @@ -38,7 +38,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::ShapeAttributeList) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index beccac126..92afb0e4d 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -29,6 +29,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Vec3Array > >, osgSim::SphereSegment::LineList) + BEGIN_ENUM_REFLECTOR(osgSim::SphereSegment::DrawMask) I_DeclaringFile("osgSim/SphereSegment"); I_EnumLabel(osgSim::SphereSegment::SURFACE); @@ -38,8 +40,6 @@ BEGIN_ENUM_REFLECTOR(osgSim::SphereSegment::DrawMask) I_EnumLabel(osgSim::SphereSegment::ALL); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Vec3Array > >, osgSim::SphereSegment::LineList) - BEGIN_OBJECT_REFLECTOR(osgSim::SphereSegment) I_DeclaringFile("osgSim/SphereSegment"); I_BaseType(osg::Geode); diff --git a/src/osgWrappers/osgSim/VisibilityGroup.cpp b/src/osgWrappers/osgSim/VisibilityGroup.cpp index 9c2b0655e..e5df19b49 100644 --- a/src/osgWrappers/osgSim/VisibilityGroup.cpp +++ b/src/osgWrappers/osgSim/VisibilityGroup.cpp @@ -64,7 +64,7 @@ BEGIN_OBJECT_REFLECTOR(osgSim::VisibilityGroup) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp index 6fe4db982..d351562b3 100644 --- a/src/osgWrappers/osgTerrain/GeometryTechnique.cpp +++ b/src/osgWrappers/osgTerrain/GeometryTechnique.cpp @@ -50,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::GeometryTechnique) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgTerrain/Layer.cpp b/src/osgWrappers/osgTerrain/Layer.cpp index b34095e30..f4c7ca720 100644 --- a/src/osgWrappers/osgTerrain/Layer.cpp +++ b/src/osgWrappers/osgTerrain/Layer.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::CompositeLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -189,7 +189,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ContourLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -274,7 +274,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ContourLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, int, + I_Method1(void, setModifiedCount, IN, unsigned int, value, Properties::VIRTUAL, __void__setModifiedCount__unsigned_int, "Set the modified count value. ", @@ -312,7 +312,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -397,7 +397,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, int, + I_Method1(void, setModifiedCount, IN, unsigned int, value, Properties::VIRTUAL, __void__setModifiedCount__unsigned_int, "Set the modified count value. ", @@ -435,7 +435,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ImageLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -520,7 +520,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ImageLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, int, + I_Method1(void, setModifiedCount, IN, unsigned int, value, Properties::VIRTUAL, __void__setModifiedCount__unsigned_int, "Set the modified count value. ", @@ -556,7 +556,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Layer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -829,7 +829,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ProxyLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -924,7 +924,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ProxyLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, int, + I_Method1(void, setModifiedCount, IN, unsigned int, value, Properties::VIRTUAL, __void__setModifiedCount__unsigned_int, "Set the modified count value. ", @@ -968,7 +968,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::SwitchLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgTerrain/Locator.cpp b/src/osgWrappers/osgTerrain/Locator.cpp index f11c02a8d..54768280f 100644 --- a/src/osgWrappers/osgTerrain/Locator.cpp +++ b/src/osgWrappers/osgTerrain/Locator.cpp @@ -47,7 +47,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Locator) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgTerrain/Terrain.cpp b/src/osgWrappers/osgTerrain/Terrain.cpp index d7a2e7ae9..6a9b3cac8 100644 --- a/src/osgWrappers/osgTerrain/Terrain.cpp +++ b/src/osgWrappers/osgTerrain/Terrain.cpp @@ -65,7 +65,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Terrain) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp index d1ac6d98b..9280885be 100644 --- a/src/osgWrappers/osgTerrain/TerrainTechnique.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTechnique.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTechnique) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgTerrain/TerrainTile.cpp b/src/osgWrappers/osgTerrain/TerrainTile.cpp index 178734b58..034c74947 100644 --- a/src/osgWrappers/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTile.cpp @@ -69,7 +69,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgText/FadeText.cpp b/src/osgWrappers/osgText/FadeText.cpp index 942bf89e0..b92dd9a90 100644 --- a/src/osgWrappers/osgText/FadeText.cpp +++ b/src/osgWrappers/osgText/FadeText.cpp @@ -39,7 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::FadeText) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgText/KerningType.cpp b/src/osgWrappers/osgText/KerningType.cpp index 343fb87f7..d071ffbff 100644 --- a/src/osgWrappers/osgText/KerningType.cpp +++ b/src/osgWrappers/osgText/KerningType.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgText::FontResolution) + BEGIN_ENUM_REFLECTOR(osgText::KerningType) I_DeclaringFile("osgText/KerningType"); I_EnumLabel(osgText::KERNING_DEFAULT); @@ -27,7 +29,5 @@ BEGIN_ENUM_REFLECTOR(osgText::KerningType) I_EnumLabel(osgText::KERNING_NONE); END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgText::FontResolution) - STD_PAIR_REFLECTOR(std::pair< unsigned int COMMA unsigned int >) diff --git a/src/osgWrappers/osgText/String.cpp b/src/osgWrappers/osgText/String.cpp index 3e9831bdb..a397cfdaf 100644 --- a/src/osgWrappers/osgText/String.cpp +++ b/src/osgWrappers/osgText/String.cpp @@ -20,6 +20,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(osgText::VectorUInt, osgText::String::vector_type) + BEGIN_ENUM_REFLECTOR(osgText::String::Encoding) I_DeclaringFile("osgText/String"); I_EnumLabel(osgText::String::ENCODING_UNDEFINED); @@ -34,8 +36,6 @@ BEGIN_ENUM_REFLECTOR(osgText::String::Encoding) I_EnumLabel(osgText::String::ENCODING_SIGNATURE); END_REFLECTOR -TYPE_NAME_ALIAS(osgText::VectorUInt, osgText::String::vector_type) - BEGIN_OBJECT_REFLECTOR(osgText::String) I_DeclaringFile("osgText/String"); I_BaseType(osgText::VectorUInt); diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index a7d916ec6..e446843a7 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -28,6 +28,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA osgText::Text::GlyphQuads >, osgText::Text::TextureGlyphQuadMap) + BEGIN_ENUM_REFLECTOR(osgText::Text::BackdropType) I_DeclaringFile("osgText/Text"); I_EnumLabel(osgText::Text::DROP_SHADOW_BOTTOM_RIGHT); @@ -57,8 +59,6 @@ BEGIN_ENUM_REFLECTOR(osgText::Text::ColorGradientMode) I_EnumLabel(osgText::Text::OVERALL); END_REFLECTOR -TYPE_NAME_ALIAS(std::map< osg::ref_ptr< osgText::Font::GlyphTexture > COMMA osgText::Text::GlyphQuads >, osgText::Text::TextureGlyphQuadMap) - BEGIN_OBJECT_REFLECTOR(osgText::Text) I_DeclaringFile("osgText/Text"); I_BaseType(osgText::TextBase); @@ -74,7 +74,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgText/Text3D.cpp b/src/osgWrappers/osgText/Text3D.cpp index b8e294c15..4f2308cf5 100644 --- a/src/osgWrappers/osgText/Text3D.cpp +++ b/src/osgWrappers/osgText/Text3D.cpp @@ -49,7 +49,7 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text3D) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -92,8 +92,8 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text3D) I_MethodWithDefaults1(void, setFont, IN, osgText::Font3D *, font, 0, Properties::NON_VIRTUAL, __void__setFont__Font3D_P1, - "Get the wall StateSet. ", - "Get or create the wall StateSet Set the wall StateSet Get the back StateSet Get or create the back StateSet Set the back StateSet Set the Font to use to render the text. setFont(0) sets the use of the default font. "); + "Set the Font to use to render the text. ", + "setFont(0) sets the use of the default font. "); I_Method1(void, setFont, IN, osg::ref_ptr< osgText::Font3D >, font, Properties::NON_VIRTUAL, __void__setFont__osg_ref_ptrT1_Font3D_, @@ -127,13 +127,13 @@ BEGIN_OBJECT_REFLECTOR(osgText::Text3D) I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x, Properties::VIRTUAL, __bool__supports__C5_osg_PrimitiveFunctor_R1, - "accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has. ", - "return true, osgText::Text does support accept(PrimitiveFunctor&) . "); + "return true, osgText::Text does support accept(PrimitiveFunctor&) . ", + ""); I_Method1(void, setThreadSafeRefUnref, IN, bool, threadSafe, Properties::VIRTUAL, __void__setThreadSafeRefUnref__bool, - "accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has. ", - "Set whether to use a mutex to ensure ref() and unref() are thread safe. "); + "Set whether to use a mutex to ensure ref() and unref() are thread safe. ", + ""); I_Method1(void, resizeGLObjectBuffers, IN, unsigned int, maxSize, Properties::VIRTUAL, __void__resizeGLObjectBuffers__unsigned_int, diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index f1c9fda6c..b18eebba3 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -93,17 +93,17 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) __osg_Vec3__getViewPoint, "Get the view point in local coordinates. ", "Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. "); - I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, + I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale, Properties::VIRTUAL, __float__getDistanceToEyePoint__C5_osg_Vec3_R1__bool, "Get the distance from a point to the eye point, distance value in local coordinate system. ", "Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. If the getDistanceFromEyePoint(pos) is not implemented then a default value of 0.0 is returned. "); - I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, + I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale, Properties::VIRTUAL, __float__getDistanceFromEyePoint__C5_osg_Vec3_R1__bool, "Get the distance of a point from the eye point, distance value in the eye coordinate system. ", "Note, not all NodeVisitor implement this method, it is mainly cull visitors which will implement. If the getDistanceFromEyePoint(pos) is not implemented than a default value of 0.0 is returned. "); - I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, x, IN, bool, x, + I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, pos, IN, bool, withLODScale, Properties::VIRTUAL, __float__getDistanceToViewPoint__C5_osg_Vec3_R1__bool, "Get the distance from a point to the view point, distance value in local coordinate system. ", diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index 0bc35261e..a211a4293 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -33,8 +33,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayConstraint) I_Method3(void, addtriangle, IN, int, i1, IN, int, i2, IN, int, i3, Properties::NON_VIRTUAL, __void__addtriangle__int__int__int, - "Each primitiveset is a list of vertices which may be closed by joining up to its start to make a loop. ", - "Constraints should be simple lines, not crossing themselves. Constraints which cross other constraints can cause difficulties - see the example for methods of dealing with them. collect up indices of triangle from delaunay triangles. The delaunay triangles inside the DelaunayConstraint area can be used to fill the area or generate geometry that terrain follows the area in some way. These triangles can form a canopy or a field. "); + "collect up indices of triangle from delaunay triangles. ", + "The delaunay triangles inside the DelaunayConstraint area can be used to fill the area or generate geometry that terrain follows the area in some way. These triangles can form a canopy or a field. "); I_Method0(const osg::DrawElementsUInt *, getTriangles, Properties::NON_VIRTUAL, __C5_osg_DrawElementsUInt_P1__getTriangles, diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index 7b8d6d0f3..135b58876 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -41,6 +41,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsOperation) ""); END_REFLECTOR +TYPE_NAME_ALIAS(unsigned int, osgUtil::GLObjectsVisitor::Mode) + BEGIN_ENUM_REFLECTOR(osgUtil::GLObjectsVisitor::ModeValues) I_DeclaringFile("osgUtil/GLObjectsVisitor"); I_EnumLabel(osgUtil::GLObjectsVisitor::SWITCH_ON_DISPLAY_LISTS); @@ -54,8 +56,6 @@ BEGIN_ENUM_REFLECTOR(osgUtil::GLObjectsVisitor::ModeValues) I_EnumLabel(osgUtil::GLObjectsVisitor::CHECK_BLACK_LISTED_MODES); END_REFLECTOR -TYPE_NAME_ALIAS(unsigned int, osgUtil::GLObjectsVisitor::Mode) - BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) I_DeclaringFile("osgUtil/GLObjectsVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp index 442a2fb9f..d4ed30690 100644 --- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp @@ -188,16 +188,16 @@ BEGIN_VALUE_REFLECTOR(osgUtil::Hit) I_PublicMemberProperty(osg::Vec3, _intersectNormal); END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osgUtil::Hit >, osgUtil::IntersectVisitor::HitList) + +TYPE_NAME_ALIAS(std::map< const osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >, osgUtil::IntersectVisitor::LineSegmentHitListMap) + BEGIN_ENUM_REFLECTOR(osgUtil::IntersectVisitor::LODSelectionMode) I_DeclaringFile("osgUtil/IntersectVisitor"); I_EnumLabel(osgUtil::IntersectVisitor::USE_HIGHEST_LEVEL_OF_DETAIL); I_EnumLabel(osgUtil::IntersectVisitor::USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osgUtil::Hit >, osgUtil::IntersectVisitor::HitList) - -TYPE_NAME_ALIAS(std::map< const osg::LineSegment * COMMA osgUtil::IntersectVisitor::HitList >, osgUtil::IntersectVisitor::LineSegmentHitListMap) - BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectVisitor) I_DeclaringFile("osgUtil/IntersectVisitor"); I_BaseType(osg::NodeVisitor); diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index dbbbb0bbb..26a9fb0ad 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -36,6 +36,12 @@ BEGIN_VALUE_REFLECTOR(osgUtil::RegisterRenderBinProxy) ""); END_REFLECTOR +TYPE_NAME_ALIAS(std::vector< osgUtil::RenderLeaf * >, osgUtil::RenderBin::RenderLeafList) + +TYPE_NAME_ALIAS(std::vector< osgUtil::StateGraph * >, osgUtil::RenderBin::StateGraphList) + +TYPE_NAME_ALIAS(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >, osgUtil::RenderBin::RenderBinList) + BEGIN_ENUM_REFLECTOR(osgUtil::RenderBin::SortMode) I_DeclaringFile("osgUtil/RenderBin"); I_EnumLabel(osgUtil::RenderBin::SORT_BY_STATE); @@ -44,39 +50,9 @@ BEGIN_ENUM_REFLECTOR(osgUtil::RenderBin::SortMode) I_EnumLabel(osgUtil::RenderBin::SORT_BACK_TO_FRONT); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osgUtil::RenderLeaf * >, osgUtil::RenderBin::RenderLeafList) - -TYPE_NAME_ALIAS(std::vector< osgUtil::StateGraph * >, osgUtil::RenderBin::StateGraphList) - -TYPE_NAME_ALIAS(std::map< int COMMA osg::ref_ptr< osgUtil::RenderBin > >, osgUtil::RenderBin::RenderBinList) - BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) I_DeclaringFile("osgUtil/RenderBin"); I_BaseType(osg::Object); - I_StaticMethod1(osgUtil::RenderBin *, createRenderBin, IN, const std::string &, binName, - __RenderBin_P1__createRenderBin__C5_std_string_R1_S, - "", - ""); - I_StaticMethod1(osgUtil::RenderBin *, getRenderBinPrototype, IN, const std::string &, binName, - __RenderBin_P1__getRenderBinPrototype__C5_std_string_R1_S, - "", - ""); - I_StaticMethod2(void, addRenderBinPrototype, IN, const std::string &, binName, IN, osgUtil::RenderBin *, proto, - __void__addRenderBinPrototype__C5_std_string_R1__RenderBin_P1_S, - "", - ""); - I_StaticMethod1(void, removeRenderBinPrototype, IN, osgUtil::RenderBin *, proto, - __void__removeRenderBinPrototype__RenderBin_P1_S, - "", - ""); - I_StaticMethod1(void, setDefaultRenderBinSortMode, IN, osgUtil::RenderBin::SortMode, mode, - __void__setDefaultRenderBinSortMode__SortMode_S, - "", - ""); - I_StaticMethod0(osgUtil::RenderBin::SortMode, getDefaultRenderBinSortMode, - __SortMode__getDefaultRenderBinSortMode_S, - "", - ""); I_Constructor0(____RenderBin, "", ""); @@ -94,7 +70,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -294,6 +270,30 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) __void__copyLeavesFromStateGraphListToRenderLeafList, "", ""); + I_StaticMethod1(osgUtil::RenderBin *, createRenderBin, IN, const std::string &, binName, + __RenderBin_P1__createRenderBin__C5_std_string_R1_S, + "", + ""); + I_StaticMethod1(osgUtil::RenderBin *, getRenderBinPrototype, IN, const std::string &, binName, + __RenderBin_P1__getRenderBinPrototype__C5_std_string_R1_S, + "", + ""); + I_StaticMethod2(void, addRenderBinPrototype, IN, const std::string &, binName, IN, osgUtil::RenderBin *, proto, + __void__addRenderBinPrototype__C5_std_string_R1__RenderBin_P1_S, + "", + ""); + I_StaticMethod1(void, removeRenderBinPrototype, IN, osgUtil::RenderBin *, proto, + __void__removeRenderBinPrototype__RenderBin_P1_S, + "", + ""); + I_StaticMethod1(void, setDefaultRenderBinSortMode, IN, osgUtil::RenderBin::SortMode, mode, + __void__setDefaultRenderBinSortMode__SortMode_S, + "", + ""); + I_StaticMethod0(osgUtil::RenderBin::SortMode, getDefaultRenderBinSortMode, + __SortMode__getDefaultRenderBinSortMode_S, + "", + ""); I_SimpleProperty(int, BinNum, __int__getBinNum, 0); diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index aaaa19750..e80331daa 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -57,7 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 4d4f4f2e4..784f1f648 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -43,6 +43,8 @@ #undef OUT #endif +TYPE_NAME_ALIAS(osgUtil::SceneView::Options, osgUtil::SceneView::LightingMode) + BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::Options) I_DeclaringFile("osgUtil/SceneView"); I_EnumLabel(osgUtil::SceneView::NO_SCENEVIEW_LIGHT); @@ -71,8 +73,6 @@ BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::FusionDistanceMode) I_EnumLabel(osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE); END_REFLECTOR -TYPE_NAME_ALIAS(osgUtil::SceneView::Options, osgUtil::SceneView::LightingMode) - BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) I_DeclaringFile("osgUtil/SceneView"); I_BaseType(osg::Object); @@ -91,7 +91,7 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgUtil/Simplifier.cpp b/src/osgWrappers/osgUtil/Simplifier.cpp index d0ea7f382..28ff1dc7a 100644 --- a/src/osgWrappers/osgUtil/Simplifier.cpp +++ b/src/osgWrappers/osgUtil/Simplifier.cpp @@ -129,8 +129,8 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier) I_Method2(void, simplify, IN, osg::Geometry &, geometry, IN, const osgUtil::Simplifier::IndexList &, protectedPoints, Properties::NON_VIRTUAL, __void__simplify__osg_Geometry_R1__C5_IndexList_R1, - "a list of point indices ", - "simply the geometry, whilst protecting key points from being modified. "); + "simply the geometry, whilst protecting key points from being modified. ", + ""); I_SimpleProperty(osgUtil::Simplifier::ContinueSimplificationCallback *, ContinueSimplificationCallback, __ContinueSimplificationCallback_P1__getContinueSimplificationCallback, __void__setContinueSimplificationCallback__ContinueSimplificationCallback_P1); diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index 7ba071784..5a9ede41f 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -33,6 +33,12 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgUtil::Statistics::PrimitivePair) + +TYPE_NAME_ALIAS(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >, osgUtil::Statistics::PrimitiveValueMap) + +TYPE_NAME_ALIAS(std::map< GLenum COMMA unsigned int >, osgUtil::Statistics::PrimitiveCountMap) + BEGIN_ENUM_REFLECTOR(osgUtil::Statistics::StatsType) I_DeclaringFile("osgUtil/Statistics"); I_EnumLabel(osgUtil::Statistics::STAT_NONE); @@ -45,12 +51,6 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Statistics::StatsType) I_EnumLabel(osgUtil::Statistics::STAT_RESTART); END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< unsigned int COMMA unsigned int >, osgUtil::Statistics::PrimitivePair) - -TYPE_NAME_ALIAS(std::map< GLenum COMMA osgUtil::Statistics::PrimitivePair >, osgUtil::Statistics::PrimitiveValueMap) - -TYPE_NAME_ALIAS(std::map< GLenum COMMA unsigned int >, osgUtil::Statistics::PrimitiveCountMap) - BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) I_DeclaringFile("osgUtil/Statistics"); I_BaseType(osg::PrimitiveFunctor); @@ -67,52 +67,52 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) __void__setType__StatsType, "", ""); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, vertices, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, x, Properties::VIRTUAL, __void__setVertexArray__unsigned_int__C5_osg_Vec3_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, vertices, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, x, Properties::VIRTUAL, __void__setVertexArray__unsigned_int__C5_osg_Vec2_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, vertices, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, x, Properties::VIRTUAL, __void__setVertexArray__unsigned_int__C5_osg_Vec4_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3d *, vertices, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3d *, x, Properties::VIRTUAL, __void__setVertexArray__unsigned_int__C5_osg_Vec3d_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2d *, vertices, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2d *, x, Properties::VIRTUAL, __void__setVertexArray__unsigned_int__C5_osg_Vec2d_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); - I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4d *, vertices, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4d *, x, Properties::VIRTUAL, __void__setVertexArray__unsigned_int__C5_osg_Vec4d_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); - I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count, + I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, x, IN, GLsizei, count, Properties::VIRTUAL, __void__drawArrays__GLenum__GLint__GLsizei, "Mimics the OpenGL glDrawArrays() function. ", ""); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, indices, + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, x, Properties::VIRTUAL, __void__drawElements__GLenum__GLsizei__C5_GLubyte_P1, "Mimics the OpenGL glDrawElements() function. ", ""); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, indices, + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, x, Properties::VIRTUAL, __void__drawElements__GLenum__GLsizei__C5_GLushort_P1, "Mimics the OpenGL glDrawElements() function. ", ""); - I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, indices, + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, x, Properties::VIRTUAL, __void__drawElements__GLenum__GLsizei__C5_GLuint_P1, "Mimics the OpenGL glDrawElements() function. ", @@ -127,32 +127,32 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) __void__vertex, "", ""); - I_Method3(void, vertex, IN, float, x, IN, float, y, IN, float, z, + I_Method3(void, vertex, IN, float, x, IN, float, x, IN, float, x, Properties::VIRTUAL, __void__vertex__float__float__float, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method1(void, vertex, IN, const osg::Vec3 &, vert, + I_Method1(void, vertex, IN, const osg::Vec3 &, x, Properties::VIRTUAL, __void__vertex__C5_osg_Vec3_R1, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method1(void, vertex, IN, const osg::Vec2 &, vert, + I_Method1(void, vertex, IN, const osg::Vec2 &, x, Properties::VIRTUAL, __void__vertex__C5_osg_Vec2_R1, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method1(void, vertex, IN, const osg::Vec4 &, vert, + I_Method1(void, vertex, IN, const osg::Vec4 &, x, Properties::VIRTUAL, __void__vertex__C5_osg_Vec4_R1, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method2(void, vertex, IN, float, x, IN, float, y, + I_Method2(void, vertex, IN, float, x, IN, float, x, Properties::VIRTUAL, __void__vertex__float__float, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method4(void, vertex, IN, float, x, IN, float, y, IN, float, z, IN, float, w, + I_Method4(void, vertex, IN, float, x, IN, float, x, IN, float, x, IN, float, x, Properties::VIRTUAL, __void__vertex__float__float__float__float, "Mimics the OpenGL glVertex() \"family of functions\". ", diff --git a/src/osgWrappers/osgUtil/Tessellator.cpp b/src/osgWrappers/osgUtil/Tessellator.cpp index b2c63d3fb..51ec8a7b8 100644 --- a/src/osgWrappers/osgUtil/Tessellator.cpp +++ b/src/osgWrappers/osgUtil/Tessellator.cpp @@ -22,6 +22,10 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tessellator::VertexPointList) + +TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Tessellator::Prim > >, osgUtil::Tessellator::PrimList) + BEGIN_ENUM_REFLECTOR(osgUtil::Tessellator::WindingType) I_DeclaringFile("osgUtil/Tessellator"); I_EnumLabel(osgUtil::Tessellator::TESS_WINDING_ODD); @@ -38,10 +42,6 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Tessellator::TessellationType) I_EnumLabel(osgUtil::Tessellator::TESS_TYPE_POLYGONS); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tessellator::VertexPointList) - -TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Tessellator::Prim > >, osgUtil::Tessellator::PrimList) - BEGIN_OBJECT_REFLECTOR(osgUtil::Tessellator) I_DeclaringFile("osgUtil/Tessellator"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp index 83af88df4..416fd3974 100644 --- a/src/osgWrappers/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp @@ -51,7 +51,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/osgViewer/GraphicsWindow.cpp index d5b66da1b..95ad1817e 100644 --- a/src/osgWrappers/osgViewer/GraphicsWindow.cpp +++ b/src/osgWrappers/osgViewer/GraphicsWindow.cpp @@ -159,8 +159,8 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) I_Method0(bool, valid, Properties::VIRTUAL, __bool__valid, - "Create a new mouse cursor from the usual bitmap data. ", - "Return whether a valid and usable GraphicsContext has been created. "); + "Return whether a valid and usable GraphicsContext has been created. ", + ""); I_Method0(bool, realizeImplementation, Properties::VIRTUAL, __bool__realizeImplementation, @@ -206,12 +206,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindow) __void__requestRedraw, "requestRedraw() requests a single redraw. ", ""); - I_MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, needed, true, + I_MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, x, true, Properties::VIRTUAL, __void__requestContinuousUpdate__bool, "requestContinousUpdate(bool) is for en/disabling a throw or idle callback to be requested by a GUIEventHandler (typically a MatrixManipulator, though other GUIEventHandler's may also provide functionality). ", "GUI toolkits can respond to this immediately by registering an idle/timed callback, or can delay setting the callback and update at their own leisure. "); - I_Method2(void, requestWarpPointer, IN, float, x, IN, float, y, + I_Method2(void, requestWarpPointer, IN, float, x, IN, float, x, Properties::VIRTUAL, __void__requestWarpPointer__float__float, "requestWarpPointer(int,int) is requesting a repositioning of the mouse pointer to a specified x,y location on the window. ", @@ -268,8 +268,8 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::GraphicsWindowEmbedded) I_Method0(bool, valid, Properties::VIRTUAL, __bool__valid, - "Create a new mouse cursor from the usual bitmap data. ", - "Return whether a valid and usable GraphicsContext has been created. "); + "Return whether a valid and usable GraphicsContext has been created. ", + ""); I_Method0(bool, realizeImplementation, Properties::VIRTUAL, __bool__realizeImplementation, diff --git a/src/osgWrappers/osgViewer/Scene.cpp b/src/osgWrappers/osgViewer/Scene.cpp index 61177bf17..4c69f32ca 100644 --- a/src/osgWrappers/osgViewer/Scene.cpp +++ b/src/osgWrappers/osgViewer/Scene.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -71,6 +72,11 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) __C5_osgDB_ImagePager_P1__getImagePager, "", ""); + I_Method1(void, updateSceneGraph, IN, osg::NodeVisitor &, updateVisitor, + Properties::NON_VIRTUAL, + __void__updateSceneGraph__osg_NodeVisitor_R1, + "", + ""); I_StaticMethod1(osgViewer::Scene *, getScene, IN, osg::Node *, node, __Scene_P1__getScene__osg_Node_P1_S, "Get the Scene object that has the specified node assigned to it. ", diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 02777c02d..c5673b09a 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -56,7 +56,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::View) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index 20ab1041b..7f02ce969 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -53,7 +53,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgViewer/ViewerBase.cpp b/src/osgWrappers/osgViewer/ViewerBase.cpp index 07d0dd5b9..28de0a805 100644 --- a/src/osgWrappers/osgViewer/ViewerBase.cpp +++ b/src/osgWrappers/osgViewer/ViewerBase.cpp @@ -28,6 +28,20 @@ #include +TYPE_NAME_ALIAS(std::vector< osg::Camera * >, osgViewer::ViewerBase::Cameras) + +TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::ViewerBase::Contexts) + +TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::ViewerBase::Windows) + +TYPE_NAME_ALIAS(std::vector< OpenThreads::Thread * >, osgViewer::ViewerBase::Threads) + +TYPE_NAME_ALIAS(std::vector< osg::OperationThread * >, osgViewer::ViewerBase::OperationThreads) + +TYPE_NAME_ALIAS(std::vector< osgViewer::Scene * >, osgViewer::ViewerBase::Scenes) + +TYPE_NAME_ALIAS(std::vector< osgViewer::View * >, osgViewer::ViewerBase::Views) + BEGIN_ENUM_REFLECTOR(osgViewer::ViewerBase::ThreadingModel) I_DeclaringFile("osgViewer/ViewerBase"); I_EnumLabel(osgViewer::ViewerBase::SingleThreaded); @@ -45,20 +59,6 @@ BEGIN_ENUM_REFLECTOR(osgViewer::ViewerBase::BarrierPosition) I_EnumLabel(osgViewer::ViewerBase::AfterSwapBuffers); END_REFLECTOR -TYPE_NAME_ALIAS(std::vector< osg::Camera * >, osgViewer::ViewerBase::Cameras) - -TYPE_NAME_ALIAS(std::vector< osg::GraphicsContext * >, osgViewer::ViewerBase::Contexts) - -TYPE_NAME_ALIAS(std::vector< osgViewer::GraphicsWindow * >, osgViewer::ViewerBase::Windows) - -TYPE_NAME_ALIAS(std::vector< OpenThreads::Thread * >, osgViewer::ViewerBase::Threads) - -TYPE_NAME_ALIAS(std::vector< osg::OperationThread * >, osgViewer::ViewerBase::OperationThreads) - -TYPE_NAME_ALIAS(std::vector< osgViewer::Scene * >, osgViewer::ViewerBase::Scenes) - -TYPE_NAME_ALIAS(std::vector< osgViewer::View * >, osgViewer::ViewerBase::Views) - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::ViewerBase) I_DeclaringFile("osgViewer/ViewerBase"); I_VirtualBaseType(osg::Object); diff --git a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp index af20259f1..c44bd98e6 100644 --- a/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgViewer/ViewerEventHandlers.cpp @@ -79,7 +79,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) __C5_osg_Camera_P1__getCamera, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Deprecated, Handle events, return true if handled, false otherwise. ", @@ -126,7 +126,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::InteractiveImageHandler) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -146,7 +146,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::InteractiveImageHandler) __C5_char_P1__className, "return the name of the object's class type. ", "Must be defined by derived classes. "); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, nv, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, "Handle events, return true if handled, false otherwise. ", @@ -197,7 +197,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::LODScaleHandler) __int__getKeyEventDecreaseLODScale, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Deprecated, Handle events, return true if handled, false otherwise. ", @@ -247,12 +247,12 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::RecordCameraPathHandler) __void__setAutoIncrementFilename__bool, "", ""); - I_Method1(void, getUsage, IN, osg::ApplicationUsage &, x, + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, usage, Properties::VIRTUAL, __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Deprecated, Handle events, return true if handled, false otherwise. ", @@ -296,7 +296,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::ScreenCaptureHandler) __CaptureOperation_P1__getCaptureOperation, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Deprecated, Handle events, return true if handled, false otherwise. ", @@ -417,7 +417,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) __C5_osg_Camera_P1__getCamera, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Deprecated, Handle events, return true if handled, false otherwise. ", @@ -540,7 +540,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::ThreadingHandler) __bool__getChangeEndBarrierPosition, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Deprecated, Handle events, return true if handled, false otherwise. ", @@ -620,7 +620,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::WindowSizeHandler) __bool__getChangeWindowedResolution, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Deprecated, Handle events, return true if handled, false otherwise. ", diff --git a/src/osgWrappers/osgViewer/api/Cocoa/GraphicsHandleCocoa.cpp b/src/osgWrappers/osgViewer/api/Cocoa/GraphicsHandleCocoa.cpp new file mode 100644 index 000000000..f85b876ef --- /dev/null +++ b/src/osgWrappers/osgViewer/api/Cocoa/GraphicsHandleCocoa.cpp @@ -0,0 +1,42 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_VALUE_REFLECTOR(osgViewer::GraphicsHandleCocoa) + I_DeclaringFile("osgViewer/api/Cocoa/GraphicsHandleCocoa"); + I_Constructor0(____GraphicsHandleCocoa, + "", + ""); + I_Method1(void, setNSOpenGLContext, IN, NSOpenGLContext *, context, + Properties::NON_VIRTUAL, + __void__setNSOpenGLContext__NSOpenGLContext_P1, + "Set native AGL graphics context. ", + ""); + I_Method0(NSOpenGLContext *, getNSOpenGLContext, + Properties::NON_VIRTUAL, + __NSOpenGLContext_P1__getNSOpenGLContext, + "Get native AGL graphics context. ", + ""); + I_SimpleProperty(NSOpenGLContext *, NSOpenGLContext, + __NSOpenGLContext_P1__getNSOpenGLContext, + __void__setNSOpenGLContext__NSOpenGLContext_P1); +END_REFLECTOR + diff --git a/src/osgWrappers/osgViewer/api/Win32/PixelBufferWin32.cpp b/src/osgWrappers/osgViewer/api/Win32/PixelBufferWin32.cpp new file mode 100644 index 000000000..be3e7034f --- /dev/null +++ b/src/osgWrappers/osgViewer/api/Win32/PixelBufferWin32.cpp @@ -0,0 +1,124 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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(osgViewer::PixelBufferWin32) + I_DeclaringFile("osgViewer/api/Win32/PixelBufferWin32"); + I_BaseType(osg::GraphicsContext); + I_Constructor1(IN, osg::GraphicsContext::Traits *, traits, + Properties::NON_EXPLICIT, + ____PixelBufferWin32__osg_GraphicsContext_Traits_P1, + "", + ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, object, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_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_Method0(bool, valid, + Properties::VIRTUAL, + __bool__valid, + "Return whether a valid and usable GraphicsContext has been created. ", + ""); + I_Method0(bool, realizeImplementation, + Properties::VIRTUAL, + __bool__realizeImplementation, + "Realize the GraphicsContext. ", + ""); + I_Method0(bool, isRealizedImplementation, + Properties::VIRTUAL, + __bool__isRealizedImplementation, + "Return true if the graphics context has been realized and is ready to use. ", + ""); + I_Method0(void, closeImplementation, + Properties::VIRTUAL, + __void__closeImplementation, + "Close the graphics context. ", + ""); + I_Method0(bool, makeCurrentImplementation, + Properties::VIRTUAL, + __bool__makeCurrentImplementation, + "Make this graphics context current. ", + ""); + I_Method1(bool, makeContextCurrentImplementation, IN, osg::GraphicsContext *, x, + Properties::VIRTUAL, + __bool__makeContextCurrentImplementation__GraphicsContext_P1, + "", + ""); + I_Method0(bool, releaseContextImplementation, + Properties::VIRTUAL, + __bool__releaseContextImplementation, + "Release the graphics context. ", + ""); + I_Method0(void, swapBuffersImplementation, + Properties::VIRTUAL, + __void__swapBuffersImplementation, + "Swap the front and back buffers. ", + ""); + I_Method0(HWND, getHWND, + Properties::NON_VIRTUAL, + __HWND__getHWND, + "Get native window. ", + ""); + I_Method0(HDC, getHDC, + Properties::NON_VIRTUAL, + __HDC__getHDC, + "", + ""); + I_Method0(HGLRC, getWGLContext, + Properties::NON_VIRTUAL, + __HGLRC__getWGLContext, + "Get native OpenGL graphics context. ", + ""); + I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, x, + Properties::VIRTUAL, + __void__bindPBufferToTextureImplementation__GLenum, + "Pure virtual, Bind the graphics context to associated texture implementation. ", + "Pure virtual - must be implemented by concrete implementations of GraphicsContext. "); + I_ProtectedMethod0(void, init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__init, + "", + ""); + I_SimpleProperty(HDC, HDC, + __HDC__getHDC, + 0); + I_SimpleProperty(HWND, HWND, + __HWND__getHWND, + 0); + I_SimpleProperty(HGLRC, WGLContext, + __HGLRC__getWGLContext, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgViewer/api/X11/PixelBufferX11.cpp b/src/osgWrappers/osgViewer/api/X11/PixelBufferX11.cpp new file mode 100644 index 000000000..90462e01b --- /dev/null +++ b/src/osgWrappers/osgViewer/api/X11/PixelBufferX11.cpp @@ -0,0 +1,130 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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(osgViewer::PixelBufferX11) + I_DeclaringFile("osgViewer/api/X11/PixelBufferX11"); + I_BaseType(osg::GraphicsContext); + I_Constructor1(IN, osg::GraphicsContext::Traits *, traits, + Properties::NON_EXPLICIT, + ____PixelBufferX11__osg_GraphicsContext_Traits_P1, + "", + ""); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, object, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_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_Method0(bool, valid, + Properties::VIRTUAL, + __bool__valid, + "Return whether a valid and usable GraphicsContext has been created. ", + ""); + I_Method0(bool, realizeImplementation, + Properties::VIRTUAL, + __bool__realizeImplementation, + "Realise the GraphicsContext. ", + ""); + I_Method0(bool, isRealizedImplementation, + Properties::VIRTUAL, + __bool__isRealizedImplementation, + "Return true if the graphics context has been realised and is ready to use. ", + ""); + I_Method0(void, closeImplementation, + Properties::VIRTUAL, + __void__closeImplementation, + "Close the graphics context. ", + ""); + I_Method0(bool, makeCurrentImplementation, + Properties::VIRTUAL, + __bool__makeCurrentImplementation, + "Make this graphics context current. ", + ""); + I_Method1(bool, makeContextCurrentImplementation, IN, osg::GraphicsContext *, readContext, + Properties::VIRTUAL, + __bool__makeContextCurrentImplementation__osg_GraphicsContext_P1, + "Make this graphics context current with specified read context implementation. ", + ""); + I_Method0(bool, releaseContextImplementation, + Properties::VIRTUAL, + __bool__releaseContextImplementation, + "Release the graphics context. ", + ""); + I_Method1(void, bindPBufferToTextureImplementation, IN, GLenum, buffer, + Properties::VIRTUAL, + __void__bindPBufferToTextureImplementation__GLenum, + "Bind the graphics context to associated texture implementation. ", + ""); + I_Method0(void, swapBuffersImplementation, + Properties::VIRTUAL, + __void__swapBuffersImplementation, + "Swap the front and back buffers. ", + ""); + I_Method0(Display *, getDisplay, + Properties::NON_VIRTUAL, + __Display_P1__getDisplay, + "", + ""); + I_Method0(GLXPbuffer &, getPbuffer, + Properties::NON_VIRTUAL, + __GLXPbuffer_R1__getPbuffer, + "", + ""); + I_Method0(GLXContext &, getGLXContext, + Properties::NON_VIRTUAL, + __GLXContext_R1__getGLXContext, + "", + ""); + I_ProtectedMethod0(bool, createVisualInfo, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__createVisualInfo, + "", + ""); + I_ProtectedMethod0(void, init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__init, + "", + ""); + I_SimpleProperty(Display *, Display, + __Display_P1__getDisplay, + 0); + I_SimpleProperty(GLXContext &, GLXContext, + __GLXContext_R1__getGLXContext, + 0); + I_SimpleProperty(GLXPbuffer &, Pbuffer, + __GLXPbuffer_R1__getPbuffer, + 0); +END_REFLECTOR + diff --git a/src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp b/src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp index 64725a996..4ea11ad4c 100644 --- a/src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp +++ b/src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::FixedFunctionTechnique) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgVolume/Layer.cpp b/src/osgWrappers/osgVolume/Layer.cpp index 4f5443ac6..38c7ae443 100644 --- a/src/osgWrappers/osgVolume/Layer.cpp +++ b/src/osgWrappers/osgVolume/Layer.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::CompositeLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -149,7 +149,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::ImageLayer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -229,7 +229,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::ImageLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, int, + I_Method1(void, setModifiedCount, IN, unsigned int, value, Properties::VIRTUAL, __void__setModifiedCount__unsigned_int, "Set the modified count value. ", @@ -265,7 +265,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Layer) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgVolume/Locator.cpp b/src/osgWrappers/osgVolume/Locator.cpp index d473361a8..5270f9b74 100644 --- a/src/osgWrappers/osgVolume/Locator.cpp +++ b/src/osgWrappers/osgVolume/Locator.cpp @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Locator) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgVolume/Property.cpp b/src/osgWrappers/osgVolume/Property.cpp index 75791cab7..8e3675f71 100644 --- a/src/osgWrappers/osgVolume/Property.cpp +++ b/src/osgWrappers/osgVolume/Property.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::AlphaFuncProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -172,7 +172,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::CompositeProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -255,7 +255,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::IsoSurfaceProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -297,7 +297,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::LightingProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -339,7 +339,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::MaximumIntensityProjectionProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -381,7 +381,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Property) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -424,7 +424,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::PropertyAdjustmentCallback) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -494,7 +494,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::PropertyAdjustmentCallback) __int__getKeyEventActivatesAlphaFuncAdjustment, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, x, IN, osg::Object *, object, IN, osg::NodeVisitor *, x, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, "Handle events, return true if handled, false otherwise. ", @@ -615,7 +615,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::SampleDensityProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -658,7 +658,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::ScalarProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -729,7 +729,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::SwitchProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -786,7 +786,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::TransferFunctionProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -848,7 +848,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::TransparencyProperty) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgVolume/RayTracedTechnique.cpp b/src/osgWrappers/osgVolume/RayTracedTechnique.cpp index 70b4c54cb..9910d6870 100644 --- a/src/osgWrappers/osgVolume/RayTracedTechnique.cpp +++ b/src/osgWrappers/osgVolume/RayTracedTechnique.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::RayTracedTechnique) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgVolume/Volume.cpp b/src/osgWrappers/osgVolume/Volume.cpp index 8cc6af978..6a180bc39 100644 --- a/src/osgWrappers/osgVolume/Volume.cpp +++ b/src/osgWrappers/osgVolume/Volume.cpp @@ -65,7 +65,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::Volume) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgVolume/VolumeTechnique.cpp b/src/osgWrappers/osgVolume/VolumeTechnique.cpp index e2bcd4a9c..43e60fab4 100644 --- a/src/osgWrappers/osgVolume/VolumeTechnique.cpp +++ b/src/osgWrappers/osgVolume/VolumeTechnique.cpp @@ -41,7 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTechnique) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgVolume/VolumeTile.cpp b/src/osgWrappers/osgVolume/VolumeTile.cpp index 63a7c5c25..b772edcd3 100644 --- a/src/osgWrappers/osgVolume/VolumeTile.cpp +++ b/src/osgWrappers/osgVolume/VolumeTile.cpp @@ -88,7 +88,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::VolumeTile) __void__accept__osg_NodeVisitor_R1, "Visitor Pattern : calls the apply method of a NodeVisitor with this node's type. ", ""); - I_Method1(void, traverse, IN, osg::NodeVisitor &, x, + I_Method1(void, traverse, IN, osg::NodeVisitor &, nv, Properties::VIRTUAL, __void__traverse__osg_NodeVisitor_R1, "Traverse downwards : calls children's accept method with NodeVisitor. ", diff --git a/src/osgWrappers/osgWidget/Browser.cpp b/src/osgWrappers/osgWidget/Browser.cpp index 0acb9f4b1..ca33fd669 100644 --- a/src/osgWrappers/osgWidget/Browser.cpp +++ b/src/osgWrappers/osgWidget/Browser.cpp @@ -64,10 +64,6 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgWidget::BrowserManager) I_DeclaringFile("osgWidget/Browser"); I_BaseType(osg::Object); - I_StaticMethod0(osg::ref_ptr< osgWidget::BrowserManager > &, instance, - __osg_ref_ptrT1_BrowserManager__R1__instance_S, - "", - ""); I_Method1(void, init, IN, const std::string &, application, Properties::VIRTUAL, __void__init__C5_std_string_R1, @@ -88,6 +84,10 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::BrowserManager) __BrowserImage_P1__createBrowserImage__C5_std_string_R1__int__int, "", ""); + I_StaticMethod0(osg::ref_ptr< osgWidget::BrowserManager > &, instance, + __osg_ref_ptrT1_BrowserManager__R1__instance_S, + "", + ""); I_ProtectedConstructor0(____BrowserManager, "", ""); @@ -101,7 +101,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::BrowserManager) __osg_Object_P1__cloneType, "Clone the type of an object, with Object* return type. ", "Must be defined by derived classes. "); - I_ProtectedMethod1(osg::Object *, clone, IN, const osg::CopyOp &, x, + I_ProtectedMethod1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, Properties::CONST, __osg_Object_P1__clone__C5_osg_CopyOp_R1, diff --git a/src/osgWrappers/osgWidget/Frame.cpp b/src/osgWrappers/osgWidget/Frame.cpp index 2c4905acf..988e0bb39 100644 --- a/src/osgWrappers/osgWidget/Frame.cpp +++ b/src/osgWrappers/osgWidget/Frame.cpp @@ -53,26 +53,6 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgWidget::Frame) I_DeclaringFile("osgWidget/Frame"); I_BaseType(osgWidget::Table); - I_StaticMethod1(std::string, cornerTypeToString, IN, osgWidget::Frame::CornerType, x, - __std_string__cornerTypeToString__CornerType_S, - "", - ""); - I_StaticMethod1(std::string, borderTypeToString, IN, osgWidget::Frame::BorderType, x, - __std_string__borderTypeToString__BorderType_S, - "", - ""); - I_StaticMethodWithDefaults7(osgWidget::Frame *, createSimpleFrame, IN, const std::string &, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, unsigned, int, 0, IN, osgWidget::Frame *, x, 0, - __Frame_P1__createSimpleFrame__C5_std_string_R1__point_type__point_type__point_type__point_type__unsigned__Frame_P1_S, - "", - ""); - I_StaticMethodWithDefaults6(osgWidget::Frame *, createSimpleFrameWithSingleTexture, IN, const std::string &, x, , IN, osg::Image *, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, unsigned, int, 0, IN, osgWidget::Frame *, x, 0, - __Frame_P1__createSimpleFrameWithSingleTexture__C5_std_string_R1__osg_Image_P1__point_type__point_type__unsigned__Frame_P1_S, - "", - ""); - I_StaticMethodWithDefaults6(osgWidget::Frame *, createSimpleFrameFromTheme, IN, const std::string &, x, , IN, osg::Image *, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, unsigned, int, 0, IN, osgWidget::Frame *, x, 0, - __Frame_P1__createSimpleFrameFromTheme__C5_std_string_R1__osg_Image_P1__point_type__point_type__unsigned__Frame_P1_S, - "", - ""); I_Method0(osg::Object *, cloneType, Properties::VIRTUAL, __osg_Object_P1__cloneType, @@ -181,6 +161,26 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Frame) __bool__canTexture, "", ""); + I_StaticMethod1(std::string, cornerTypeToString, IN, osgWidget::Frame::CornerType, x, + __std_string__cornerTypeToString__CornerType_S, + "", + ""); + I_StaticMethod1(std::string, borderTypeToString, IN, osgWidget::Frame::BorderType, x, + __std_string__borderTypeToString__BorderType_S, + "", + ""); + I_StaticMethodWithDefaults7(osgWidget::Frame *, createSimpleFrame, IN, const std::string &, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, unsigned, int, 0, IN, osgWidget::Frame *, x, 0, + __Frame_P1__createSimpleFrame__C5_std_string_R1__point_type__point_type__point_type__point_type__unsigned__Frame_P1_S, + "", + ""); + I_StaticMethodWithDefaults6(osgWidget::Frame *, createSimpleFrameWithSingleTexture, IN, const std::string &, x, , IN, osg::Image *, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, unsigned, int, 0, IN, osgWidget::Frame *, x, 0, + __Frame_P1__createSimpleFrameWithSingleTexture__C5_std_string_R1__osg_Image_P1__point_type__point_type__unsigned__Frame_P1_S, + "", + ""); + I_StaticMethodWithDefaults6(osgWidget::Frame *, createSimpleFrameFromTheme, IN, const std::string &, x, , IN, osg::Image *, x, , IN, osgWidget::point_type, x, , IN, osgWidget::point_type, x, , IN, unsigned, int, 0, IN, osgWidget::Frame *, x, 0, + __Frame_P1__createSimpleFrameFromTheme__C5_std_string_R1__osg_Image_P1__point_type__point_type__unsigned__Frame_P1_S, + "", + ""); I_ProtectedMethod1(osgWidget::Widget *, _getCorner, IN, osgWidget::Frame::CornerType, x, Properties::NON_VIRTUAL, Properties::CONST, @@ -212,7 +212,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Frame::Border) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -286,7 +286,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Frame::Corner) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgWidget/Label.cpp b/src/osgWrappers/osgWidget/Label.cpp index 66ff0b509..716e7a6f3 100644 --- a/src/osgWrappers/osgWidget/Label.cpp +++ b/src/osgWrappers/osgWidget/Label.cpp @@ -33,7 +33,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Label) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgWidget/StyleManager.cpp b/src/osgWrappers/osgWidget/StyleManager.cpp index ed32a1ea7..5a1a0b65b 100644 --- a/src/osgWrappers/osgWidget/StyleManager.cpp +++ b/src/osgWrappers/osgWidget/StyleManager.cpp @@ -37,7 +37,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Style) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -170,7 +170,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::StyleManager) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp b/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp index b8a026b2b..85c1a0e65 100644 --- a/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp +++ b/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp @@ -33,7 +33,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::CameraSwitchHandler) ____CameraSwitchHandler__WindowManager_P1__osg_Camera_P1, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, "Handle events, return true if handled, false otherwise. ", @@ -48,7 +48,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::KeyboardHandler) ____KeyboardHandler__WindowManager_P1, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, "Handle events, return true if handled, false otherwise. ", @@ -65,7 +65,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::MouseHandler) ____MouseHandler__WindowManager_P1, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, "Handle events, return true if handled, false otherwise. ", @@ -127,7 +127,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::ResizeHandler) ____ResizeHandler__WindowManager_P1__osg_Camera_P1, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, IN, osg::Object *, x, IN, osg::NodeVisitor *, x, Properties::VIRTUAL, __bool__handle__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1__osg_Object_P1__osg_NodeVisitor_P1, "Handle events, return true if handled, false otherwise. ", diff --git a/src/osgWrappers/osgWidget/Widget.cpp b/src/osgWrappers/osgWidget/Widget.cpp index 9dbb81cd3..1fa84b2d8 100644 --- a/src/osgWrappers/osgWidget/Widget.cpp +++ b/src/osgWrappers/osgWidget/Widget.cpp @@ -35,7 +35,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::NotifyWidget) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -128,7 +128,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::NullWidget) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -273,7 +273,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Widget) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osgWidget/Window.cpp b/src/osgWrappers/osgWidget/Window.cpp index 3fc8206fb..7049ae0f3 100644 --- a/src/osgWrappers/osgWidget/Window.cpp +++ b/src/osgWrappers/osgWidget/Window.cpp @@ -28,6 +28,9 @@ #undef OUT #endif +TYPE_NAME_ALIAS(std::list< osg::observer_ptr< osgWidget::Window > >, osgWidget::Window::WindowList) + + BEGIN_ENUM_REFLECTOR(osgWidget::Window::Strata) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::STRATA_NONE); @@ -58,9 +61,6 @@ BEGIN_ENUM_REFLECTOR(osgWidget::Window::HorizontalAnchor) I_EnumLabel(osgWidget::Window::HA_RIGHT); END_REFLECTOR -TYPE_NAME_ALIAS(std::list< osg::observer_ptr< osgWidget::Window > >, osgWidget::Window::WindowList) - - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgWidget::Window) I_DeclaringFile("osgWidget/Window"); I_BaseType(osg::MatrixTransform); @@ -861,7 +861,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::Window::EmbeddedWindow) __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, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ",