diff --git a/src/osgWrappers/OpenThreads/Thread.cpp b/src/osgWrappers/OpenThreads/Thread.cpp index 31d574fe0..ca1249454 100644 --- a/src/osgWrappers/OpenThreads/Thread.cpp +++ b/src/osgWrappers/OpenThreads/Thread.cpp @@ -40,6 +40,34 @@ 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. ", ""); @@ -158,34 +186,6 @@ 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 9afd19fc7..ee116505a 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 d4ed0d95a..cb9b0eebf 100644 --- a/src/osgWrappers/osg/AnimationPath.cpp +++ b/src/osgWrappers/osg/AnimationPath.cpp @@ -28,8 +28,6 @@ #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); @@ -37,6 +35,8 @@ 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/ApplicationUsage.cpp b/src/osgWrappers/osg/ApplicationUsage.cpp index ef81b8a57..acf3c22f2 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -20,8 +20,6 @@ #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); @@ -31,9 +29,15 @@ 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, "", ""); @@ -162,10 +166,6 @@ 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 9f71e3b7f..91fec3a37 100644 --- a/src/osgWrappers/osg/ArgumentParser.cpp +++ b/src/osgWrappers/osg/ArgumentParser.cpp @@ -21,16 +21,32 @@ #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, "", @@ -225,22 +241,6 @@ 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/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index bf25c9b4a..d24c5f36a 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -27,8 +27,6 @@ #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); @@ -36,6 +34,8 @@ 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 22aedd9b9..fa15c052f 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -116,47 +116,3 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendColor) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::BlendColor::Extensions) - I_DeclaringFile("osg/BlendColor"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::BlendColor::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::BlendColor::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setBlendColorSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setBlendColorSupported__bool, - "", - ""); - I_Method0(bool, isBlendColorSupported, - Properties::NON_VIRTUAL, - __bool__isBlendColorSupported, - "", - ""); - I_Method4(void, glBlendColor, IN, GLclampf, red, IN, GLclampf, green, IN, GLclampf, blue, IN, GLclampf, alpha, - Properties::NON_VIRTUAL, - __void__glBlendColor__GLclampf__GLclampf__GLclampf__GLclampf, - "", - ""); - - I_SimpleProperty(bool, BlendColorSupported, - 0, - __void__setBlendColorSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/BlendEquation.cpp b/src/osgWrappers/osg/BlendEquation.cpp index 65d207e74..43ffd8c3e 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -122,57 +122,3 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::BlendEquation::Extensions) - I_DeclaringFile("osg/BlendEquation"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::BlendEquation::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::BlendEquation::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setBlendEquationSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setBlendEquationSupported__bool, - "", - ""); - I_Method0(bool, isBlendEquationSupported, - Properties::NON_VIRTUAL, - __bool__isBlendEquationSupported, - "", - ""); - I_Method0(bool, isSGIXMinMaxSupported, - Properties::NON_VIRTUAL, - __bool__isSGIXMinMaxSupported, - "", - ""); - I_Method0(bool, isLogicOpSupported, - Properties::NON_VIRTUAL, - __bool__isLogicOpSupported, - "", - ""); - I_Method1(void, glBlendEquation, IN, GLenum, mode, - Properties::NON_VIRTUAL, - __void__glBlendEquation__GLenum, - "", - ""); - - I_SimpleProperty(bool, BlendEquationSupported, - 0, - __void__setBlendEquationSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/BlendFunc.cpp b/src/osgWrappers/osg/BlendFunc.cpp index 07d753b19..c7e4b5377 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -207,47 +207,3 @@ BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::BlendFunc::Extensions) - I_DeclaringFile("osg/BlendFunc"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::BlendFunc::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::BlendFunc::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setBlendFuncSeparateSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setBlendFuncSeparateSupported__bool, - "", - ""); - I_Method0(bool, isBlendFuncSeparateSupported, - Properties::NON_VIRTUAL, - __bool__isBlendFuncSeparateSupported, - "", - ""); - I_Method4(void, glBlendFuncSeparate, IN, GLenum, sfactorRGB, IN, GLenum, dfactorRGB, IN, GLenum, sfactorAlpha, IN, GLenum, dfactorAlpha, - Properties::NON_VIRTUAL, - __void__glBlendFuncSeparate__GLenum__GLenum__GLenum__GLenum, - "", - ""); - - I_SimpleProperty(bool, BlendFuncSeparateSupported, - 0, - __void__setBlendFuncSeparateSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/BoundingBox.cpp b/src/osgWrappers/osg/BoundingBox.cpp index d8ea8a45e..9306aa845 100644 --- a/src/osgWrappers/osg/BoundingBox.cpp +++ b/src/osgWrappers/osg/BoundingBox.cpp @@ -30,307 +30,3 @@ TYPE_NAME_ALIAS(osg::BoundingBoxImpl< osg::Vec3d >, osg::BoundingBoxd) TYPE_NAME_ALIAS(osg::BoundingBoxf, osg::BoundingBox) -BEGIN_VALUE_REFLECTOR(osg::BoundingBoxImpl< osg::Vec3d >) - I_DeclaringFile("osg/BoundingBox"); - I_Constructor0(____BoundingBoxImpl, - "Creates an uninitialized bounding box. ", - ""); - I_Constructor6(IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, xmin, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, ymin, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, zmin, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, xmax, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, ymax, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, zmax, - ____BoundingBoxImpl__value_type__value_type__value_type__value_type__value_type__value_type, - "Creates a bounding box initialized to the given extents. ", - ""); - I_Constructor2(IN, const osg::BoundingBoxImpl< osg::Vec3d >::vec_type &, min, IN, const osg::BoundingBoxImpl< osg::Vec3d >::vec_type &, max, - ____BoundingBoxImpl__C5_vec_type_R1__C5_vec_type_R1, - "Creates a bounding box initialized to the given extents. ", - ""); - I_Method0(void, init, - Properties::NON_VIRTUAL, - __void__init, - "Clear the bounding box. ", - "Erases existing minimum and maximum extents. "); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "Returns true if the bounding box extents are valid, false otherwise. ", - ""); - I_Method6(void, set, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, xmin, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, ymin, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, zmin, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, xmax, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, ymax, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, zmax, - Properties::NON_VIRTUAL, - __void__set__value_type__value_type__value_type__value_type__value_type__value_type, - "Sets the bounding box extents. ", - ""); - I_Method2(void, set, IN, const osg::BoundingBoxImpl< osg::Vec3d >::vec_type &, min, IN, const osg::BoundingBoxImpl< osg::Vec3d >::vec_type &, max, - Properties::NON_VIRTUAL, - __void__set__C5_vec_type_R1__C5_vec_type_R1, - "Sets the bounding box extents. ", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type &, xMin, - Properties::NON_VIRTUAL, - __value_type_R1__xMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, xMin, - Properties::NON_VIRTUAL, - __value_type__xMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type &, yMin, - Properties::NON_VIRTUAL, - __value_type_R1__yMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, yMin, - Properties::NON_VIRTUAL, - __value_type__yMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type &, zMin, - Properties::NON_VIRTUAL, - __value_type_R1__zMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, zMin, - Properties::NON_VIRTUAL, - __value_type__zMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type &, xMax, - Properties::NON_VIRTUAL, - __value_type_R1__xMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, xMax, - Properties::NON_VIRTUAL, - __value_type__xMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type &, yMax, - Properties::NON_VIRTUAL, - __value_type_R1__yMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, yMax, - Properties::NON_VIRTUAL, - __value_type__yMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type &, zMax, - Properties::NON_VIRTUAL, - __value_type_R1__zMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, zMax, - Properties::NON_VIRTUAL, - __value_type__zMax, - "", - ""); - I_Method0(const osg::BoundingBoxImpl< osg::Vec3d >::vec_type, center, - Properties::NON_VIRTUAL, - __C5_vec_type__center, - "Calculates and returns the bounding box center. ", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, radius, - Properties::NON_VIRTUAL, - __value_type__radius, - "Calculates and returns the bounding box radius. ", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3d >::value_type, radius2, - Properties::NON_VIRTUAL, - __value_type__radius2, - "Calculates and returns the squared length of the bounding box radius. ", - "Note, radius2() is faster to calculate than radius(). "); - I_Method1(const osg::BoundingBoxImpl< osg::Vec3d >::vec_type, corner, IN, unsigned int, pos, - Properties::NON_VIRTUAL, - __C5_vec_type__corner__unsigned_int, - "Returns a specific corner of the bounding box. ", - "pos specifies the corner as a number between 0 and 7. Each bit selects an axis, X, Y, or Z from least- to most-significant. Unset bits select the minimum value for that axis, and set bits select the maximum. "); - I_Method1(void, expandBy, IN, const osg::BoundingBoxImpl< osg::Vec3d >::vec_type &, v, - Properties::NON_VIRTUAL, - __void__expandBy__C5_vec_type_R1, - "Expands the bounding box to include the given coordinate. ", - "If the box is uninitialized, set its min and max extents to v. "); - I_Method3(void, expandBy, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, x, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, y, IN, osg::BoundingBoxImpl< osg::Vec3d >::value_type, z, - Properties::NON_VIRTUAL, - __void__expandBy__value_type__value_type__value_type, - "Expands the bounding box to include the given coordinate. ", - "If the box is uninitialized, set its min and max extents to Vec3(x,y,z). "); - I_Method1(void, expandBy, IN, const osg::BoundingBoxImpl< osg::Vec3d > &, bb, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingBoxImpl_R1, - "Expands this bounding box to include the given bounding box. ", - "If this box is uninitialized, set it equal to bb. "); - I_Method1(void, expandBy, IN, const osg::BoundingSphereImpl< osg::Vec3d > &, sh, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingSphereImplT1_VT__R1, - "Expands this bounding box to include the given sphere. ", - "If this box is uninitialized, set it to include sh. "); - I_Method1(osg::BoundingBoxImpl< osg::Vec3d >, intersect, IN, const osg::BoundingBoxImpl< osg::Vec3d > &, bb, - Properties::NON_VIRTUAL, - __BoundingBoxImpl__intersect__C5_BoundingBoxImpl_R1, - "Returns the intersection of this bounding box and the specified bounding box. ", - ""); - I_Method1(bool, intersects, IN, const osg::BoundingBoxImpl< osg::Vec3d > &, bb, - Properties::NON_VIRTUAL, - __bool__intersects__C5_BoundingBoxImpl_R1, - "Return true if this bounding box intersects the specified bounding box. ", - ""); - I_Method1(bool, contains, IN, const osg::BoundingBoxImpl< osg::Vec3d >::vec_type &, v, - Properties::NON_VIRTUAL, - __bool__contains__C5_vec_type_R1, - "Returns true if this bounding box contains the specified coordinate. ", - ""); - I_PublicMemberProperty(osg::BoundingBoxImpl< osg::Vec3d >::vec_type, _min); - I_PublicMemberProperty(osg::BoundingBoxImpl< osg::Vec3d >::vec_type, _max); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::BoundingBoxImpl< osg::Vec3f >) - I_DeclaringFile("osg/BoundingBox"); - I_Constructor0(____BoundingBoxImpl, - "Creates an uninitialized bounding box. ", - ""); - I_Constructor6(IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, xmin, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, ymin, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, zmin, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, xmax, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, ymax, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, zmax, - ____BoundingBoxImpl__value_type__value_type__value_type__value_type__value_type__value_type, - "Creates a bounding box initialized to the given extents. ", - ""); - I_Constructor2(IN, const osg::BoundingBoxImpl< osg::Vec3f >::vec_type &, min, IN, const osg::BoundingBoxImpl< osg::Vec3f >::vec_type &, max, - ____BoundingBoxImpl__C5_vec_type_R1__C5_vec_type_R1, - "Creates a bounding box initialized to the given extents. ", - ""); - I_Method0(void, init, - Properties::NON_VIRTUAL, - __void__init, - "Clear the bounding box. ", - "Erases existing minimum and maximum extents. "); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "Returns true if the bounding box extents are valid, false otherwise. ", - ""); - I_Method6(void, set, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, xmin, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, ymin, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, zmin, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, xmax, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, ymax, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, zmax, - Properties::NON_VIRTUAL, - __void__set__value_type__value_type__value_type__value_type__value_type__value_type, - "Sets the bounding box extents. ", - ""); - I_Method2(void, set, IN, const osg::BoundingBoxImpl< osg::Vec3f >::vec_type &, min, IN, const osg::BoundingBoxImpl< osg::Vec3f >::vec_type &, max, - Properties::NON_VIRTUAL, - __void__set__C5_vec_type_R1__C5_vec_type_R1, - "Sets the bounding box extents. ", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type &, xMin, - Properties::NON_VIRTUAL, - __value_type_R1__xMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, xMin, - Properties::NON_VIRTUAL, - __value_type__xMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type &, yMin, - Properties::NON_VIRTUAL, - __value_type_R1__yMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, yMin, - Properties::NON_VIRTUAL, - __value_type__yMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type &, zMin, - Properties::NON_VIRTUAL, - __value_type_R1__zMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, zMin, - Properties::NON_VIRTUAL, - __value_type__zMin, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type &, xMax, - Properties::NON_VIRTUAL, - __value_type_R1__xMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, xMax, - Properties::NON_VIRTUAL, - __value_type__xMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type &, yMax, - Properties::NON_VIRTUAL, - __value_type_R1__yMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, yMax, - Properties::NON_VIRTUAL, - __value_type__yMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type &, zMax, - Properties::NON_VIRTUAL, - __value_type_R1__zMax, - "", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, zMax, - Properties::NON_VIRTUAL, - __value_type__zMax, - "", - ""); - I_Method0(const osg::BoundingBoxImpl< osg::Vec3f >::vec_type, center, - Properties::NON_VIRTUAL, - __C5_vec_type__center, - "Calculates and returns the bounding box center. ", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, radius, - Properties::NON_VIRTUAL, - __value_type__radius, - "Calculates and returns the bounding box radius. ", - ""); - I_Method0(osg::BoundingBoxImpl< osg::Vec3f >::value_type, radius2, - Properties::NON_VIRTUAL, - __value_type__radius2, - "Calculates and returns the squared length of the bounding box radius. ", - "Note, radius2() is faster to calculate than radius(). "); - I_Method1(const osg::BoundingBoxImpl< osg::Vec3f >::vec_type, corner, IN, unsigned int, pos, - Properties::NON_VIRTUAL, - __C5_vec_type__corner__unsigned_int, - "Returns a specific corner of the bounding box. ", - "pos specifies the corner as a number between 0 and 7. Each bit selects an axis, X, Y, or Z from least- to most-significant. Unset bits select the minimum value for that axis, and set bits select the maximum. "); - I_Method1(void, expandBy, IN, const osg::BoundingBoxImpl< osg::Vec3f >::vec_type &, v, - Properties::NON_VIRTUAL, - __void__expandBy__C5_vec_type_R1, - "Expands the bounding box to include the given coordinate. ", - "If the box is uninitialized, set its min and max extents to v. "); - I_Method3(void, expandBy, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, x, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, y, IN, osg::BoundingBoxImpl< osg::Vec3f >::value_type, z, - Properties::NON_VIRTUAL, - __void__expandBy__value_type__value_type__value_type, - "Expands the bounding box to include the given coordinate. ", - "If the box is uninitialized, set its min and max extents to Vec3(x,y,z). "); - I_Method1(void, expandBy, IN, const osg::BoundingBoxImpl< osg::Vec3f > &, bb, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingBoxImpl_R1, - "Expands this bounding box to include the given bounding box. ", - "If this box is uninitialized, set it equal to bb. "); - I_Method1(void, expandBy, IN, const osg::BoundingSphereImpl< osg::Vec3f > &, sh, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingSphereImplT1_VT__R1, - "Expands this bounding box to include the given sphere. ", - "If this box is uninitialized, set it to include sh. "); - I_Method1(osg::BoundingBoxImpl< osg::Vec3f >, intersect, IN, const osg::BoundingBoxImpl< osg::Vec3f > &, bb, - Properties::NON_VIRTUAL, - __BoundingBoxImpl__intersect__C5_BoundingBoxImpl_R1, - "Returns the intersection of this bounding box and the specified bounding box. ", - ""); - I_Method1(bool, intersects, IN, const osg::BoundingBoxImpl< osg::Vec3f > &, bb, - Properties::NON_VIRTUAL, - __bool__intersects__C5_BoundingBoxImpl_R1, - "Return true if this bounding box intersects the specified bounding box. ", - ""); - I_Method1(bool, contains, IN, const osg::BoundingBoxImpl< osg::Vec3f >::vec_type &, v, - Properties::NON_VIRTUAL, - __bool__contains__C5_vec_type_R1, - "Returns true if this bounding box contains the specified coordinate. ", - ""); - I_PublicMemberProperty(osg::BoundingBoxImpl< osg::Vec3f >::vec_type, _min); - I_PublicMemberProperty(osg::BoundingBoxImpl< osg::Vec3f >::vec_type, _max); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/BoundingSphere.cpp b/src/osgWrappers/osg/BoundingSphere.cpp index 723ac6517..26f3a352e 100644 --- a/src/osgWrappers/osg/BoundingSphere.cpp +++ b/src/osgWrappers/osg/BoundingSphere.cpp @@ -30,189 +30,3 @@ TYPE_NAME_ALIAS(osg::BoundingSphereImpl< osg::Vec3d >, osg::BoundingSphered) TYPE_NAME_ALIAS(osg::BoundingSpheref, osg::BoundingSphere) -BEGIN_VALUE_REFLECTOR(osg::BoundingSphereImpl< osg::Vec3d >) - I_DeclaringFile("osg/BoundingSphere"); - I_Constructor0(____BoundingSphereImpl, - "Construct a default bounding sphere with radius to -1.0f, representing an invalid/unset bounding sphere. ", - ""); - I_Constructor2(IN, const osg::BoundingSphereImpl< osg::Vec3d >::vec_type &, center, IN, osg::BoundingSphereImpl< osg::Vec3d >::value_type, radius, - ____BoundingSphereImpl__C5_vec_type_R1__value_type, - "Creates a bounding sphere initialized to the given extents. ", - ""); - I_Constructor1(IN, const osg::BoundingSphereImpl< osg::Vec3d > &, bs, - Properties::NON_EXPLICIT, - ____BoundingSphereImpl__C5_BoundingSphereImpl_R1, - "Creates a bounding sphere initialized to the given extents. ", - ""); - I_Constructor1(IN, const osg::BoundingBoxImpl< osg::Vec3d > &, bb, - Properties::NON_EXPLICIT, - ____BoundingSphereImpl__C5_BoundingBoxImplT1_VT__R1, - "Creates a bounding sphere initialized to the given extents. ", - ""); - I_Method0(void, init, - Properties::NON_VIRTUAL, - __void__init, - "Clear the bounding sphere. ", - "Reset to default values. "); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "Returns true of the bounding sphere extents are valid, false otherwise. ", - ""); - I_Method2(void, set, IN, const osg::BoundingSphereImpl< osg::Vec3d >::vec_type &, center, IN, osg::BoundingSphereImpl< osg::Vec3d >::value_type, radius, - Properties::NON_VIRTUAL, - __void__set__C5_vec_type_R1__value_type, - "Set the bounding sphere to the given center/radius using floats. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3d >::vec_type &, center, - Properties::NON_VIRTUAL, - __vec_type_R1__center, - "Returns the center of the bounding sphere. ", - ""); - I_Method0(const osg::BoundingSphereImpl< osg::Vec3d >::vec_type &, center, - Properties::NON_VIRTUAL, - __C5_vec_type_R1__center, - "Returns the const center of the bounding sphere. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3d >::value_type &, radius, - Properties::NON_VIRTUAL, - __value_type_R1__radius, - "Returns the radius of the bounding sphere. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3d >::value_type, radius, - Properties::NON_VIRTUAL, - __value_type__radius, - "Returns the const radius of the bounding sphere. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3d >::value_type, radius2, - Properties::NON_VIRTUAL, - __value_type__radius2, - "Returns the squared length of the radius. ", - "Note, For performance reasons, the calling method is responsible for checking to make sure the sphere is valid. "); - I_Method1(void, expandBy, IN, const osg::BoundingSphereImpl< osg::Vec3d > &, sh, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingSphereImpl_R1, - "Expands the sphere to encompass the given sphere. ", - "Repositions the sphere center to minimize the radius increase. If the sphere is uninitialized, set its center and radius to match sh. "); - I_Method1(void, expandRadiusBy, IN, const osg::BoundingSphereImpl< osg::Vec3d > &, sh, - Properties::NON_VIRTUAL, - __void__expandRadiusBy__C5_BoundingSphereImpl_R1, - "Expands the sphere to encompass the given sphere. ", - "Does not repositions the sphere center. If the sphere is uninitialized, set its center and radius to match sh. "); - I_Method1(void, expandBy, IN, const osg::BoundingBoxImpl< osg::Vec3d > &, bb, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingBoxImplT1_VT__R1, - "Expands the sphere to encompass the given box. ", - "Repositions the sphere center to minimize the radius increase. "); - I_Method1(void, expandRadiusBy, IN, const osg::BoundingBoxImpl< osg::Vec3d > &, bb, - Properties::NON_VIRTUAL, - __void__expandRadiusBy__C5_BoundingBoxImplT1_VT__R1, - "Expands the sphere to encompass the given box. ", - "Does not repositions the sphere center. "); - I_Method1(bool, contains, IN, const osg::BoundingSphereImpl< osg::Vec3d >::vec_type &, v, - Properties::NON_VIRTUAL, - __bool__contains__C5_vec_type_R1, - "Returns true if v is within the sphere. ", - ""); - I_Method1(bool, intersects, IN, const osg::BoundingSphereImpl< osg::Vec3d > &, bs, - Properties::NON_VIRTUAL, - __bool__intersects__C5_BoundingSphereImpl_R1, - "Returns true if there is a non-empty intersection with the given bounding sphere. ", - ""); - I_PublicMemberProperty(osg::BoundingSphereImpl< osg::Vec3d >::vec_type, _center); - I_PublicMemberProperty(osg::BoundingSphereImpl< osg::Vec3d >::value_type, _radius); -END_REFLECTOR - -BEGIN_VALUE_REFLECTOR(osg::BoundingSphereImpl< osg::Vec3f >) - I_DeclaringFile("osg/BoundingSphere"); - I_Constructor0(____BoundingSphereImpl, - "Construct a default bounding sphere with radius to -1.0f, representing an invalid/unset bounding sphere. ", - ""); - I_Constructor2(IN, const osg::BoundingSphereImpl< osg::Vec3f >::vec_type &, center, IN, osg::BoundingSphereImpl< osg::Vec3f >::value_type, radius, - ____BoundingSphereImpl__C5_vec_type_R1__value_type, - "Creates a bounding sphere initialized to the given extents. ", - ""); - I_Constructor1(IN, const osg::BoundingSphereImpl< osg::Vec3f > &, bs, - Properties::NON_EXPLICIT, - ____BoundingSphereImpl__C5_BoundingSphereImpl_R1, - "Creates a bounding sphere initialized to the given extents. ", - ""); - I_Constructor1(IN, const osg::BoundingBoxImpl< osg::Vec3f > &, bb, - Properties::NON_EXPLICIT, - ____BoundingSphereImpl__C5_BoundingBoxImplT1_VT__R1, - "Creates a bounding sphere initialized to the given extents. ", - ""); - I_Method0(void, init, - Properties::NON_VIRTUAL, - __void__init, - "Clear the bounding sphere. ", - "Reset to default values. "); - I_Method0(bool, valid, - Properties::NON_VIRTUAL, - __bool__valid, - "Returns true of the bounding sphere extents are valid, false otherwise. ", - ""); - I_Method2(void, set, IN, const osg::BoundingSphereImpl< osg::Vec3f >::vec_type &, center, IN, osg::BoundingSphereImpl< osg::Vec3f >::value_type, radius, - Properties::NON_VIRTUAL, - __void__set__C5_vec_type_R1__value_type, - "Set the bounding sphere to the given center/radius using floats. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3f >::vec_type &, center, - Properties::NON_VIRTUAL, - __vec_type_R1__center, - "Returns the center of the bounding sphere. ", - ""); - I_Method0(const osg::BoundingSphereImpl< osg::Vec3f >::vec_type &, center, - Properties::NON_VIRTUAL, - __C5_vec_type_R1__center, - "Returns the const center of the bounding sphere. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3f >::value_type &, radius, - Properties::NON_VIRTUAL, - __value_type_R1__radius, - "Returns the radius of the bounding sphere. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3f >::value_type, radius, - Properties::NON_VIRTUAL, - __value_type__radius, - "Returns the const radius of the bounding sphere. ", - ""); - I_Method0(osg::BoundingSphereImpl< osg::Vec3f >::value_type, radius2, - Properties::NON_VIRTUAL, - __value_type__radius2, - "Returns the squared length of the radius. ", - "Note, For performance reasons, the calling method is responsible for checking to make sure the sphere is valid. "); - I_Method1(void, expandBy, IN, const osg::BoundingSphereImpl< osg::Vec3f > &, sh, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingSphereImpl_R1, - "Expands the sphere to encompass the given sphere. ", - "Repositions the sphere center to minimize the radius increase. If the sphere is uninitialized, set its center and radius to match sh. "); - I_Method1(void, expandRadiusBy, IN, const osg::BoundingSphereImpl< osg::Vec3f > &, sh, - Properties::NON_VIRTUAL, - __void__expandRadiusBy__C5_BoundingSphereImpl_R1, - "Expands the sphere to encompass the given sphere. ", - "Does not repositions the sphere center. If the sphere is uninitialized, set its center and radius to match sh. "); - I_Method1(void, expandBy, IN, const osg::BoundingBoxImpl< osg::Vec3f > &, bb, - Properties::NON_VIRTUAL, - __void__expandBy__C5_BoundingBoxImplT1_VT__R1, - "Expands the sphere to encompass the given box. ", - "Repositions the sphere center to minimize the radius increase. "); - I_Method1(void, expandRadiusBy, IN, const osg::BoundingBoxImpl< osg::Vec3f > &, bb, - Properties::NON_VIRTUAL, - __void__expandRadiusBy__C5_BoundingBoxImplT1_VT__R1, - "Expands the sphere to encompass the given box. ", - "Does not repositions the sphere center. "); - I_Method1(bool, contains, IN, const osg::BoundingSphereImpl< osg::Vec3f >::vec_type &, v, - Properties::NON_VIRTUAL, - __bool__contains__C5_vec_type_R1, - "Returns true if v is within the sphere. ", - ""); - I_Method1(bool, intersects, IN, const osg::BoundingSphereImpl< osg::Vec3f > &, bs, - Properties::NON_VIRTUAL, - __bool__intersects__C5_BoundingSphereImpl_R1, - "Returns true if there is a non-empty intersection with the given bounding sphere. ", - ""); - I_PublicMemberProperty(osg::BoundingSphereImpl< osg::Vec3f >::vec_type, _center); - I_PublicMemberProperty(osg::BoundingSphereImpl< osg::Vec3f >::value_type, _radius); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index 19a297931..bc6effbaa 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -149,106 +149,6 @@ BEGIN_VALUE_REFLECTOR(osg::BufferObject::BufferEntry) I_PublicMemberProperty(osg::buffered_value< unsigned int >, modifiedCount); I_PublicMemberProperty(unsigned int, dataSize); I_PublicMemberProperty(unsigned int, offset); -END_REFLECTOR - -BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) - I_DeclaringFile("osg/BufferObject"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::BufferObject::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::BufferObject::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method0(bool, isBufferObjectSupported, - Properties::NON_VIRTUAL, - __bool__isBufferObjectSupported, - "", - ""); - I_Method0(bool, isPBOSupported, - Properties::NON_VIRTUAL, - __bool__isPBOSupported, - "", - ""); - I_Method2(void, glGenBuffers, IN, GLsizei, n, IN, GLuint *, buffers, - Properties::NON_VIRTUAL, - __void__glGenBuffers__GLsizei__GLuint_P1, - "", - ""); - I_Method2(void, glBindBuffer, IN, GLenum, target, IN, GLuint, buffer, - Properties::NON_VIRTUAL, - __void__glBindBuffer__GLenum__GLuint, - "", - ""); - I_Method4(void, glBufferData, IN, GLenum, target, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, IN, GLenum, usage, - Properties::NON_VIRTUAL, - __void__glBufferData__GLenum__GLsizeiptrARB__C5_GLvoid_P1__GLenum, - "", - ""); - I_Method4(void, glBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glBufferSubData__GLenum__GLintptrARB__GLsizeiptrARB__C5_GLvoid_P1, - "", - ""); - I_Method2(void, glDeleteBuffers, IN, GLsizei, n, IN, const GLuint *, buffers, - Properties::NON_VIRTUAL, - __void__glDeleteBuffers__GLsizei__C5_GLuint_P1, - "", - ""); - I_Method1(GLboolean, glIsBuffer, IN, GLuint, buffer, - Properties::NON_VIRTUAL, - __GLboolean__glIsBuffer__GLuint, - "", - ""); - I_Method4(void, glGetBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glGetBufferSubData__GLenum__GLintptrARB__GLsizeiptrARB__GLvoid_P1, - "", - ""); - I_Method2(GLvoid *, glMapBuffer, IN, GLenum, target, IN, GLenum, access, - Properties::NON_VIRTUAL, - __GLvoid_P1__glMapBuffer__GLenum__GLenum, - "", - ""); - I_Method1(GLboolean, glUnmapBuffer, IN, GLenum, target, - Properties::NON_VIRTUAL, - __GLboolean__glUnmapBuffer__GLenum, - "", - ""); - I_Method3(void, glGetBufferParameteriv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetBufferParameteriv__GLenum__GLenum__GLint_P1, - "", - ""); - I_Method3(void, glGetBufferPointerv, IN, GLenum, target, IN, GLenum, pname, IN, GLvoid **, params, - Properties::NON_VIRTUAL, - __void__glGetBufferPointerv__GLenum__GLenum__GLvoid_P1P1, - "", - ""); - - - - - - - - - - END_REFLECTOR TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::DrawElements * >, osg::ElementBufferObject::BufferEntryDrawElementsPair) @@ -270,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 &, copyop, + 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. ", @@ -355,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 &, copyop, + 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. ", @@ -432,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 &, copyop, + 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. ", @@ -516,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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp index ec11f850f..1c05cec2e 100644 --- a/src/osgWrappers/osg/Camera.cpp +++ b/src/osgWrappers/osg/Camera.cpp @@ -43,8 +43,6 @@ #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); @@ -98,6 +96,8 @@ 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/ClampColor.cpp b/src/osgWrappers/osg/ClampColor.cpp index f1ac73340..09f784846 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -130,47 +130,3 @@ BEGIN_OBJECT_REFLECTOR(osg::ClampColor) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::ClampColor::Extensions) - I_DeclaringFile("osg/ClampColor"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::ClampColor::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::ClampColor::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setClampColorSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setClampColorSupported__bool, - "", - ""); - I_Method0(bool, isClampColorSupported, - Properties::NON_VIRTUAL, - __bool__isClampColorSupported, - "", - ""); - I_Method2(void, glClampColor, IN, GLenum, target, IN, GLenum, mode, - Properties::NON_VIRTUAL, - __void__glClampColor__GLenum__GLenum, - "", - ""); - - I_SimpleProperty(bool, ClampColorSupported, - 0, - __void__setClampColorSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index 8162ae153..accd10915 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 01d3b11e0..08ef90393 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 e28977897..fbfde8a8d 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index bf09e224e..cba3867c9 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 &, pos, IN, bool, withLODScale, + I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, 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 &, pos, IN, bool, withLODScale, + I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, x, IN, bool, x, 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 &, pos, IN, bool, withLODScale, + I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, 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 3f7408ed2..cb1ed8107 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 7db36433a..6de8b9d75 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 54f408fb0..092f03079 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index af8c29a06..a15e498b1 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/CopyOp.cpp b/src/osgWrappers/osg/CopyOp.cpp index 2b0adaebb..cf4c90ec6 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -32,8 +32,6 @@ #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); @@ -51,6 +49,8 @@ BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) 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 c61f176b5..bef88e5d9 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 6cffe7bac..b9f70eb77 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -24,8 +24,6 @@ #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); @@ -75,6 +73,8 @@ 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 b67609697..1e55da002 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -30,14 +30,6 @@ #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); @@ -51,6 +43,14 @@ 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 72e0024d1..36c95f665 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 9df0ab268..e856d6ecc 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -57,6 +57,10 @@ 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, "", ""); @@ -380,10 +384,6 @@ 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 821196c41..17e16632b 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 a04e50e4c..e858b5e9f 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -38,10 +38,6 @@ #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); @@ -63,6 +59,10 @@ 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -862,407 +862,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::EventCallback) ""); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) - I_DeclaringFile("osg/Drawable"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::Drawable::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::Drawable::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setVertexProgramSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setVertexProgramSupported__bool, - "", - ""); - I_Method0(bool, isVertexProgramSupported, - Properties::NON_VIRTUAL, - __bool__isVertexProgramSupported, - "", - ""); - I_Method1(void, setSecondaryColorSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setSecondaryColorSupported__bool, - "", - ""); - I_Method0(bool, isSecondaryColorSupported, - Properties::NON_VIRTUAL, - __bool__isSecondaryColorSupported, - "", - ""); - I_Method1(void, setFogCoordSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setFogCoordSupported__bool, - "", - ""); - I_Method0(bool, isFogCoordSupported, - Properties::NON_VIRTUAL, - __bool__isFogCoordSupported, - "", - ""); - I_Method1(void, setMultiTexSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setMultiTexSupported__bool, - "", - ""); - I_Method0(bool, isMultiTexSupported, - Properties::NON_VIRTUAL, - __bool__isMultiTexSupported, - "", - ""); - I_Method1(void, setOcclusionQuerySupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setOcclusionQuerySupported__bool, - "", - ""); - I_Method0(bool, isOcclusionQuerySupported, - Properties::NON_VIRTUAL, - __bool__isOcclusionQuerySupported, - "", - ""); - I_Method1(void, setARBOcclusionQuerySupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setARBOcclusionQuerySupported__bool, - "", - ""); - I_Method0(bool, isARBOcclusionQuerySupported, - Properties::NON_VIRTUAL, - __bool__isARBOcclusionQuerySupported, - "", - ""); - I_Method1(void, setTimerQuerySupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTimerQuerySupported__bool, - "", - ""); - I_Method0(bool, isTimerQuerySupported, - Properties::NON_VIRTUAL, - __bool__isTimerQuerySupported, - "", - ""); - I_Method1(void, glSecondaryColor3ubv, IN, const GLubyte *, coord, - Properties::NON_VIRTUAL, - __void__glSecondaryColor3ubv__C5_GLubyte_P1, - "", - ""); - I_Method1(void, glSecondaryColor3fv, IN, const GLfloat *, coord, - Properties::NON_VIRTUAL, - __void__glSecondaryColor3fv__C5_GLfloat_P1, - "", - ""); - I_Method1(void, glFogCoordfv, IN, const GLfloat *, coord, - Properties::NON_VIRTUAL, - __void__glFogCoordfv__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glMultiTexCoord1f, IN, GLenum, target, IN, GLfloat, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord1f__GLenum__GLfloat, - "", - ""); - I_Method2(void, glMultiTexCoord2fv, IN, GLenum, target, IN, const GLfloat *, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord2fv__GLenum__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glMultiTexCoord3fv, IN, GLenum, target, IN, const GLfloat *, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord3fv__GLenum__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glMultiTexCoord4fv, IN, GLenum, target, IN, const GLfloat *, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord4fv__GLenum__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glMultiTexCoord1d, IN, GLenum, target, IN, GLdouble, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord1d__GLenum__GLdouble, - "", - ""); - I_Method2(void, glMultiTexCoord2dv, IN, GLenum, target, IN, const GLdouble *, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord2dv__GLenum__C5_GLdouble_P1, - "", - ""); - I_Method2(void, glMultiTexCoord3dv, IN, GLenum, target, IN, const GLdouble *, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord3dv__GLenum__C5_GLdouble_P1, - "", - ""); - I_Method2(void, glMultiTexCoord4dv, IN, GLenum, target, IN, const GLdouble *, coord, - Properties::NON_VIRTUAL, - __void__glMultiTexCoord4dv__GLenum__C5_GLdouble_P1, - "", - ""); - I_Method2(void, glVertexAttrib1s, IN, unsigned int, index, IN, GLshort, s, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1s__unsigned_int__GLshort, - "", - ""); - I_Method2(void, glVertexAttrib1f, IN, unsigned int, index, IN, GLfloat, f, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1f__unsigned_int__GLfloat, - "", - ""); - I_Method2(void, glVertexAttrib1d, IN, unsigned int, index, IN, GLdouble, f, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1d__unsigned_int__GLdouble, - "", - ""); - I_Method2(void, glVertexAttrib2fv, IN, unsigned int, index, IN, const GLfloat *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2fv__unsigned_int__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glVertexAttrib3fv, IN, unsigned int, index, IN, const GLfloat *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3fv__unsigned_int__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glVertexAttrib4fv, IN, unsigned int, index, IN, const GLfloat *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4fv__unsigned_int__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glVertexAttrib2dv, IN, unsigned int, index, IN, const GLdouble *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2dv__unsigned_int__C5_GLdouble_P1, - "", - ""); - I_Method2(void, glVertexAttrib3dv, IN, unsigned int, index, IN, const GLdouble *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3dv__unsigned_int__C5_GLdouble_P1, - "", - ""); - I_Method2(void, glVertexAttrib4dv, IN, unsigned int, index, IN, const GLdouble *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4dv__unsigned_int__C5_GLdouble_P1, - "", - ""); - I_Method2(void, glVertexAttrib4ubv, IN, unsigned int, index, IN, const GLubyte *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4ubv__unsigned_int__C5_GLubyte_P1, - "", - ""); - I_Method2(void, glVertexAttrib4Nubv, IN, unsigned int, index, IN, const GLubyte *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Nubv__unsigned_int__C5_GLubyte_P1, - "", - ""); - I_Method2(void, glGenBuffers, IN, GLsizei, n, IN, GLuint *, buffers, - Properties::NON_VIRTUAL, - __void__glGenBuffers__GLsizei__GLuint_P1, - "", - ""); - I_Method2(void, glBindBuffer, IN, GLenum, target, IN, GLuint, buffer, - Properties::NON_VIRTUAL, - __void__glBindBuffer__GLenum__GLuint, - "", - ""); - I_Method4(void, glBufferData, IN, GLenum, target, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, IN, GLenum, usage, - Properties::NON_VIRTUAL, - __void__glBufferData__GLenum__GLsizeiptrARB__C5_GLvoid_P1__GLenum, - "", - ""); - I_Method4(void, glBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glBufferSubData__GLenum__GLintptrARB__GLsizeiptrARB__C5_GLvoid_P1, - "", - ""); - I_Method2(void, glDeleteBuffers, IN, GLsizei, n, IN, const GLuint *, buffers, - Properties::NON_VIRTUAL, - __void__glDeleteBuffers__GLsizei__C5_GLuint_P1, - "", - ""); - I_Method1(GLboolean, glIsBuffer, IN, GLuint, buffer, - Properties::NON_VIRTUAL, - __GLboolean__glIsBuffer__GLuint, - "", - ""); - I_Method4(void, glGetBufferSubData, IN, GLenum, target, IN, GLintptrARB, offset, IN, GLsizeiptrARB, size, IN, GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glGetBufferSubData__GLenum__GLintptrARB__GLsizeiptrARB__GLvoid_P1, - "", - ""); - I_Method2(GLvoid *, glMapBuffer, IN, GLenum, target, IN, GLenum, access, - Properties::NON_VIRTUAL, - __GLvoid_P1__glMapBuffer__GLenum__GLenum, - "", - ""); - I_Method1(GLboolean, glUnmapBuffer, IN, GLenum, target, - Properties::NON_VIRTUAL, - __GLboolean__glUnmapBuffer__GLenum, - "", - ""); - I_Method3(void, glGetBufferParameteriv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetBufferParameteriv__GLenum__GLenum__GLint_P1, - "", - ""); - I_Method3(void, glGetBufferPointerv, IN, GLenum, target, IN, GLenum, pname, IN, GLvoid **, params, - Properties::NON_VIRTUAL, - __void__glGetBufferPointerv__GLenum__GLenum__GLvoid_P1P1, - "", - ""); - I_Method2(void, glGenOcclusionQueries, IN, GLsizei, n, IN, GLuint *, ids, - Properties::NON_VIRTUAL, - __void__glGenOcclusionQueries__GLsizei__GLuint_P1, - "", - ""); - I_Method2(void, glDeleteOcclusionQueries, IN, GLsizei, n, IN, const GLuint *, ids, - Properties::NON_VIRTUAL, - __void__glDeleteOcclusionQueries__GLsizei__C5_GLuint_P1, - "", - ""); - I_Method1(GLboolean, glIsOcclusionQuery, IN, GLuint, id, - Properties::NON_VIRTUAL, - __GLboolean__glIsOcclusionQuery__GLuint, - "", - ""); - I_Method1(void, glBeginOcclusionQuery, IN, GLuint, id, - Properties::NON_VIRTUAL, - __void__glBeginOcclusionQuery__GLuint, - "", - ""); - I_Method0(void, glEndOcclusionQuery, - Properties::NON_VIRTUAL, - __void__glEndOcclusionQuery, - "", - ""); - I_Method3(void, glGetOcclusionQueryiv, IN, GLuint, id, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetOcclusionQueryiv__GLuint__GLenum__GLint_P1, - "", - ""); - I_Method3(void, glGetOcclusionQueryuiv, IN, GLuint, id, IN, GLenum, pname, IN, GLuint *, params, - Properties::NON_VIRTUAL, - __void__glGetOcclusionQueryuiv__GLuint__GLenum__GLuint_P1, - "", - ""); - I_Method3(void, glGetQueryiv, IN, GLenum, target, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetQueryiv__GLenum__GLenum__GLint_P1, - "", - ""); - I_Method2(void, glGenQueries, IN, GLsizei, n, IN, GLuint *, ids, - Properties::NON_VIRTUAL, - __void__glGenQueries__GLsizei__GLuint_P1, - "", - ""); - I_Method2(void, glBeginQuery, IN, GLenum, target, IN, GLuint, id, - Properties::NON_VIRTUAL, - __void__glBeginQuery__GLenum__GLuint, - "", - ""); - I_Method1(void, glEndQuery, IN, GLenum, target, - Properties::NON_VIRTUAL, - __void__glEndQuery__GLenum, - "", - ""); - I_Method1(GLboolean, glIsQuery, IN, GLuint, id, - Properties::NON_VIRTUAL, - __GLboolean__glIsQuery__GLuint, - "", - ""); - I_Method2(void, glDeleteQueries, IN, GLsizei, n, IN, const GLuint *, ids, - Properties::NON_VIRTUAL, - __void__glDeleteQueries__GLsizei__C5_GLuint_P1, - "", - ""); - I_Method3(void, glGetQueryObjectiv, IN, GLuint, id, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetQueryObjectiv__GLuint__GLenum__GLint_P1, - "", - ""); - I_Method3(void, glGetQueryObjectuiv, IN, GLuint, id, IN, GLenum, pname, IN, GLuint *, params, - Properties::NON_VIRTUAL, - __void__glGetQueryObjectuiv__GLuint__GLenum__GLuint_P1, - "", - ""); - I_Method3(void, glGetQueryObjectui64v, IN, GLuint, id, IN, GLenum, pname, IN, GLuint64EXT *, params, - Properties::NON_VIRTUAL, - __void__glGetQueryObjectui64v__GLuint__GLenum__GLuint64EXT_P1, - "", - ""); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - I_SimpleProperty(bool, ARBOcclusionQuerySupported, - 0, - __void__setARBOcclusionQuerySupported__bool); - I_SimpleProperty(bool, FogCoordSupported, - 0, - __void__setFogCoordSupported__bool); - I_SimpleProperty(bool, MultiTexSupported, - 0, - __void__setMultiTexSupported__bool); - I_SimpleProperty(bool, OcclusionQuerySupported, - 0, - __void__setOcclusionQuerySupported__bool); - I_SimpleProperty(bool, SecondaryColorSupported, - 0, - __void__setSecondaryColorSupported__bool); - I_SimpleProperty(bool, TimerQuerySupported, - 0, - __void__setTimerQuerySupported__bool); - I_SimpleProperty(bool, VertexProgramSupported, - 0, - __void__setVertexProgramSupported__bool); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback) I_DeclaringFile("osg/Drawable"); I_VirtualBaseType(osg::Object); @@ -1278,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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/Fog.cpp b/src/osgWrappers/osg/Fog.cpp index b1237affd..01afb3bb4 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 385bdbce1..f7bdcff2e 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 &, state, + I_Method1(void, compileGLObjects, IN, osg::State &, x, Properties::VIRTUAL, __void__compileGLObjects__State_R1, "Default to nothing to compile - all state is applied immediately. ", @@ -199,74 +199,6 @@ BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions) - I_DeclaringFile("osg/FragmentProgram"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::FragmentProgram::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::FragmentProgram::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setFragmentProgramSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setFragmentProgramSupported__bool, - "", - ""); - I_Method0(bool, isFragmentProgramSupported, - Properties::NON_VIRTUAL, - __bool__isFragmentProgramSupported, - "", - ""); - I_Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id, - Properties::NON_VIRTUAL, - __void__glBindProgram__GLenum__GLuint, - "", - ""); - I_Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs, - Properties::NON_VIRTUAL, - __void__glGenPrograms__GLsizei__GLuint_P1, - "", - ""); - I_Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs, - Properties::NON_VIRTUAL, - __void__glDeletePrograms__GLsizei__GLuint_P1, - "", - ""); - I_Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string, - Properties::NON_VIRTUAL, - __void__glProgramString__GLenum__GLenum__GLsizei__C5_void_P1, - "", - ""); - I_Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params, - Properties::NON_VIRTUAL, - __void__glProgramLocalParameter4fv__GLenum__GLuint__C5_GLfloat_P1, - "", - ""); - - - - - - I_SimpleProperty(bool, FragmentProgramSupported, - 0, - __void__setFragmentProgramSupported__bool); -END_REFLECTOR - STD_MAP_REFLECTOR(std::map< GLenum COMMA osg::Matrix >) STD_MAP_REFLECTOR(std::map< GLuint COMMA osg::Vec4 >) diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index 93d280072..43605b61f 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -32,91 +32,6 @@ #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_OBJECT_REFLECTOR(osg::FBOExtensions) - I_DeclaringFile("osg/FrameBufferObject"); - I_BaseType(osg::Referenced); - I_Method0(bool, isSupported, - Properties::NON_VIRTUAL, - __bool__isSupported, - "", - ""); - I_Method0(bool, isMultisampleSupported, - Properties::NON_VIRTUAL, - __bool__isMultisampleSupported, - "", - ""); - I_Method0(bool, isMultisampleCoverageSupported, - Properties::NON_VIRTUAL, - __bool__isMultisampleCoverageSupported, - "", - ""); - I_Method0(bool, isPackedDepthStencilSupported, - Properties::NON_VIRTUAL, - __bool__isPackedDepthStencilSupported, - "", - ""); - I_StaticMethod2(osg::FBOExtensions *, instance, IN, unsigned, contextID, IN, bool, createIfNotInitalized, - __FBOExtensions_P1__instance__unsigned__bool_S, - "", - ""); - I_ProtectedConstructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____FBOExtensions__unsigned_int, - "", - ""); - I_PublicMemberProperty(osg::FBOExtensions::TglBindRenderbufferEXT *, glBindRenderbufferEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglGenRenderbuffersEXT *, glGenRenderbuffersEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglDeleteRenderbuffersEXT *, glDeleteRenderbuffersEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglRenderbufferStorageEXT *, glRenderbufferStorageEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglRenderbufferStorageMultisampleEXT *, glRenderbufferStorageMultisampleEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglRenderbufferStorageMultisampleCoverageNV *, glRenderbufferStorageMultisampleCoverageNV); - I_PublicMemberProperty(osg::FBOExtensions::TglBindFramebufferEXT *, glBindFramebufferEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglDeleteFramebuffersEXT *, glDeleteFramebuffersEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglGenFramebuffersEXT *, glGenFramebuffersEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglCheckFramebufferStatusEXT *, glCheckFramebufferStatusEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTexture1DEXT *, glFramebufferTexture1DEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTexture2DEXT *, glFramebufferTexture2DEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTexture3DEXT *, glFramebufferTexture3DEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferTextureLayerEXT *, glFramebufferTextureLayerEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglFramebufferRenderbufferEXT *, glFramebufferRenderbufferEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglGenerateMipmapEXT *, glGenerateMipmapEXT); - I_PublicMemberProperty(osg::FBOExtensions::TglBlitFramebufferEXT *, glBlitFramebufferEXT); -END_REFLECTOR - BEGIN_VALUE_REFLECTOR(osg::FrameBufferAttachment) I_DeclaringFile("osg/FrameBufferObject"); I_Constructor0(____FrameBufferAttachment, @@ -242,12 +157,6 @@ 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); @@ -255,6 +164,12 @@ 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); @@ -270,7 +185,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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -335,7 +250,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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -409,7 +324,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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/FrontFace.cpp b/src/osgWrappers/osg/FrontFace.cpp index ebd484887..434edecee 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osg/GL2Extensions.cpp b/src/osgWrappers/osg/GL2Extensions.cpp index eb0382b2b..6d4b62609 100644 --- a/src/osgWrappers/osg/GL2Extensions.cpp +++ b/src/osgWrappers/osg/GL2Extensions.cpp @@ -20,734 +20,3 @@ #undef OUT #endif -BEGIN_OBJECT_REFLECTOR(osg::GL2Extensions) - I_DeclaringFile("osg/GL2Extensions"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____GL2Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::GL2Extensions &, rhs, - Properties::NON_EXPLICIT, - ____GL2Extensions__C5_GL2Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::GL2Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_GL2Extensions_R1, - "", - ""); - I_Method1(void, setupGL2Extensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGL2Extensions__unsigned_int, - "", - ""); - I_Method0(bool, isGlslSupported, - Properties::NON_VIRTUAL, - __bool__isGlslSupported, - "Does the GL driver support OpenGL Shading Language? ", - ""); - I_Method0(float, getGlVersion, - Properties::NON_VIRTUAL, - __float__getGlVersion, - "", - ""); - I_Method0(float, getLanguageVersion, - Properties::NON_VIRTUAL, - __float__getLanguageVersion, - "", - ""); - I_Method1(void, setShaderObjectsSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setShaderObjectsSupported__bool, - "", - ""); - I_Method0(bool, isShaderObjectsSupported, - Properties::NON_VIRTUAL, - __bool__isShaderObjectsSupported, - "", - ""); - I_Method1(void, setVertexShaderSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setVertexShaderSupported__bool, - "", - ""); - I_Method0(bool, isVertexShaderSupported, - Properties::NON_VIRTUAL, - __bool__isVertexShaderSupported, - "", - ""); - I_Method1(void, setFragmentShaderSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setFragmentShaderSupported__bool, - "", - ""); - I_Method0(bool, isFragmentShaderSupported, - Properties::NON_VIRTUAL, - __bool__isFragmentShaderSupported, - "", - ""); - I_Method1(void, setLanguage100Supported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setLanguage100Supported__bool, - "", - ""); - I_Method0(bool, isLanguage100Supported, - Properties::NON_VIRTUAL, - __bool__isLanguage100Supported, - "", - ""); - I_Method1(void, setGeometryShader4Supported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setGeometryShader4Supported__bool, - "", - ""); - I_Method0(bool, isGeometryShader4Supported, - Properties::NON_VIRTUAL, - __bool__isGeometryShader4Supported, - "", - ""); - I_Method1(void, setGpuShader4Supported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setGpuShader4Supported__bool, - "", - ""); - I_Method0(bool, isGpuShader4Supported, - Properties::NON_VIRTUAL, - __bool__isGpuShader4Supported, - "", - ""); - I_Method2(void, glBlendEquationSeparate, IN, GLenum, modeRGB, IN, GLenum, modeAlpha, - Properties::NON_VIRTUAL, - __void__glBlendEquationSeparate__GLenum__GLenum, - "", - ""); - I_Method2(void, glDrawBuffers, IN, GLsizei, n, IN, const GLenum *, bufs, - Properties::NON_VIRTUAL, - __void__glDrawBuffers__GLsizei__C5_GLenum_P1, - "", - ""); - I_Method4(void, glStencilOpSeparate, IN, GLenum, face, IN, GLenum, sfail, IN, GLenum, dpfail, IN, GLenum, dppass, - Properties::NON_VIRTUAL, - __void__glStencilOpSeparate__GLenum__GLenum__GLenum__GLenum, - "", - ""); - I_Method4(void, glStencilFuncSeparate, IN, GLenum, frontfunc, IN, GLenum, backfunc, IN, GLint, ref, IN, GLuint, mask, - Properties::NON_VIRTUAL, - __void__glStencilFuncSeparate__GLenum__GLenum__GLint__GLuint, - "", - ""); - I_Method2(void, glStencilMaskSeparate, IN, GLenum, face, IN, GLuint, mask, - Properties::NON_VIRTUAL, - __void__glStencilMaskSeparate__GLenum__GLuint, - "", - ""); - I_Method2(void, glAttachShader, IN, GLuint, program, IN, GLuint, shader, - Properties::NON_VIRTUAL, - __void__glAttachShader__GLuint__GLuint, - "", - ""); - I_Method3(void, glBindAttribLocation, IN, GLuint, program, IN, GLuint, index, IN, const GLchar *, name, - Properties::NON_VIRTUAL, - __void__glBindAttribLocation__GLuint__GLuint__C5_GLchar_P1, - "", - ""); - I_Method1(void, glCompileShader, IN, GLuint, shader, - Properties::NON_VIRTUAL, - __void__glCompileShader__GLuint, - "", - ""); - I_Method0(GLuint, glCreateProgram, - Properties::NON_VIRTUAL, - __GLuint__glCreateProgram, - "", - ""); - I_Method1(GLuint, glCreateShader, IN, GLenum, type, - Properties::NON_VIRTUAL, - __GLuint__glCreateShader__GLenum, - "", - ""); - I_Method1(void, glDeleteProgram, IN, GLuint, program, - Properties::NON_VIRTUAL, - __void__glDeleteProgram__GLuint, - "", - ""); - I_Method1(void, glDeleteShader, IN, GLuint, shader, - Properties::NON_VIRTUAL, - __void__glDeleteShader__GLuint, - "", - ""); - I_Method2(void, glDetachShader, IN, GLuint, program, IN, GLuint, shader, - Properties::NON_VIRTUAL, - __void__glDetachShader__GLuint__GLuint, - "", - ""); - I_Method1(void, glDisableVertexAttribArray, IN, GLuint, index, - Properties::NON_VIRTUAL, - __void__glDisableVertexAttribArray__GLuint, - "", - ""); - I_Method1(void, glEnableVertexAttribArray, IN, GLuint, index, - Properties::NON_VIRTUAL, - __void__glEnableVertexAttribArray__GLuint, - "", - ""); - I_Method7(void, glGetActiveAttrib, IN, GLuint, program, IN, GLuint, index, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLint *, size, IN, GLenum *, type, IN, GLchar *, name, - Properties::NON_VIRTUAL, - __void__glGetActiveAttrib__GLuint__GLuint__GLsizei__GLsizei_P1__GLint_P1__GLenum_P1__GLchar_P1, - "", - ""); - I_Method7(void, glGetActiveUniform, IN, GLuint, program, IN, GLuint, index, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLint *, size, IN, GLenum *, type, IN, GLchar *, name, - Properties::NON_VIRTUAL, - __void__glGetActiveUniform__GLuint__GLuint__GLsizei__GLsizei_P1__GLint_P1__GLenum_P1__GLchar_P1, - "", - ""); - I_Method4(void, glGetAttachedShaders, IN, GLuint, program, IN, GLsizei, maxCount, IN, GLsizei *, count, IN, GLuint *, obj, - Properties::NON_VIRTUAL, - __void__glGetAttachedShaders__GLuint__GLsizei__GLsizei_P1__GLuint_P1, - "", - ""); - I_Method2(GLint, glGetAttribLocation, IN, GLuint, program, IN, const GLchar *, name, - Properties::NON_VIRTUAL, - __GLint__glGetAttribLocation__GLuint__C5_GLchar_P1, - "", - ""); - I_Method3(void, glGetProgramiv, IN, GLuint, program, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetProgramiv__GLuint__GLenum__GLint_P1, - "", - ""); - I_Method4(void, glGetProgramInfoLog, IN, GLuint, program, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLchar *, infoLog, - Properties::NON_VIRTUAL, - __void__glGetProgramInfoLog__GLuint__GLsizei__GLsizei_P1__GLchar_P1, - "", - ""); - I_Method3(void, glGetShaderiv, IN, GLuint, shader, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetShaderiv__GLuint__GLenum__GLint_P1, - "", - ""); - I_Method4(void, glGetShaderInfoLog, IN, GLuint, shader, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLchar *, infoLog, - Properties::NON_VIRTUAL, - __void__glGetShaderInfoLog__GLuint__GLsizei__GLsizei_P1__GLchar_P1, - "", - ""); - I_Method4(void, glGetShaderSource, IN, GLuint, shader, IN, GLsizei, bufSize, IN, GLsizei *, length, IN, GLchar *, source, - Properties::NON_VIRTUAL, - __void__glGetShaderSource__GLuint__GLsizei__GLsizei_P1__GLchar_P1, - "", - ""); - I_Method2(GLint, glGetUniformLocation, IN, GLuint, program, IN, const GLchar *, name, - Properties::NON_VIRTUAL, - __GLint__glGetUniformLocation__GLuint__C5_GLchar_P1, - "", - ""); - I_Method3(void, glGetUniformfv, IN, GLuint, program, IN, GLint, location, IN, GLfloat *, params, - Properties::NON_VIRTUAL, - __void__glGetUniformfv__GLuint__GLint__GLfloat_P1, - "", - ""); - I_Method3(void, glGetUniformiv, IN, GLuint, program, IN, GLint, location, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetUniformiv__GLuint__GLint__GLint_P1, - "", - ""); - I_Method3(void, glGetVertexAttribdv, IN, GLuint, index, IN, GLenum, pname, IN, GLdouble *, params, - Properties::NON_VIRTUAL, - __void__glGetVertexAttribdv__GLuint__GLenum__GLdouble_P1, - "", - ""); - I_Method3(void, glGetVertexAttribfv, IN, GLuint, index, IN, GLenum, pname, IN, GLfloat *, params, - Properties::NON_VIRTUAL, - __void__glGetVertexAttribfv__GLuint__GLenum__GLfloat_P1, - "", - ""); - I_Method3(void, glGetVertexAttribiv, IN, GLuint, index, IN, GLenum, pname, IN, GLint *, params, - Properties::NON_VIRTUAL, - __void__glGetVertexAttribiv__GLuint__GLenum__GLint_P1, - "", - ""); - I_Method3(void, glGetVertexAttribPointerv, IN, GLuint, index, IN, GLenum, pname, IN, GLvoid **, pointer, - Properties::NON_VIRTUAL, - __void__glGetVertexAttribPointerv__GLuint__GLenum__GLvoid_P1P1, - "", - ""); - I_Method1(GLboolean, glIsProgram, IN, GLuint, program, - Properties::NON_VIRTUAL, - __GLboolean__glIsProgram__GLuint, - "", - ""); - I_Method1(GLboolean, glIsShader, IN, GLuint, shader, - Properties::NON_VIRTUAL, - __GLboolean__glIsShader__GLuint, - "", - ""); - I_Method1(void, glLinkProgram, IN, GLuint, program, - Properties::NON_VIRTUAL, - __void__glLinkProgram__GLuint, - "", - ""); - I_Method4(void, glShaderSource, IN, GLuint, shader, IN, GLsizei, count, IN, const GLchar **, string, IN, const GLint *, length, - Properties::NON_VIRTUAL, - __void__glShaderSource__GLuint__GLsizei__C5_GLchar_P1P1__C5_GLint_P1, - "", - ""); - I_Method1(void, glUseProgram, IN, GLuint, program, - Properties::NON_VIRTUAL, - __void__glUseProgram__GLuint, - "", - ""); - I_Method2(void, glUniform1f, IN, GLint, location, IN, GLfloat, v0, - Properties::NON_VIRTUAL, - __void__glUniform1f__GLint__GLfloat, - "", - ""); - I_Method3(void, glUniform2f, IN, GLint, location, IN, GLfloat, v0, IN, GLfloat, v1, - Properties::NON_VIRTUAL, - __void__glUniform2f__GLint__GLfloat__GLfloat, - "", - ""); - I_Method4(void, glUniform3f, IN, GLint, location, IN, GLfloat, v0, IN, GLfloat, v1, IN, GLfloat, v2, - Properties::NON_VIRTUAL, - __void__glUniform3f__GLint__GLfloat__GLfloat__GLfloat, - "", - ""); - I_Method5(void, glUniform4f, IN, GLint, location, IN, GLfloat, v0, IN, GLfloat, v1, IN, GLfloat, v2, IN, GLfloat, v3, - Properties::NON_VIRTUAL, - __void__glUniform4f__GLint__GLfloat__GLfloat__GLfloat__GLfloat, - "", - ""); - I_Method2(void, glUniform1i, IN, GLint, location, IN, GLint, v0, - Properties::NON_VIRTUAL, - __void__glUniform1i__GLint__GLint, - "", - ""); - I_Method3(void, glUniform2i, IN, GLint, location, IN, GLint, v0, IN, GLint, v1, - Properties::NON_VIRTUAL, - __void__glUniform2i__GLint__GLint__GLint, - "", - ""); - I_Method4(void, glUniform3i, IN, GLint, location, IN, GLint, v0, IN, GLint, v1, IN, GLint, v2, - Properties::NON_VIRTUAL, - __void__glUniform3i__GLint__GLint__GLint__GLint, - "", - ""); - I_Method5(void, glUniform4i, IN, GLint, location, IN, GLint, v0, IN, GLint, v1, IN, GLint, v2, IN, GLint, v3, - Properties::NON_VIRTUAL, - __void__glUniform4i__GLint__GLint__GLint__GLint__GLint, - "", - ""); - I_Method3(void, glUniform1fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniform1fv__GLint__GLsizei__C5_GLfloat_P1, - "", - ""); - I_Method3(void, glUniform2fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniform2fv__GLint__GLsizei__C5_GLfloat_P1, - "", - ""); - I_Method3(void, glUniform3fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniform3fv__GLint__GLsizei__C5_GLfloat_P1, - "", - ""); - I_Method3(void, glUniform4fv, IN, GLint, location, IN, GLsizei, count, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniform4fv__GLint__GLsizei__C5_GLfloat_P1, - "", - ""); - I_Method3(void, glUniform1iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value, - Properties::NON_VIRTUAL, - __void__glUniform1iv__GLint__GLsizei__C5_GLint_P1, - "", - ""); - I_Method3(void, glUniform2iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value, - Properties::NON_VIRTUAL, - __void__glUniform2iv__GLint__GLsizei__C5_GLint_P1, - "", - ""); - I_Method3(void, glUniform3iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value, - Properties::NON_VIRTUAL, - __void__glUniform3iv__GLint__GLsizei__C5_GLint_P1, - "", - ""); - I_Method3(void, glUniform4iv, IN, GLint, location, IN, GLsizei, count, IN, const GLint *, value, - Properties::NON_VIRTUAL, - __void__glUniform4iv__GLint__GLsizei__C5_GLint_P1, - "", - ""); - I_Method4(void, glUniformMatrix2fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix2fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glUniformMatrix3fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix3fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glUniformMatrix4fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix4fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method1(void, glValidateProgram, IN, GLuint, program, - Properties::NON_VIRTUAL, - __void__glValidateProgram__GLuint, - "", - ""); - I_Method2(void, glVertexAttrib1d, IN, GLuint, index, IN, GLdouble, x, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1d__GLuint__GLdouble, - "", - ""); - I_Method2(void, glVertexAttrib1dv, IN, GLuint, index, IN, const GLdouble *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1dv__GLuint__C5_GLdouble_P1, - "", - ""); - I_Method2(void, glVertexAttrib1f, IN, GLuint, index, IN, GLfloat, x, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1f__GLuint__GLfloat, - "", - ""); - I_Method2(void, glVertexAttrib1fv, IN, GLuint, index, IN, const GLfloat *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1fv__GLuint__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glVertexAttrib1s, IN, GLuint, index, IN, GLshort, x, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1s__GLuint__GLshort, - "", - ""); - I_Method2(void, glVertexAttrib1sv, IN, GLuint, index, IN, const GLshort *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib1sv__GLuint__C5_GLshort_P1, - "", - ""); - I_Method3(void, glVertexAttrib2d, IN, GLuint, index, IN, GLdouble, x, IN, GLdouble, y, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2d__GLuint__GLdouble__GLdouble, - "", - ""); - I_Method2(void, glVertexAttrib2dv, IN, GLuint, index, IN, const GLdouble *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2dv__GLuint__C5_GLdouble_P1, - "", - ""); - I_Method3(void, glVertexAttrib2f, IN, GLuint, index, IN, GLfloat, x, IN, GLfloat, y, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2f__GLuint__GLfloat__GLfloat, - "", - ""); - I_Method2(void, glVertexAttrib2fv, IN, GLuint, index, IN, const GLfloat *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2fv__GLuint__C5_GLfloat_P1, - "", - ""); - I_Method3(void, glVertexAttrib2s, IN, GLuint, index, IN, GLshort, x, IN, GLshort, y, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2s__GLuint__GLshort__GLshort, - "", - ""); - I_Method2(void, glVertexAttrib2sv, IN, GLuint, index, IN, const GLshort *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib2sv__GLuint__C5_GLshort_P1, - "", - ""); - I_Method4(void, glVertexAttrib3d, IN, GLuint, index, IN, GLdouble, x, IN, GLdouble, y, IN, GLdouble, z, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3d__GLuint__GLdouble__GLdouble__GLdouble, - "", - ""); - I_Method2(void, glVertexAttrib3dv, IN, GLuint, index, IN, const GLdouble *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3dv__GLuint__C5_GLdouble_P1, - "", - ""); - I_Method4(void, glVertexAttrib3f, IN, GLuint, index, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3f__GLuint__GLfloat__GLfloat__GLfloat, - "", - ""); - I_Method2(void, glVertexAttrib3fv, IN, GLuint, index, IN, const GLfloat *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3fv__GLuint__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glVertexAttrib3s, IN, GLuint, index, IN, GLshort, x, IN, GLshort, y, IN, GLshort, z, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3s__GLuint__GLshort__GLshort__GLshort, - "", - ""); - I_Method2(void, glVertexAttrib3sv, IN, GLuint, index, IN, const GLshort *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib3sv__GLuint__C5_GLshort_P1, - "", - ""); - I_Method2(void, glVertexAttrib4Nbv, IN, GLuint, index, IN, const GLbyte *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Nbv__GLuint__C5_GLbyte_P1, - "", - ""); - I_Method2(void, glVertexAttrib4Niv, IN, GLuint, index, IN, const GLint *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Niv__GLuint__C5_GLint_P1, - "", - ""); - I_Method2(void, glVertexAttrib4Nsv, IN, GLuint, index, IN, const GLshort *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Nsv__GLuint__C5_GLshort_P1, - "", - ""); - I_Method5(void, glVertexAttrib4Nub, IN, GLuint, index, IN, GLubyte, x, IN, GLubyte, y, IN, GLubyte, z, IN, GLubyte, w, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Nub__GLuint__GLubyte__GLubyte__GLubyte__GLubyte, - "", - ""); - I_Method2(void, glVertexAttrib4Nubv, IN, GLuint, index, IN, const GLubyte *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Nubv__GLuint__C5_GLubyte_P1, - "", - ""); - I_Method2(void, glVertexAttrib4Nuiv, IN, GLuint, index, IN, const GLuint *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Nuiv__GLuint__C5_GLuint_P1, - "", - ""); - I_Method2(void, glVertexAttrib4Nusv, IN, GLuint, index, IN, const GLushort *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4Nusv__GLuint__C5_GLushort_P1, - "", - ""); - I_Method2(void, glVertexAttrib4bv, IN, GLuint, index, IN, const GLbyte *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4bv__GLuint__C5_GLbyte_P1, - "", - ""); - I_Method5(void, glVertexAttrib4d, IN, GLuint, index, IN, GLdouble, x, IN, GLdouble, y, IN, GLdouble, z, IN, GLdouble, w, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4d__GLuint__GLdouble__GLdouble__GLdouble__GLdouble, - "", - ""); - I_Method2(void, glVertexAttrib4dv, IN, GLuint, index, IN, const GLdouble *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4dv__GLuint__C5_GLdouble_P1, - "", - ""); - I_Method5(void, glVertexAttrib4f, IN, GLuint, index, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, IN, GLfloat, w, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4f__GLuint__GLfloat__GLfloat__GLfloat__GLfloat, - "", - ""); - I_Method2(void, glVertexAttrib4fv, IN, GLuint, index, IN, const GLfloat *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4fv__GLuint__C5_GLfloat_P1, - "", - ""); - I_Method2(void, glVertexAttrib4iv, IN, GLuint, index, IN, const GLint *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4iv__GLuint__C5_GLint_P1, - "", - ""); - I_Method5(void, glVertexAttrib4s, IN, GLuint, index, IN, GLshort, x, IN, GLshort, y, IN, GLshort, z, IN, GLshort, w, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4s__GLuint__GLshort__GLshort__GLshort__GLshort, - "", - ""); - I_Method2(void, glVertexAttrib4sv, IN, GLuint, index, IN, const GLshort *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4sv__GLuint__C5_GLshort_P1, - "", - ""); - I_Method2(void, glVertexAttrib4ubv, IN, GLuint, index, IN, const GLubyte *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4ubv__GLuint__C5_GLubyte_P1, - "", - ""); - I_Method2(void, glVertexAttrib4uiv, IN, GLuint, index, IN, const GLuint *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4uiv__GLuint__C5_GLuint_P1, - "", - ""); - I_Method2(void, glVertexAttrib4usv, IN, GLuint, index, IN, const GLushort *, v, - Properties::NON_VIRTUAL, - __void__glVertexAttrib4usv__GLuint__C5_GLushort_P1, - "", - ""); - I_Method6(void, glVertexAttribPointer, IN, GLuint, index, IN, GLint, size, IN, GLenum, type, IN, GLboolean, normalized, IN, GLsizei, stride, IN, const GLvoid *, pointer, - Properties::NON_VIRTUAL, - __void__glVertexAttribPointer__GLuint__GLint__GLenum__GLboolean__GLsizei__C5_GLvoid_P1, - "", - ""); - I_Method0(GLuint, getCurrentProgram, - Properties::NON_VIRTUAL, - __GLuint__getCurrentProgram, - "", - ""); - I_Method2(bool, getProgramInfoLog, IN, GLuint, program, IN, std::string &, result, - Properties::NON_VIRTUAL, - __bool__getProgramInfoLog__GLuint__std_string_R1, - "", - ""); - I_Method2(bool, getShaderInfoLog, IN, GLuint, shader, IN, std::string &, result, - Properties::NON_VIRTUAL, - __bool__getShaderInfoLog__GLuint__std_string_R1, - "", - ""); - I_Method2(bool, getAttribLocation, IN, const char *, attribName, IN, GLuint &, slot, - Properties::NON_VIRTUAL, - __bool__getAttribLocation__C5_char_P1__GLuint_R1, - "", - ""); - I_Method2(bool, getFragDataLocation, IN, const char *, fragDataName, IN, GLuint &, slot, - Properties::NON_VIRTUAL, - __bool__getFragDataLocation__C5_char_P1__GLuint_R1, - "", - ""); - I_Method4(void, glUniformMatrix2x3fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix2x3fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glUniformMatrix3x2fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix3x2fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glUniformMatrix2x4fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix2x4fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glUniformMatrix4x2fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix4x2fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glUniformMatrix3x4fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix3x4fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method4(void, glUniformMatrix4x3fv, IN, GLint, location, IN, GLsizei, count, IN, GLboolean, transpose, IN, const GLfloat *, value, - Properties::NON_VIRTUAL, - __void__glUniformMatrix4x3fv__GLint__GLsizei__GLboolean__C5_GLfloat_P1, - "", - ""); - I_Method3(void, glProgramParameteri, IN, GLuint, program, IN, GLenum, pname, IN, GLint, value, - Properties::NON_VIRTUAL, - __void__glProgramParameteri__GLuint__GLenum__GLint, - "", - ""); - I_Method4(void, glFramebufferTexture, IN, GLenum, target, IN, GLenum, attachment, IN, GLuint, texture, IN, GLint, level, - Properties::NON_VIRTUAL, - __void__glFramebufferTexture__GLenum__GLenum__GLuint__GLint, - "", - ""); - I_Method5(void, glFramebufferTextureLayer, IN, GLenum, target, IN, GLenum, attachment, IN, GLuint, texture, IN, GLint, level, IN, GLint, layer, - Properties::NON_VIRTUAL, - __void__glFramebufferTextureLayer__GLenum__GLenum__GLuint__GLint__GLint, - "", - ""); - I_Method5(void, glFramebufferTextureFace, IN, GLenum, target, IN, GLenum, attachment, IN, GLuint, texture, IN, GLint, level, IN, GLenum, face, - Properties::NON_VIRTUAL, - __void__glFramebufferTextureFace__GLenum__GLenum__GLuint__GLint__GLenum, - "", - ""); - I_Method3(void, glGetUniformuiv, IN, GLuint, program, IN, GLint, location, IN, GLuint *, params, - Properties::NON_VIRTUAL, - __void__glGetUniformuiv__GLuint__GLint__GLuint_P1, - "", - ""); - I_Method3(void, glBindFragDataLocation, IN, GLuint, program, IN, GLuint, color, IN, const GLchar *, name, - Properties::NON_VIRTUAL, - __void__glBindFragDataLocation__GLuint__GLuint__C5_GLchar_P1, - "", - ""); - I_Method2(GLint, glGetFragDataLocation, IN, GLuint, program, IN, const GLchar *, name, - Properties::NON_VIRTUAL, - __GLint__glGetFragDataLocation__GLuint__C5_GLchar_P1, - "", - ""); - I_Method2(void, glUniform1ui, IN, GLint, location, IN, GLuint, v0, - Properties::NON_VIRTUAL, - __void__glUniform1ui__GLint__GLuint, - "", - ""); - I_Method3(void, glUniform2ui, IN, GLint, location, IN, GLuint, v0, IN, GLuint, v1, - Properties::NON_VIRTUAL, - __void__glUniform2ui__GLint__GLuint__GLuint, - "", - ""); - I_Method4(void, glUniform3ui, IN, GLint, location, IN, GLuint, v0, IN, GLuint, v1, IN, GLuint, v2, - Properties::NON_VIRTUAL, - __void__glUniform3ui__GLint__GLuint__GLuint__GLuint, - "", - ""); - I_Method5(void, glUniform4ui, IN, GLint, location, IN, GLuint, v0, IN, GLuint, v1, IN, GLuint, v2, IN, GLuint, v3, - Properties::NON_VIRTUAL, - __void__glUniform4ui__GLint__GLuint__GLuint__GLuint__GLuint, - "", - ""); - I_Method3(void, glUniform1uiv, IN, GLint, location, IN, GLsizei, count, IN, const GLuint *, value, - Properties::NON_VIRTUAL, - __void__glUniform1uiv__GLint__GLsizei__C5_GLuint_P1, - "", - ""); - I_Method3(void, glUniform2uiv, IN, GLint, location, IN, GLsizei, count, IN, const GLuint *, value, - Properties::NON_VIRTUAL, - __void__glUniform2uiv__GLint__GLsizei__C5_GLuint_P1, - "", - ""); - I_Method3(void, glUniform3uiv, IN, GLint, location, IN, GLsizei, count, IN, const GLuint *, value, - Properties::NON_VIRTUAL, - __void__glUniform3uiv__GLint__GLsizei__C5_GLuint_P1, - "", - ""); - I_Method3(void, glUniform4uiv, IN, GLint, location, IN, GLsizei, count, IN, const GLuint *, value, - Properties::NON_VIRTUAL, - __void__glUniform4uiv__GLint__GLsizei__C5_GLuint_P1, - "", - ""); - I_StaticMethod2(osg::GL2Extensions *, Get, IN, unsigned int, contextID, IN, bool, createIfNotInitalized, - __GL2Extensions_P1__Get__unsigned_int__bool_S, - "Function to call to get the extension of a specified context. ", - "If the Exentsion object for that context has not yet been created then and the 'createIfNotInitalized' flag been set to false then returns NULL. If 'createIfNotInitalized' is true then the Extensions object is automatically created. However, in this case the extension object only be created with the graphics context associated with ContextID.. "); - I_StaticMethod2(void, Set, IN, unsigned int, contextID, IN, osg::GL2Extensions *, extensions, - __void__Set__unsigned_int__GL2Extensions_P1_S, - "allows users to override the extensions across graphics contexts. ", - "typically used when you have different extensions supported across graphics pipes but need to ensure that they all use the same low common denominator extensions. "); - - I_SimpleProperty(GLuint, CurrentProgram, - __GLuint__getCurrentProgram, - 0); - I_SimpleProperty(bool, FragmentShaderSupported, - 0, - __void__setFragmentShaderSupported__bool); - I_SimpleProperty(bool, GeometryShader4Supported, - 0, - __void__setGeometryShader4Supported__bool); - I_SimpleProperty(float, GlVersion, - __float__getGlVersion, - 0); - I_SimpleProperty(bool, GpuShader4Supported, - 0, - __void__setGpuShader4Supported__bool); - I_SimpleProperty(bool, Language100Supported, - 0, - __void__setLanguage100Supported__bool); - I_SimpleProperty(float, LanguageVersion, - __float__getLanguageVersion, - 0); - I_SimpleProperty(bool, ShaderObjectsSupported, - 0, - __void__setShaderObjectsSupported__bool); - I_SimpleProperty(bool, VertexShaderSupported, - 0, - __void__setVertexShaderSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index e9aabee50..a093d22ec 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -28,14 +28,6 @@ #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); @@ -45,6 +37,14 @@ 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 c47593898..56e315a28 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -39,6 +39,54 @@ 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, @@ -289,54 +337,6 @@ 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 6661c33c3..286f5da9b 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 9733733a7..c4609858a 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 04c776703..a45b8b48b 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -28,8 +28,6 @@ #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); @@ -50,6 +48,8 @@ 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/ImageSequence.cpp b/src/osgWrappers/osg/ImageSequence.cpp index cc5ea1654..24650556b 100644 --- a/src/osgWrappers/osg/ImageSequence.cpp +++ b/src/osgWrappers/osg/ImageSequence.cpp @@ -25,10 +25,6 @@ #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); @@ -36,6 +32,10 @@ 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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, diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 23e8fb8a9..2511a3368 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -52,7 +52,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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, Properties::VIRTUAL, __Object_P1__clone__C5_CopyOp_R1, "Clone an object, with Object* return type. ", diff --git a/src/osgWrappers/osg/KdTree.cpp b/src/osgWrappers/osg/KdTree.cpp index 4079025cc..401ef2e56 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 3a76918f1..eb1530f84 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -25,14 +25,6 @@ #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); @@ -45,6 +37,14 @@ 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 b4115f3e9..3a7bbe7df 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 a3c89b207..73388fae5 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 ce32ab82c..675e0773e 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 8f0a92a77..3023385ef 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 860346c42..d72e5ccaa 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 8e8abce63..f71ac329a 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 546b435a8..8f4dc4bfe 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -138,60 +138,3 @@ BEGIN_OBJECT_REFLECTOR(osg::Multisample) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Multisample::Extensions) - I_DeclaringFile("osg/Multisample"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::Multisample::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::Multisample::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setMultisampleSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setMultisampleSupported__bool, - "", - ""); - I_Method1(void, setMultisampleFilterHintSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setMultisampleFilterHintSupported__bool, - "", - ""); - I_Method0(bool, isMultisampleSupported, - Properties::NON_VIRTUAL, - __bool__isMultisampleSupported, - "", - ""); - I_Method0(bool, isMultisampleFilterHintSupported, - Properties::NON_VIRTUAL, - __bool__isMultisampleFilterHintSupported, - "", - ""); - I_Method2(void, glSampleCoverage, IN, GLclampf, value, IN, GLboolean, invert, - Properties::NON_VIRTUAL, - __void__glSampleCoverage__GLclampf__GLboolean, - "", - ""); - - I_SimpleProperty(bool, MultisampleFilterHintSupported, - 0, - __void__setMultisampleFilterHintSupported__bool); - I_SimpleProperty(bool, MultisampleSupported, - 0, - __void__setMultisampleSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index b0ab9cd9f..6f7f3b25d 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/NodeCallback.cpp b/src/osgWrappers/osg/NodeCallback.cpp index d0adfd6cb..3c74fbdab 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/OcclusionQueryNode.cpp b/src/osgWrappers/osg/OcclusionQueryNode.cpp index fb25b3c05..6587a436c 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 *, state, 0, + I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 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. ", diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index 9757867f4..a6cfe6642 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 b8d1549f7..7922d3361 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -163,72 +163,3 @@ BEGIN_OBJECT_REFLECTOR(osg::Point) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Point::Extensions) - I_DeclaringFile("osg/Point"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::Point::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::Point::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setPointParametersSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setPointParametersSupported__bool, - "", - ""); - I_Method0(bool, isPointParametersSupported, - Properties::NON_VIRTUAL, - __bool__isPointParametersSupported, - "", - ""); - I_Method1(void, setPointSpriteCoordOriginSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setPointSpriteCoordOriginSupported__bool, - "", - ""); - I_Method0(bool, isPointSpriteCoordOriginSupported, - Properties::NON_VIRTUAL, - __bool__isPointSpriteCoordOriginSupported, - "", - ""); - I_Method2(void, glPointParameteri, IN, GLenum, pname, IN, GLint, param, - Properties::NON_VIRTUAL, - __void__glPointParameteri__GLenum__GLint, - "", - ""); - I_Method2(void, glPointParameterf, IN, GLenum, pname, IN, GLfloat, param, - Properties::NON_VIRTUAL, - __void__glPointParameterf__GLenum__GLfloat, - "", - ""); - I_Method2(void, glPointParameterfv, IN, GLenum, pname, IN, const GLfloat *, params, - Properties::NON_VIRTUAL, - __void__glPointParameterfv__GLenum__C5_GLfloat_P1, - "", - ""); - - - - I_SimpleProperty(bool, PointParametersSupported, - 0, - __void__setPointParametersSupported__bool); - I_SimpleProperty(bool, PointSpriteCoordOriginSupported, - 0, - __void__setPointSpriteCoordOriginSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/PointSprite.cpp b/src/osgWrappers/osg/PointSprite.cpp index 778330e56..c2814269a 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 04d9519bd..af1fda549 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 1fe26f423..36b411ad2 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 c68c30121..0d20d5acc 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 4ab72ffda..49e70f277 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 cbd5f67f2..db696abb3 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 7bcf470c9..58f0e6208 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -27,10 +27,6 @@ #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); @@ -44,6 +40,10 @@ 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 c82ebf1d6..50c8a425e 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 b163e95d2..31b4fcb8e 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 378c17ecd..a522dac69 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 d275fcec9..857669211 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index a22297352..9719303df 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, sv, + I_Method1(void, accept, IN, osg::ShapeVisitor &, x, 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 &, csv, + I_Method1(void, accept, IN, osg::ConstShapeVisitor &, x, 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 c7b1f8182..2f693f012 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index 5ef816a91..11a011482 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -31,8 +31,6 @@ #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); @@ -40,6 +38,8 @@ 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 7e2f0a803..ce9042061 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -26,16 +26,6 @@ #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) - BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values) I_DeclaringFile("osg/StateAttribute"); I_EnumLabel(osg::StateAttribute::OFF); @@ -97,6 +87,16 @@ 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); @@ -301,7 +301,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateAttribute::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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 908013d28..698d5957a 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -26,6 +26,20 @@ #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) @@ -42,20 +56,6 @@ 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/Stencil.cpp b/src/osgWrappers/osg/Stencil.cpp index 9cf305e78..85fdf3c97 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 dce3658ce..66aa31f85 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", @@ -230,47 +230,3 @@ BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided::Extensions) - I_DeclaringFile("osg/StencilTwoSided"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::StencilTwoSided::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::StencilTwoSided::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setStencilTwoSidedSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setStencilTwoSidedSupported__bool, - "", - ""); - I_Method0(bool, isStencilTwoSidedSupported, - Properties::NON_VIRTUAL, - __bool__isStencilTwoSidedSupported, - "", - ""); - I_Method1(void, glActiveStencilFace, IN, GLenum, face, - Properties::NON_VIRTUAL, - __void__glActiveStencilFace__GLenum, - "", - ""); - - I_SimpleProperty(bool, StencilTwoSidedSupported, - 0, - __void__setStencilTwoSidedSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 7af94c4e8..5dca10777 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 d7f062b65..1f4e33193 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 45aa3d039..f541f9002 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 35f5a73a9..065e20d1e 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 540ad515b..dd2a0607a 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", ""); - I_Method1(void, apply, IN, osg::State &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 e86ecb7f4..d2536423f 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 1f15bcd1c..43fabc882 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -27,10 +27,6 @@ #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); @@ -101,6 +97,10 @@ 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, Properties::VIRTUAL, __bool__getModeUsage__StateAttribute_ModeUsage_R1, "Return the modes associated with this StateAttribute. ", @@ -655,248 +655,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Texture::Extensions) - I_DeclaringFile("osg/Texture"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::Texture::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::Texture::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setMultiTexturingSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setMultiTexturingSupported__bool, - "", - ""); - I_Method0(bool, isMultiTexturingSupported, - Properties::NON_VIRTUAL, - __bool__isMultiTexturingSupported, - "", - ""); - I_Method1(void, setTextureFilterAnisotropicSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTextureFilterAnisotropicSupported__bool, - "", - ""); - I_Method0(bool, isTextureFilterAnisotropicSupported, - Properties::NON_VIRTUAL, - __bool__isTextureFilterAnisotropicSupported, - "", - ""); - I_Method1(void, setTextureCompressionARBSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTextureCompressionARBSupported__bool, - "", - ""); - I_Method0(bool, isTextureCompressionARBSupported, - Properties::NON_VIRTUAL, - __bool__isTextureCompressionARBSupported, - "", - ""); - I_Method1(void, setTextureCompressionS3TCSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTextureCompressionS3TCSupported__bool, - "", - ""); - I_Method0(bool, isTextureCompressionS3TCSupported, - Properties::NON_VIRTUAL, - __bool__isTextureCompressionS3TCSupported, - "", - ""); - I_Method1(void, setTextureMirroredRepeatSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTextureMirroredRepeatSupported__bool, - "", - ""); - I_Method0(bool, isTextureMirroredRepeatSupported, - Properties::NON_VIRTUAL, - __bool__isTextureMirroredRepeatSupported, - "", - ""); - I_Method1(void, setTextureEdgeClampSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTextureEdgeClampSupported__bool, - "", - ""); - I_Method0(bool, isTextureEdgeClampSupported, - Properties::NON_VIRTUAL, - __bool__isTextureEdgeClampSupported, - "", - ""); - I_Method1(void, setTextureBorderClampSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTextureBorderClampSupported__bool, - "", - ""); - I_Method0(bool, isTextureBorderClampSupported, - Properties::NON_VIRTUAL, - __bool__isTextureBorderClampSupported, - "", - ""); - I_Method1(void, setGenerateMipMapSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setGenerateMipMapSupported__bool, - "", - ""); - I_Method0(bool, isGenerateMipMapSupported, - Properties::NON_VIRTUAL, - __bool__isGenerateMipMapSupported, - "", - ""); - I_Method1(void, setShadowSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setShadowSupported__bool, - "", - ""); - I_Method0(bool, isShadowSupported, - Properties::NON_VIRTUAL, - __bool__isShadowSupported, - "", - ""); - I_Method1(void, setShadowAmbientSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setShadowAmbientSupported__bool, - "", - ""); - I_Method0(bool, isShadowAmbientSupported, - Properties::NON_VIRTUAL, - __bool__isShadowAmbientSupported, - "", - ""); - I_Method1(void, setMaxTextureSize, IN, GLint, maxsize, - Properties::NON_VIRTUAL, - __void__setMaxTextureSize__GLint, - "", - ""); - I_Method0(GLint, maxTextureSize, - Properties::NON_VIRTUAL, - __GLint__maxTextureSize, - "", - ""); - I_Method1(void, setNumTextureUnits, IN, GLint, nunits, - Properties::NON_VIRTUAL, - __void__setNumTextureUnits__GLint, - "", - ""); - I_Method0(GLint, numTextureUnits, - Properties::NON_VIRTUAL, - __GLint__numTextureUnits, - "", - ""); - I_Method0(bool, isCompressedTexImage2DSupported, - Properties::NON_VIRTUAL, - __bool__isCompressedTexImage2DSupported, - "", - ""); - I_Method0(bool, isCompressedTexSubImage2DSupported, - Properties::NON_VIRTUAL, - __bool__isCompressedTexSubImage2DSupported, - "", - ""); - I_Method8(void, glCompressedTexImage2D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glCompressedTexImage2D__GLenum__GLint__GLenum__GLsizei__GLsizei__GLint__GLsizei__C5_GLvoid_P1, - "", - ""); - I_Method9(void, glCompressedTexSubImage2D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLenum, format, IN, GLsizei, type, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glCompressedTexSubImage2D__GLenum__GLint__GLint__GLint__GLsizei__GLsizei__GLenum__GLsizei__C5_GLvoid_P1, - "", - ""); - I_Method3(void, glGetCompressedTexImage, IN, GLenum, target, IN, GLint, level, IN, GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glGetCompressedTexImage__GLenum__GLint__GLvoid_P1, - "", - ""); - I_Method0(bool, isClientStorageSupported, - Properties::NON_VIRTUAL, - __bool__isClientStorageSupported, - "", - ""); - I_Method1(bool, isNonPowerOfTwoTextureSupported, IN, GLenum, filter, - Properties::NON_VIRTUAL, - __bool__isNonPowerOfTwoTextureSupported__GLenum, - "", - ""); - I_Method1(void, setTextureIntegerSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTextureIntegerSupported__bool, - "", - ""); - I_Method0(bool, isTextureIntegerSupported, - Properties::NON_VIRTUAL, - __bool__isTextureIntegerSupported, - "", - ""); - I_Method3(void, glTexParameterIiv, IN, GLenum, target, IN, GLenum, pname, IN, const GLint *, data, - Properties::NON_VIRTUAL, - __void__glTexParameterIiv__GLenum__GLenum__C5_GLint_P1, - "", - ""); - I_Method3(void, glTexParameterIuiv, IN, GLenum, target, IN, GLenum, pname, IN, const GLuint *, data, - Properties::NON_VIRTUAL, - __void__glTexParameterIuiv__GLenum__GLenum__C5_GLuint_P1, - "", - ""); - - - - I_SimpleProperty(bool, GenerateMipMapSupported, - 0, - __void__setGenerateMipMapSupported__bool); - I_SimpleProperty(GLint, MaxTextureSize, - 0, - __void__setMaxTextureSize__GLint); - I_SimpleProperty(bool, MultiTexturingSupported, - 0, - __void__setMultiTexturingSupported__bool); - I_SimpleProperty(GLint, NumTextureUnits, - 0, - __void__setNumTextureUnits__GLint); - I_SimpleProperty(bool, ShadowAmbientSupported, - 0, - __void__setShadowAmbientSupported__bool); - I_SimpleProperty(bool, ShadowSupported, - 0, - __void__setShadowSupported__bool); - I_SimpleProperty(bool, TextureBorderClampSupported, - 0, - __void__setTextureBorderClampSupported__bool); - I_SimpleProperty(bool, TextureCompressionARBSupported, - 0, - __void__setTextureCompressionARBSupported__bool); - I_SimpleProperty(bool, TextureCompressionS3TCSupported, - 0, - __void__setTextureCompressionS3TCSupported__bool); - I_SimpleProperty(bool, TextureEdgeClampSupported, - 0, - __void__setTextureEdgeClampSupported__bool); - I_SimpleProperty(bool, TextureFilterAnisotropicSupported, - 0, - __void__setTextureFilterAnisotropicSupported__bool); - I_SimpleProperty(bool, TextureIntegerSupported, - 0, - __void__setTextureIntegerSupported__bool); - I_SimpleProperty(bool, TextureMirroredRepeatSupported, - 0, - __void__setTextureMirroredRepeatSupported__bool); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObject) I_DeclaringFile("osg/Texture"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osg/Texture1D.cpp b/src/osgWrappers/osg/Texture1D.cpp index 55c46c7fb..ff38b732c 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 dbff5ab74..3e356a103 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 f8625cd07..abc77195f 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -232,123 +232,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Texture2DArray::Extensions) - I_DeclaringFile("osg/Texture2DArray"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::Texture2DArray::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::Texture2DArray::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setTexture2DArraySupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTexture2DArraySupported__bool, - "", - ""); - I_Method0(bool, isTexture2DArraySupported, - Properties::NON_VIRTUAL, - __bool__isTexture2DArraySupported, - "", - ""); - I_Method1(void, setTexture3DSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTexture3DSupported__bool, - "", - ""); - I_Method0(bool, isTexture3DSupported, - Properties::NON_VIRTUAL, - __bool__isTexture3DSupported, - "", - ""); - I_Method1(void, setMaxLayerCount, IN, GLint, count, - Properties::NON_VIRTUAL, - __void__setMaxLayerCount__GLint, - "", - ""); - I_Method0(GLint, maxLayerCount, - Properties::NON_VIRTUAL, - __GLint__maxLayerCount, - "", - ""); - I_Method1(void, setMax2DSize, IN, GLint, size, - Properties::NON_VIRTUAL, - __void__setMax2DSize__GLint, - "", - ""); - I_Method0(GLint, max2DSize, - Properties::NON_VIRTUAL, - __GLint__max2DSize, - "", - ""); - I_Method10(void, glTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels, - Properties::NON_VIRTUAL, - __void__glTexImage3D__GLenum__GLint__GLenum__GLsizei__GLsizei__GLsizei__GLint__GLenum__GLenum__C5_GLvoid_P1, - "", - ""); - I_Method11(void, glTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels, - Properties::NON_VIRTUAL, - __void__glTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLenum__C5_GLvoid_P1, - "", - ""); - I_Method9(void, glCopyTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLint, x, IN, GLint, y, IN, GLsizei, width, IN, GLsizei, height, - Properties::NON_VIRTUAL, - __void__glCopyTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLint__GLint__GLsizei__GLsizei, - "", - ""); - I_Method0(bool, isCompressedTexImage3DSupported, - Properties::NON_VIRTUAL, - __bool__isCompressedTexImage3DSupported, - "", - ""); - I_Method9(void, glCompressedTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glCompressedTexImage3D__GLenum__GLint__GLenum__GLsizei__GLsizei__GLsizei__GLint__GLsizei__C5_GLvoid_P1, - "", - ""); - I_Method0(bool, isCompressedTexSubImage3DSupported, - Properties::NON_VIRTUAL, - __bool__isCompressedTexSubImage3DSupported, - "", - ""); - I_Method11(void, glCompressedTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLsizei, imageSize, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glCompressedTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLsizei__C5_GLvoid_P1, - "", - ""); - - - - - - I_SimpleProperty(GLint, Max2DSize, - 0, - __void__setMax2DSize__GLint); - I_SimpleProperty(GLint, MaxLayerCount, - 0, - __void__setMaxLayerCount__GLint); - I_SimpleProperty(bool, Texture2DArraySupported, - 0, - __void__setTexture2DArraySupported__bool); - I_SimpleProperty(bool, Texture3DSupported, - 0, - __void__setTexture3DSupported__bool); -END_REFLECTOR - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2DArray::SubloadCallback) I_DeclaringFile("osg/Texture2DArray"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index c28f509e6..141454846 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, Properties::VIRTUAL, __osg_Object_P1__clone__C5_osg_CopyOp_R1, "Clone an attribute, with Object* return type. ", @@ -253,116 +253,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture3D) 0); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::Texture3D::Extensions) - I_DeclaringFile("osg/Texture3D"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::Texture3D::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::Texture3D::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setTexture3DSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTexture3DSupported__bool, - "", - ""); - I_Method0(bool, isTexture3DSupported, - Properties::NON_VIRTUAL, - __bool__isTexture3DSupported, - "", - ""); - I_Method1(void, setTexture3DFast, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setTexture3DFast__bool, - "", - ""); - I_Method0(bool, isTexture3DFast, - Properties::NON_VIRTUAL, - __bool__isTexture3DFast, - "", - ""); - I_Method1(void, setMaxTexture3DSize, IN, GLint, maxsize, - Properties::NON_VIRTUAL, - __void__setMaxTexture3DSize__GLint, - "", - ""); - I_Method0(GLint, maxTexture3DSize, - Properties::NON_VIRTUAL, - __GLint__maxTexture3DSize, - "", - ""); - I_Method10(void, glTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels, - Properties::NON_VIRTUAL, - __void__glTexImage3D__GLenum__GLint__GLenum__GLsizei__GLsizei__GLsizei__GLint__GLenum__GLenum__C5_GLvoid_P1, - "", - ""); - I_Method11(void, glTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, pixels, - Properties::NON_VIRTUAL, - __void__glTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLenum__C5_GLvoid_P1, - "", - ""); - I_Method9(void, glCopyTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLint, x, IN, GLint, y, IN, GLsizei, width, IN, GLsizei, height, - Properties::NON_VIRTUAL, - __void__glCopyTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLint__GLint__GLsizei__GLsizei, - "", - ""); - I_Method0(bool, isCompressedTexImage3DSupported, - Properties::NON_VIRTUAL, - __bool__isCompressedTexImage3DSupported, - "", - ""); - I_Method9(void, glCompressedTexImage3D, IN, GLenum, target, IN, GLint, level, IN, GLenum, internalformat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLint, border, IN, GLsizei, imageSize, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glCompressedTexImage3D__GLenum__GLint__GLenum__GLsizei__GLsizei__GLsizei__GLint__GLsizei__C5_GLvoid_P1, - "", - ""); - I_Method0(bool, isCompressedTexSubImage3DSupported, - Properties::NON_VIRTUAL, - __bool__isCompressedTexSubImage3DSupported, - "", - ""); - I_Method11(void, glCompressedTexSubImage3D, IN, GLenum, target, IN, GLint, level, IN, GLint, xoffset, IN, GLint, yoffset, IN, GLint, zoffset, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLsizei, imageSize, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__glCompressedTexSubImage3D__GLenum__GLint__GLint__GLint__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLsizei__C5_GLvoid_P1, - "", - ""); - I_Method8(void, gluBuild3DMipmaps, IN, GLenum, target, IN, GLint, internalFormat, IN, GLsizei, width, IN, GLsizei, height, IN, GLsizei, depth, IN, GLenum, format, IN, GLenum, type, IN, const GLvoid *, data, - Properties::NON_VIRTUAL, - __void__gluBuild3DMipmaps__GLenum__GLint__GLsizei__GLsizei__GLsizei__GLenum__GLenum__C5_GLvoid_P1, - "", - ""); - - - - - - - I_SimpleProperty(GLint, MaxTexture3DSize, - 0, - __void__setMaxTexture3DSize__GLint); - I_SimpleProperty(bool, Texture3DFast, - 0, - __void__setTexture3DFast__bool); - I_SimpleProperty(bool, Texture3DSupported, - 0, - __void__setTexture3DSupported__bool); -END_REFLECTOR - BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D::SubloadCallback) I_DeclaringFile("osg/Texture3D"); I_BaseType(osg::Referenced); diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index 8d29506e4..0549c788a 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 615ab4d34..e92100578 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 c0a07bb74..3311ea2a1 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index afa2a2536..484d4da80 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -123,8 +123,6 @@ 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); @@ -183,6 +181,8 @@ 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/VertexProgram.cpp b/src/osgWrappers/osg/VertexProgram.cpp index c1ff5a5c3..273cfe949 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 &, state, + I_Method1(void, compileGLObjects, IN, osg::State &, x, Properties::VIRTUAL, __void__compileGLObjects__State_R1, "Default to nothing to compile - all state is applied immediately. ", @@ -199,71 +199,3 @@ BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) __void__setVertexProgram__C5_std_string_R1); END_REFLECTOR -BEGIN_OBJECT_REFLECTOR(osg::VertexProgram::Extensions) - I_DeclaringFile("osg/VertexProgram"); - I_BaseType(osg::Referenced); - I_Constructor1(IN, unsigned int, contextID, - Properties::NON_EXPLICIT, - ____Extensions__unsigned_int, - "", - ""); - I_Constructor1(IN, const osg::VertexProgram::Extensions &, rhs, - Properties::NON_EXPLICIT, - ____Extensions__C5_Extensions_R1, - "", - ""); - I_Method1(void, lowestCommonDenominator, IN, const osg::VertexProgram::Extensions &, rhs, - Properties::NON_VIRTUAL, - __void__lowestCommonDenominator__C5_Extensions_R1, - "", - ""); - I_Method1(void, setupGLExtensions, IN, unsigned int, contextID, - Properties::NON_VIRTUAL, - __void__setupGLExtensions__unsigned_int, - "", - ""); - I_Method1(void, setVertexProgramSupported, IN, bool, flag, - Properties::NON_VIRTUAL, - __void__setVertexProgramSupported__bool, - "", - ""); - I_Method0(bool, isVertexProgramSupported, - Properties::NON_VIRTUAL, - __bool__isVertexProgramSupported, - "", - ""); - I_Method2(void, glBindProgram, IN, GLenum, target, IN, GLuint, id, - Properties::NON_VIRTUAL, - __void__glBindProgram__GLenum__GLuint, - "", - ""); - I_Method2(void, glGenPrograms, IN, GLsizei, n, IN, GLuint *, programs, - Properties::NON_VIRTUAL, - __void__glGenPrograms__GLsizei__GLuint_P1, - "", - ""); - I_Method2(void, glDeletePrograms, IN, GLsizei, n, IN, GLuint *, programs, - Properties::NON_VIRTUAL, - __void__glDeletePrograms__GLsizei__GLuint_P1, - "", - ""); - I_Method4(void, glProgramString, IN, GLenum, target, IN, GLenum, format, IN, GLsizei, len, IN, const void *, string, - Properties::NON_VIRTUAL, - __void__glProgramString__GLenum__GLenum__GLsizei__C5_void_P1, - "", - ""); - I_Method3(void, glProgramLocalParameter4fv, IN, GLenum, target, IN, GLuint, index, IN, const GLfloat *, params, - Properties::NON_VIRTUAL, - __void__glProgramLocalParameter4fv__GLenum__GLuint__C5_GLfloat_P1, - "", - ""); - - - - - - I_SimpleProperty(bool, VertexProgramSupported, - 0, - __void__setVertexProgramSupported__bool); -END_REFLECTOR - diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp index e6e9506cb..a82dd24ad 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osg/Viewport.cpp b/src/osgWrappers/osg/Viewport.cpp index 34647b7ff..d6ecbb174 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, Properties::VIRTUAL, __void__apply__State_R1, "apply the OpenGL state attributes. ", diff --git a/src/osgWrappers/osgAnimation/Animation.cpp b/src/osgWrappers/osgAnimation/Animation.cpp index e43be9dc1..676368151 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgAnimation/AnimationManager.cpp b/src/osgWrappers/osgAnimation/AnimationManager.cpp index d6ef7580d..e77efa1c7 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgAnimation/BasicAnimationManager.cpp b/src/osgWrappers/osgAnimation/BasicAnimationManager.cpp index 810b01a69..99b99d397 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgAnimation/Bone.cpp b/src/osgWrappers/osgAnimation/Bone.cpp index 12a00537a..6fef3e3a6 100644 --- a/src/osgWrappers/osgAnimation/Bone.cpp +++ b/src/osgWrappers/osgAnimation/Bone.cpp @@ -273,7 +273,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Bone::UpdateBone) __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, + 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. ", diff --git a/src/osgWrappers/osgAnimation/Channel.cpp b/src/osgWrappers/osgAnimation/Channel.cpp index 0b65d12ea..a28434597 100644 --- a/src/osgWrappers/osgAnimation/Channel.cpp +++ b/src/osgWrappers/osgAnimation/Channel.cpp @@ -183,7 +183,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::DoubleCubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleCubicBezierSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -202,7 +202,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::DoubleCubicBezierSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -217,17 +217,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::DoubleCubicBezierSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::DoubleCubicBezierSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::DoubleCubicBezierSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -255,10 +255,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleCubicB I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::DoubleCubicBezierSampler *, Sampler, + I_SimpleProperty(SamplerType *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(osgAnimation::DoubleCubicBezierSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -275,7 +275,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::DoubleLinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::DoubleLinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -294,7 +294,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::DoubleLinearSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -309,17 +309,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::DoubleLinearSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::DoubleLinearSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::DoubleLinearSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -347,10 +347,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::DoubleLinear I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::DoubleLinearSampler *, Sampler, + I_SimpleProperty(SamplerType *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(osgAnimation::DoubleLinearSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -367,7 +367,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::FloatCubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatCubicBezierSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -386,7 +386,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::FloatCubicBezierSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -401,17 +401,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::FloatCubicBezierSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::FloatCubicBezierSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::FloatCubicBezierSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -439,10 +439,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatCubicBe I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::FloatCubicBezierSampler *, Sampler, + I_SimpleProperty(SamplerType *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(osgAnimation::FloatCubicBezierSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -459,7 +459,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::FloatLinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::FloatLinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -478,7 +478,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::FloatLinearSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -493,17 +493,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::FloatLinearSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::FloatLinearSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::FloatLinearSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -531,10 +531,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::FloatLinearS I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::FloatLinearSampler *, Sampler, + I_SimpleProperty(SamplerType *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(osgAnimation::FloatLinearSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -551,7 +551,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::QuatSphericalLinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::QuatSphericalLinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -570,7 +570,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::QuatSphericalLinearSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -585,17 +585,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::QuatSphericalLinearSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::QuatSphericalLinearSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::QuatSphericalLinearSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -623,10 +623,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::QuatSpherica I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::QuatSphericalLinearSampler *, Sampler, + I_SimpleProperty(SamplerType *, Sampler, 0, __void__setSampler__SamplerType_P1); - I_SimpleProperty(osgAnimation::QuatSphericalLinearSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -643,7 +643,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::Vec2CubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBezierSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -662,7 +662,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::Vec2CubicBezierSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -677,17 +677,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::Vec2CubicBezierSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::Vec2CubicBezierSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::Vec2CubicBezierSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -715,10 +715,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2CubicBez I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::Sampler *, Sampler, - __Sampler_P1__getSampler, - 0); - I_SimpleProperty(osgAnimation::Vec2CubicBezierSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -735,7 +735,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::Vec2LinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -754,7 +754,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::Vec2LinearSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -769,17 +769,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::Vec2LinearSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::Vec2LinearSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::Vec2LinearSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -807,10 +807,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec2LinearSa I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::Sampler *, Sampler, - __Sampler_P1__getSampler, - 0); - I_SimpleProperty(osgAnimation::Vec2LinearSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -827,7 +827,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::Vec3CubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBezierSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -846,7 +846,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::Vec3CubicBezierSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -861,17 +861,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::Vec3CubicBezierSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::Vec3CubicBezierSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::Vec3CubicBezierSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -899,10 +899,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3CubicBez I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::Sampler *, Sampler, - __Sampler_P1__getSampler, - 0); - I_SimpleProperty(osgAnimation::Vec3CubicBezierSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -919,7 +919,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::Vec3LinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -938,7 +938,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::Vec3LinearSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -953,17 +953,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::Vec3LinearSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::Vec3LinearSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::Vec3LinearSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -991,10 +991,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec3LinearSa I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::Sampler *, Sampler, - __Sampler_P1__getSampler, - 0); - I_SimpleProperty(osgAnimation::Vec3LinearSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -1011,7 +1011,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::Vec4CubicBezierSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBezierSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -1030,7 +1030,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::Vec4CubicBezierSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -1045,17 +1045,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::Vec4CubicBezierSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::Vec4CubicBezierSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::Vec4CubicBezierSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -1083,10 +1083,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4CubicBez I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::Sampler *, Sampler, - __Sampler_P1__getSampler, - 0); - I_SimpleProperty(osgAnimation::Vec4CubicBezierSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, @@ -1103,7 +1103,7 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >) I_DeclaringFile("osgAnimation/Channel"); I_BaseType(osgAnimation::Channel); - I_ConstructorWithDefaults2(IN, osgAnimation::Vec4LinearSampler *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >::TargetType *, target, 0, + I_ConstructorWithDefaults2(IN, SamplerType *, s, 0, IN, osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSampler >::TargetType *, target, 0, ____TemplateChannel__SamplerType_P1__TargetType_P1, "", ""); @@ -1122,7 +1122,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa __Target_P1__getTarget, "", ""); - I_Method0(osgAnimation::Vec4LinearSampler *, getOrCreateSampler, + I_Method0(SamplerType *, getOrCreateSampler, Properties::NON_VIRTUAL, __SamplerType_P1__getOrCreateSampler, "", @@ -1137,17 +1137,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa __C5_Sampler_P1__getSampler, "", ""); - I_Method0(osgAnimation::Vec4LinearSampler *, getSamplerTyped, + I_Method0(SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __SamplerType_P1__getSamplerTyped, "", ""); - I_Method0(const osgAnimation::Vec4LinearSampler *, getSamplerTyped, + I_Method0(const SamplerType *, getSamplerTyped, Properties::NON_VIRTUAL, __C5_SamplerType_P1__getSamplerTyped, "", ""); - I_Method1(void, setSampler, IN, osgAnimation::Vec4LinearSampler *, sampler, + I_Method1(void, setSampler, IN, SamplerType *, sampler, Properties::NON_VIRTUAL, __void__setSampler__SamplerType_P1, "", @@ -1175,10 +1175,10 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateChannel< osgAnimation::Vec4LinearSa I_SimpleProperty(float, EndTime, __float__getEndTime, 0); - I_SimpleProperty(osgAnimation::Sampler *, Sampler, - __Sampler_P1__getSampler, - 0); - I_SimpleProperty(osgAnimation::Vec4LinearSampler *, SamplerTyped, + I_SimpleProperty(SamplerType *, Sampler, + 0, + __void__setSampler__SamplerType_P1); + I_SimpleProperty(SamplerType *, SamplerTyped, __SamplerType_P1__getSamplerTyped, 0); I_SimpleProperty(float, StartTime, diff --git a/src/osgWrappers/osgAnimation/CubicBezier.cpp b/src/osgWrappers/osgAnimation/CubicBezier.cpp index 85a593d79..098f0c6d3 100644 --- a/src/osgWrappers/osgAnimation/CubicBezier.cpp +++ b/src/osgWrappers/osgAnimation/CubicBezier.cpp @@ -10,9 +10,6 @@ #include #include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -35,295 +32,295 @@ TYPE_NAME_ALIAS(osgAnimation::TemplateCubicBezier< osg::Vec4 >, osgAnimation::Ve BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< double >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const double &, getP0, + I_Method0(const T &, getP0, Properties::NON_VIRTUAL, __C5_T_R1__getP0, "", ""); - I_Method0(const double &, getP1, + I_Method0(const T &, getP1, Properties::NON_VIRTUAL, __C5_T_R1__getP1, "", ""); - I_Method0(const double &, getP2, + I_Method0(const T &, getP2, Properties::NON_VIRTUAL, __C5_T_R1__getP2, "", ""); - I_Constructor3(IN, const double &, v0, IN, const double &, v1, IN, const double &, v2, + 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 double &, getPosition, + I_Method0(const T &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const double &, getTangentPoint1, + I_Method0(const T &, getTangentPoint1, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint1, "", ""); - I_Method0(const double &, getTangentPoint2, + I_Method0(const T &, getTangentPoint2, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint2, "", ""); - I_SimpleProperty(const double &, P0, + I_SimpleProperty(const T &, P0, __C5_T_R1__getP0, 0); - I_SimpleProperty(const double &, P1, + I_SimpleProperty(const T &, P1, __C5_T_R1__getP1, 0); - I_SimpleProperty(const double &, P2, + I_SimpleProperty(const T &, P2, __C5_T_R1__getP2, 0); - I_SimpleProperty(const double &, Position, + I_SimpleProperty(const T &, Position, __C5_T_R1__getPosition, 0); - I_SimpleProperty(const double &, TangentPoint1, + I_SimpleProperty(const T &, TangentPoint1, __C5_T_R1__getTangentPoint1, 0); - I_SimpleProperty(const double &, TangentPoint2, + I_SimpleProperty(const T &, TangentPoint2, __C5_T_R1__getTangentPoint2, 0); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< float >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const float &, getP0, + I_Method0(const T &, getP0, Properties::NON_VIRTUAL, __C5_T_R1__getP0, "", ""); - I_Method0(const float &, getP1, + I_Method0(const T &, getP1, Properties::NON_VIRTUAL, __C5_T_R1__getP1, "", ""); - I_Method0(const float &, getP2, + I_Method0(const T &, getP2, Properties::NON_VIRTUAL, __C5_T_R1__getP2, "", ""); - I_Constructor3(IN, const float &, v0, IN, const float &, v1, IN, const float &, v2, + 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 float &, getPosition, + I_Method0(const T &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const float &, getTangentPoint1, + I_Method0(const T &, getTangentPoint1, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint1, "", ""); - I_Method0(const float &, getTangentPoint2, + I_Method0(const T &, getTangentPoint2, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint2, "", ""); - I_SimpleProperty(const float &, P0, + I_SimpleProperty(const T &, P0, __C5_T_R1__getP0, 0); - I_SimpleProperty(const float &, P1, + I_SimpleProperty(const T &, P1, __C5_T_R1__getP1, 0); - I_SimpleProperty(const float &, P2, + I_SimpleProperty(const T &, P2, __C5_T_R1__getP2, 0); - I_SimpleProperty(const float &, Position, + I_SimpleProperty(const T &, Position, __C5_T_R1__getPosition, 0); - I_SimpleProperty(const float &, TangentPoint1, + I_SimpleProperty(const T &, TangentPoint1, __C5_T_R1__getTangentPoint1, 0); - I_SimpleProperty(const float &, TangentPoint2, + I_SimpleProperty(const T &, TangentPoint2, __C5_T_R1__getTangentPoint2, 0); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< osg::Vec2 >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const osg::Vec2 &, getP0, + I_Method0(const T &, getP0, Properties::NON_VIRTUAL, __C5_T_R1__getP0, "", ""); - I_Method0(const osg::Vec2 &, getP1, + I_Method0(const T &, getP1, Properties::NON_VIRTUAL, __C5_T_R1__getP1, "", ""); - I_Method0(const osg::Vec2 &, getP2, + I_Method0(const T &, getP2, Properties::NON_VIRTUAL, __C5_T_R1__getP2, "", ""); - I_Constructor3(IN, const osg::Vec2 &, v0, IN, const osg::Vec2 &, v1, IN, const osg::Vec2 &, v2, + 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 osg::Vec2 &, getPosition, + I_Method0(const T &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const osg::Vec2 &, getTangentPoint1, + I_Method0(const T &, getTangentPoint1, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint1, "", ""); - I_Method0(const osg::Vec2 &, getTangentPoint2, + I_Method0(const T &, getTangentPoint2, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint2, "", ""); - I_SimpleProperty(const osg::Vec2 &, P0, + I_SimpleProperty(const T &, P0, __C5_T_R1__getP0, 0); - I_SimpleProperty(const osg::Vec2 &, P1, + I_SimpleProperty(const T &, P1, __C5_T_R1__getP1, 0); - I_SimpleProperty(const osg::Vec2 &, P2, + I_SimpleProperty(const T &, P2, __C5_T_R1__getP2, 0); - I_SimpleProperty(const osg::Vec2 &, Position, + I_SimpleProperty(const T &, Position, __C5_T_R1__getPosition, 0); - I_SimpleProperty(const osg::Vec2 &, TangentPoint1, + I_SimpleProperty(const T &, TangentPoint1, __C5_T_R1__getTangentPoint1, 0); - I_SimpleProperty(const osg::Vec2 &, TangentPoint2, + I_SimpleProperty(const T &, TangentPoint2, __C5_T_R1__getTangentPoint2, 0); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< osg::Vec3 >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const osg::Vec3 &, getP0, + I_Method0(const T &, getP0, Properties::NON_VIRTUAL, __C5_T_R1__getP0, "", ""); - I_Method0(const osg::Vec3 &, getP1, + I_Method0(const T &, getP1, Properties::NON_VIRTUAL, __C5_T_R1__getP1, "", ""); - I_Method0(const osg::Vec3 &, getP2, + I_Method0(const T &, getP2, Properties::NON_VIRTUAL, __C5_T_R1__getP2, "", ""); - I_Constructor3(IN, const osg::Vec3 &, v0, IN, const osg::Vec3 &, v1, IN, const osg::Vec3 &, v2, + 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 osg::Vec3 &, getPosition, + I_Method0(const T &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const osg::Vec3 &, getTangentPoint1, + I_Method0(const T &, getTangentPoint1, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint1, "", ""); - I_Method0(const osg::Vec3 &, getTangentPoint2, + I_Method0(const T &, getTangentPoint2, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint2, "", ""); - I_SimpleProperty(const osg::Vec3 &, P0, + I_SimpleProperty(const T &, P0, __C5_T_R1__getP0, 0); - I_SimpleProperty(const osg::Vec3 &, P1, + I_SimpleProperty(const T &, P1, __C5_T_R1__getP1, 0); - I_SimpleProperty(const osg::Vec3 &, P2, + I_SimpleProperty(const T &, P2, __C5_T_R1__getP2, 0); - I_SimpleProperty(const osg::Vec3 &, Position, + I_SimpleProperty(const T &, Position, __C5_T_R1__getPosition, 0); - I_SimpleProperty(const osg::Vec3 &, TangentPoint1, + I_SimpleProperty(const T &, TangentPoint1, __C5_T_R1__getTangentPoint1, 0); - I_SimpleProperty(const osg::Vec3 &, TangentPoint2, + I_SimpleProperty(const T &, TangentPoint2, __C5_T_R1__getTangentPoint2, 0); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgAnimation::TemplateCubicBezier< osg::Vec4 >) I_DeclaringFile("osgAnimation/CubicBezier"); - I_Method0(const osg::Vec4 &, getP0, + I_Method0(const T &, getP0, Properties::NON_VIRTUAL, __C5_T_R1__getP0, "", ""); - I_Method0(const osg::Vec4 &, getP1, + I_Method0(const T &, getP1, Properties::NON_VIRTUAL, __C5_T_R1__getP1, "", ""); - I_Method0(const osg::Vec4 &, getP2, + I_Method0(const T &, getP2, Properties::NON_VIRTUAL, __C5_T_R1__getP2, "", ""); - I_Constructor3(IN, const osg::Vec4 &, v0, IN, const osg::Vec4 &, v1, IN, const osg::Vec4 &, v2, + 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 osg::Vec4 &, getPosition, + I_Method0(const T &, getPosition, Properties::NON_VIRTUAL, __C5_T_R1__getPosition, "", ""); - I_Method0(const osg::Vec4 &, getTangentPoint1, + I_Method0(const T &, getTangentPoint1, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint1, "", ""); - I_Method0(const osg::Vec4 &, getTangentPoint2, + I_Method0(const T &, getTangentPoint2, Properties::NON_VIRTUAL, __C5_T_R1__getTangentPoint2, "", ""); - I_SimpleProperty(const osg::Vec4 &, P0, + I_SimpleProperty(const T &, P0, __C5_T_R1__getP0, 0); - I_SimpleProperty(const osg::Vec4 &, P1, + I_SimpleProperty(const T &, P1, __C5_T_R1__getP1, 0); - I_SimpleProperty(const osg::Vec4 &, P2, + I_SimpleProperty(const T &, P2, __C5_T_R1__getP2, 0); - I_SimpleProperty(const osg::Vec4 &, Position, + I_SimpleProperty(const T &, Position, __C5_T_R1__getPosition, 0); - I_SimpleProperty(const osg::Vec4 &, TangentPoint1, + I_SimpleProperty(const T &, TangentPoint1, __C5_T_R1__getTangentPoint1, 0); - I_SimpleProperty(const osg::Vec4 &, TangentPoint2, + I_SimpleProperty(const T &, TangentPoint2, __C5_T_R1__getTangentPoint2, 0); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/EaseMotion.cpp b/src/osgWrappers/osgAnimation/EaseMotion.cpp index 536dc979c..c158b4f81 100644 --- a/src/osgWrappers/osgAnimation/EaseMotion.cpp +++ b/src/osgWrappers/osgAnimation/EaseMotion.cpp @@ -149,14 +149,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); diff --git a/src/osgWrappers/osgAnimation/Interpolator.cpp b/src/osgWrappers/osgAnimation/Interpolator.cpp index 8705973c3..71af594e4 100644 --- a/src/osgWrappers/osgAnimation/Interpolator.cpp +++ b/src/osgWrappers/osgAnimation/Interpolator.cpp @@ -10,13 +10,7 @@ #include #include -#include -#include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -56,7 +50,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< double COM I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::DoubleCubicBezier > &, keyframes, IN, float, time, IN, double &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -69,7 +63,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< float COMM I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::FloatCubicBezier > &, keyframes, IN, float, time, IN, float &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -82,7 +76,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec2 I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec2CubicBezier > &, keyframes, IN, float, time, IN, osg::Vec2 &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -95,7 +89,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec3 I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec3CubicBezier > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -108,7 +102,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateCubicBezierInterpolator< osg::Vec4 I_Constructor0(____TemplateCubicBezierInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec4CubicBezier > &, keyframes, IN, float, time, IN, osg::Vec4 &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -121,7 +115,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< double COMMA d I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< double > &, keyframes, IN, float, time, IN, double &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -134,7 +128,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< float COMMA fl I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< float > &, keyframes, IN, float, time, IN, float &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -147,7 +141,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec2 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec2 > &, keyframes, IN, float, time, IN, osg::Vec2 &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -160,7 +154,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec3 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec3 > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -173,7 +167,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec3 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osgAnimation::Vec3Packed > &, keyframes, IN, float, time, IN, osg::Vec3 &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -186,7 +180,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateLinearInterpolator< osg::Vec4 COMMA I_Constructor0(____TemplateLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Vec4 > &, keyframes, IN, float, time, IN, osg::Vec4 &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", @@ -199,7 +193,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateSphericalLinearInterpolator< osg::Q I_Constructor0(____TemplateSphericalLinearInterpolator, "", ""); - I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< osg::Quat > &, keyframes, IN, float, time, IN, osg::Quat &, result, + I_Method3(void, getValue, IN, const osgAnimation::TemplateKeyframeContainer< KEY > &, keyframes, IN, float, time, IN, TYPE &, result, Properties::NON_VIRTUAL, __void__getValue__C5_TemplateKeyframeContainerT1_KEY__R1__float__TYPE_R1, "", diff --git a/src/osgWrappers/osgAnimation/Keyframe.cpp b/src/osgWrappers/osgAnimation/Keyframe.cpp index eaef93d46..15f6255b4 100644 --- a/src/osgWrappers/osgAnimation/Keyframe.cpp +++ b/src/osgWrappers/osgAnimation/Keyframe.cpp @@ -10,13 +10,7 @@ #include #include -#include -#include -#include -#include -#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -109,21 +103,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< float >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const float &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const float &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const float &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const float &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -134,21 +128,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Quat >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osg::Quat &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osg::Quat &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osg::Quat &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osg::Quat &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -159,21 +153,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Vec2 >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osg::Vec2 &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osg::Vec2 &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osg::Vec2 &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osg::Vec2 &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -184,21 +178,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Vec3 >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osg::Vec3 &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osg::Vec3 &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osg::Vec3 &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osg::Vec3 &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -209,21 +203,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osg::Vec4 >) I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osg::Vec4 &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osg::Vec4 &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osg::Vec4 &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osg::Vec4 &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -234,21 +228,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::DoubleCubic I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osgAnimation::DoubleCubicBezier &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osgAnimation::DoubleCubicBezier &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osgAnimation::DoubleCubicBezier &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osgAnimation::DoubleCubicBezier &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -259,21 +253,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::FloatCubicB I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osgAnimation::FloatCubicBezier &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osgAnimation::FloatCubicBezier &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osgAnimation::FloatCubicBezier &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osgAnimation::FloatCubicBezier &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -284,21 +278,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec2CubicBe I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osgAnimation::Vec2CubicBezier &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osgAnimation::Vec2CubicBezier &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osgAnimation::Vec2CubicBezier &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osgAnimation::Vec2CubicBezier &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -309,21 +303,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec3CubicBe I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osgAnimation::Vec3CubicBezier &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osgAnimation::Vec3CubicBezier &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osgAnimation::Vec3CubicBezier &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osgAnimation::Vec3CubicBezier &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -334,21 +328,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec3Packed I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osgAnimation::Vec3Packed &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osgAnimation::Vec3Packed &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osgAnimation::Vec3Packed &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osgAnimation::Vec3Packed &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -359,21 +353,21 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateKeyframe< osgAnimation::Vec4CubicBe I_Constructor0(____TemplateKeyframe, "", ""); - I_Constructor2(IN, float, time, IN, const osgAnimation::Vec4CubicBezier &, value, + I_Constructor2(IN, float, time, IN, const T &, value, ____TemplateKeyframe__float__C5_T_R1, "", ""); - I_Method1(void, setValue, IN, const osgAnimation::Vec4CubicBezier &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_Method0(const osgAnimation::Vec4CubicBezier &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", ""); - I_SimpleProperty(const osgAnimation::Vec4CubicBezier &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/RigGeometry.cpp b/src/osgWrappers/osgAnimation/RigGeometry.cpp index f043eb5fe..a3e9ef201 100644 --- a/src/osgWrappers/osgAnimation/RigGeometry.cpp +++ b/src/osgWrappers/osgAnimation/RigGeometry.cpp @@ -46,7 +46,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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgAnimation/Skeleton.cpp b/src/osgWrappers/osgAnimation/Skeleton.cpp index 80a4aa218..6eceaec70 100644 --- a/src/osgWrappers/osgAnimation/Skeleton.cpp +++ b/src/osgWrappers/osgAnimation/Skeleton.cpp @@ -84,7 +84,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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgAnimation/Target.cpp b/src/osgWrappers/osgAnimation/Target.cpp index e82076afb..c0e98c39e 100644 --- a/src/osgWrappers/osgAnimation/Target.cpp +++ b/src/osgWrappers/osgAnimation/Target.cpp @@ -10,10 +10,6 @@ #include #include -#include -#include -#include -#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -82,17 +78,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< double >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const double &, v, + I_Constructor1(IN, const T &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const double &, val, + I_Method2(void, update, IN, float, weight, IN, const T &, val, Properties::NON_VIRTUAL, __void__update__float__C5_T_R1, "", ""); - I_Method0(const double &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", @@ -102,12 +98,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< double >) __void__normalize, "", ""); - I_Method1(void, setValue, IN, const double &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const double &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -118,17 +114,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< float >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const float &, v, + I_Constructor1(IN, const T &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const float &, val, + I_Method2(void, update, IN, float, weight, IN, const T &, val, Properties::NON_VIRTUAL, __void__update__float__C5_T_R1, "", ""); - I_Method0(const float &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", @@ -138,12 +134,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< float >) __void__normalize, "", ""); - I_Method1(void, setValue, IN, const float &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const float &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -154,17 +150,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Quat >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const osg::Quat &, v, + I_Constructor1(IN, const T &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const osg::Quat &, val, + I_Method2(void, update, IN, float, weight, IN, const T &, val, Properties::NON_VIRTUAL, __void__update__float__C5_T_R1, "", ""); - I_Method0(const osg::Quat &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", @@ -174,12 +170,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Quat >) __void__normalize, "", ""); - I_Method1(void, setValue, IN, const osg::Quat &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const osg::Quat &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -190,17 +186,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec2 >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const osg::Vec2 &, v, + I_Constructor1(IN, const T &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const osg::Vec2 &, val, + I_Method2(void, update, IN, float, weight, IN, const T &, val, Properties::NON_VIRTUAL, __void__update__float__C5_T_R1, "", ""); - I_Method0(const osg::Vec2 &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", @@ -210,12 +206,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec2 >) __void__normalize, "", ""); - I_Method1(void, setValue, IN, const osg::Vec2 &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const osg::Vec2 &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -226,17 +222,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec3 >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const osg::Vec3 &, v, + I_Constructor1(IN, const T &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const osg::Vec3 &, val, + I_Method2(void, update, IN, float, weight, IN, const T &, val, Properties::NON_VIRTUAL, __void__update__float__C5_T_R1, "", ""); - I_Method0(const osg::Vec3 &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", @@ -246,12 +242,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec3 >) __void__normalize, "", ""); - I_Method1(void, setValue, IN, const osg::Vec3 &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const osg::Vec3 &, Value, + I_SimpleProperty(const T &, Value, __C5_T_R1__getValue, __void__setValue__C5_T_R1); END_REFLECTOR @@ -262,17 +258,17 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec4 >) I_Constructor0(____TemplateTarget, "", ""); - I_Constructor1(IN, const osg::Vec4 &, v, + I_Constructor1(IN, const T &, v, Properties::NON_EXPLICIT, ____TemplateTarget__C5_T_R1, "", ""); - I_Method2(void, update, IN, float, weight, IN, const osg::Vec4 &, val, + I_Method2(void, update, IN, float, weight, IN, const T &, val, Properties::NON_VIRTUAL, __void__update__float__C5_T_R1, "", ""); - I_Method0(const osg::Vec4 &, getValue, + I_Method0(const T &, getValue, Properties::NON_VIRTUAL, __C5_T_R1__getValue, "", @@ -282,12 +278,12 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::TemplateTarget< osg::Vec4 >) __void__normalize, "", ""); - I_Method1(void, setValue, IN, const osg::Vec4 &, value, + I_Method1(void, setValue, IN, const T &, value, Properties::NON_VIRTUAL, __void__setValue__C5_T_R1, "", ""); - I_SimpleProperty(const osg::Vec4 &, Value, + I_SimpleProperty(const T &, 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 4f3393bf8..5f5e347e9 100644 --- a/src/osgWrappers/osgAnimation/Timeline.cpp +++ b/src/osgWrappers/osgAnimation/Timeline.cpp @@ -34,7 +34,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Action) __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, + 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. ", @@ -151,7 +151,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Action::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 &, copyop, + 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. ", @@ -328,7 +328,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::Timeline) __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, + 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. ", diff --git a/src/osgWrappers/osgAnimation/TimelineAnimationManager.cpp b/src/osgWrappers/osgAnimation/TimelineAnimationManager.cpp index 22ba0147e..f3d3f32dd 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgAnimation/UpdateCallback.cpp b/src/osgWrappers/osgAnimation/UpdateCallback.cpp index e81fc4457..5b84652da 100644 --- a/src/osgWrappers/osgAnimation/UpdateCallback.cpp +++ b/src/osgWrappers/osgAnimation/UpdateCallback.cpp @@ -79,7 +79,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::UpdateTransform) __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, + 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. ", diff --git a/src/osgWrappers/osgAnimation/VertexInfluence.cpp b/src/osgWrappers/osgAnimation/VertexInfluence.cpp index 86372459c..6f20b6c90 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 598481480..5b7926dcb 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -29,6 +29,14 @@ #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) @@ -45,14 +53,6 @@ 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 85e5dcefe..13f9003b8 100644 --- a/src/osgWrappers/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/osgDB/DotOsgWrapper.cpp @@ -21,18 +21,18 @@ #undef OUT #endif -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 +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_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 63c2a9e0b..10dc1d29e 100644 --- a/src/osgWrappers/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/osgDB/DynamicLibrary.cpp @@ -27,6 +27,10 @@ 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, @@ -47,10 +51,6 @@ 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/FileUtils.cpp b/src/osgWrappers/osgDB/FileUtils.cpp index 8b74bc34c..6e52fb00a 100644 --- a/src/osgWrappers/osgDB/FileUtils.cpp +++ b/src/osgWrappers/osgDB/FileUtils.cpp @@ -20,8 +20,6 @@ #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); @@ -35,3 +33,5 @@ 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 b83c9679c..472491999 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index 4f9eed522..674148b09 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -28,8 +28,6 @@ #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); @@ -37,6 +35,8 @@ 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index e5fa69803..b6451521d 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -69,8 +69,6 @@ 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); @@ -78,9 +76,15 @@ 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, @@ -561,10 +565,6 @@ 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 ", ""); diff --git a/src/osgWrappers/osgFX/Registry.cpp b/src/osgWrappers/osgFX/Registry.cpp index 11c79cfa8..8c5781445 100644 --- a/src/osgWrappers/osgFX/Registry.cpp +++ b/src/osgWrappers/osgFX/Registry.cpp @@ -26,6 +26,10 @@ 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, @@ -36,10 +40,6 @@ 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 0d5b7355b..2ebf6cce8 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 &, state, + I_Method1(void, apply, IN, osg::State &, x, 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 &, state, + I_Method1(void, compileGLObjects, IN, osg::State &, x, 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 6355af4d9..7cff2a385 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 &, ea, IN, osgGA::GUIActionAdapter &, us, + 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. ", "FIXME: what does this actually mean? Provide examples. "); - I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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, currentTime, + I_Method1(void, home, IN, double, x, Properties::VIRTUAL, __void__home__double, "Move the camera to the default position. ", diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index 83aba6e55..ce77dede7 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 &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, ea, IN, osgGA::GUIActionAdapter &, us, + 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. ", diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index e5b0f670e..a2028e91d 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 &, ea, IN, osgGA::GUIActionAdapter &, us, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, ea, IN, osgGA::GUIActionAdapter &, us, + 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. ", diff --git a/src/osgWrappers/osgGA/GUIEventAdapter.cpp b/src/osgWrappers/osgGA/GUIEventAdapter.cpp index 81c9d9354..9fd0e78ef 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgGA/GUIEventHandler.cpp b/src/osgWrappers/osgGA/GUIEventHandler.cpp index a0e6f2f66..41266c7a9 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index 88dcb8601..40fd7f9be 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 *, n, + I_Method1(void, setNode, IN, osg::Node *, x, 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 &, ee, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(void, home, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, ee, IN, osgGA::GUIActionAdapter &, aa, + 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. ", diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index a35eb03e4..ccb338089 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -26,8 +26,6 @@ #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); @@ -41,6 +39,8 @@ 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 2b0cc511d..632321bbd 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp index 31529b851..e10b218b3 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/BoxPlacer.cpp b/src/osgWrappers/osgParticle/BoxPlacer.cpp index 2e0d3700c..7b8320094 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp index ee6d48307..6e0927717 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp index 661bac69d..ca306f9d1 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/ForceOperator.cpp b/src/osgWrappers/osgParticle/ForceOperator.cpp index e60257f7d..ce8d64861 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/LinearInterpolator.cpp b/src/osgWrappers/osgParticle/LinearInterpolator.cpp index c351f8d76..852fa9482 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp index 7a728e66e..aae5f2319 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/ParticleProcessor.cpp b/src/osgWrappers/osgParticle/ParticleProcessor.cpp index a6ae7c8f9..78a157b40 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 495196152..e6d2b1370 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include #include @@ -27,12 +26,6 @@ #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); @@ -45,6 +38,12 @@ 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); @@ -60,7 +59,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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp index 2cfb2e7d3..61a14f4ed 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 d170bb862..a04235c5b 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index 16d2c1e9a..525249a85 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/RadialShooter.cpp b/src/osgWrappers/osgParticle/RadialShooter.cpp index a67a82610..d445cf3f0 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/RandomRateCounter.cpp b/src/osgWrappers/osgParticle/RandomRateCounter.cpp index 1b7729d66..5ef437b8c 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/SectorPlacer.cpp b/src/osgWrappers/osgParticle/SectorPlacer.cpp index 5509218ea..e97710619 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/osgParticle/SegmentPlacer.cpp index e701b9031..63cd26e35 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/DebugShadowMap.cpp b/src/osgWrappers/osgShadow/DebugShadowMap.cpp index bc0308207..fca80f90d 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/LightSpacePerspectiveShadowMap.cpp b/src/osgWrappers/osgShadow/LightSpacePerspectiveShadowMap.cpp index 66982a780..27bc40ffa 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 &, copyop, + 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, @@ -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 &, copyop, + 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, @@ -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 &, copyop, + 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, @@ -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 bb80746cf..bf25e0cce 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/MinimalDrawBoundsShadowMap.cpp b/src/osgWrappers/osgShadow/MinimalDrawBoundsShadowMap.cpp index 2ec0ef009..493243f86 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/MinimalShadowMap.cpp b/src/osgWrappers/osgShadow/MinimalShadowMap.cpp index 53e918af4..cd7ce0a30 100644 --- a/src/osgWrappers/osgShadow/MinimalShadowMap.cpp +++ b/src/osgWrappers/osgShadow/MinimalShadowMap.cpp @@ -23,10 +23,6 @@ #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); @@ -35,6 +31,10 @@ 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/OccluderGeometry.cpp b/src/osgWrappers/osgShadow/OccluderGeometry.cpp index 0f51f34ee..f99af8b82 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, Properties::VIRTUAL, __Object_P1__clone__C5_osg_CopyOp_R1, "Clone an object, with Object* return type. ", @@ -162,10 +162,6 @@ 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); @@ -173,6 +169,10 @@ 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 &, copyop, + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 34d0f02f7..c1524cb9a 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/ShadowMap.cpp b/src/osgWrappers/osgShadow/ShadowMap.cpp index 52f030c0c..4e770f77b 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/ShadowTechnique.cpp b/src/osgWrappers/osgShadow/ShadowTechnique.cpp index ed84d509c..4ff55dd95 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/ShadowTexture.cpp b/src/osgWrappers/osgShadow/ShadowTexture.cpp index 1a3294979..803c60085 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/ShadowVolume.cpp b/src/osgWrappers/osgShadow/ShadowVolume.cpp index 2e7d2235f..3150301f1 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/ShadowedScene.cpp b/src/osgWrappers/osgShadow/ShadowedScene.cpp index a17de04f1..f76077422 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 ebc834aea..96dabac9c 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/StandardShadowMap.cpp b/src/osgWrappers/osgShadow/StandardShadowMap.cpp index 1aee41ce7..d1f55555f 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgShadow/ViewDependentShadowTechnique.cpp b/src/osgWrappers/osgShadow/ViewDependentShadowTechnique.cpp index f2779117a..d64053c43 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, - "Classic OSG constructor. ", - ""); + "osgShadow::ShadowTechnique equivalent methods for view dependent techniques ", + "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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgSim/BlinkSequence.cpp b/src/osgWrappers/osgSim/BlinkSequence.cpp index 6bbf2e220..642bc7b7c 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgSim/DOFTransform.cpp b/src/osgWrappers/osgSim/DOFTransform.cpp index e801c706c..3ce27c610 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 a77fb4c65..169261c5b 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 e656e22d5..1ab60cf7c 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 0d1239cad..6a49074ed 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index e34c62e60..dcf15b50a 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 b12f5ce01..b3eefb3fe 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index e7a63bfb3..238b3032e 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 83bcdc08b..9aaf40025 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 ef3ead9d7..8d14b7cc8 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgSim/ShapeAttribute.cpp b/src/osgWrappers/osgSim/ShapeAttribute.cpp index 20d76d826..c4c3e8bda 100644 --- a/src/osgWrappers/osgSim/ShapeAttribute.cpp +++ b/src/osgWrappers/osgSim/ShapeAttribute.cpp @@ -30,103 +30,6 @@ BEGIN_ENUM_REFLECTOR(osgSim::ShapeAttribute::Type) I_EnumLabel(osgSim::ShapeAttribute::STRING); END_REFLECTOR -BEGIN_VALUE_REFLECTOR(osgSim::ShapeAttribute) - I_DeclaringFile("osgSim/ShapeAttribute"); - I_Constructor0(____ShapeAttribute, - "", - ""); - I_Constructor1(IN, const char *, name, - Properties::NON_EXPLICIT, - ____ShapeAttribute__C5_char_P1, - "", - ""); - I_Constructor2(IN, const char *, name, IN, int, value, - ____ShapeAttribute__C5_char_P1__int, - "", - ""); - I_Constructor2(IN, const char *, name, IN, double, value, - ____ShapeAttribute__C5_char_P1__double, - "", - ""); - I_Constructor2(IN, const char *, name, IN, const char *, value, - ____ShapeAttribute__C5_char_P1__C5_char_P1, - "Note, ShapeAttribute takes a copy of both name and value, the calling code should manage its own clean up of the original strings. ", - ""); - I_Constructor1(IN, const osgSim::ShapeAttribute &, sa, - Properties::NON_EXPLICIT, - ____ShapeAttribute__C5_ShapeAttribute_R1, - "", - ""); - I_Method0(const std::string &, getName, - Properties::NON_VIRTUAL, - __C5_std_string_R1__getName, - "", - ""); - I_Method1(void, setName, IN, const std::string &, name, - Properties::NON_VIRTUAL, - __void__setName__C5_std_string_R1, - "", - ""); - I_Method0(const osgSim::ShapeAttribute::Type, getType, - Properties::NON_VIRTUAL, - __C5_Type__getType, - "", - ""); - I_Method0(int, getInt, - Properties::NON_VIRTUAL, - __int__getInt, - "", - ""); - I_Method0(double, getDouble, - Properties::NON_VIRTUAL, - __double__getDouble, - "", - ""); - I_Method0(const char *, getString, - Properties::NON_VIRTUAL, - __C5_char_P1__getString, - "", - ""); - I_Method1(void, setValue, IN, int, value, - Properties::NON_VIRTUAL, - __void__setValue__int, - "", - ""); - I_Method1(void, setValue, IN, double, value, - Properties::NON_VIRTUAL, - __void__setValue__double, - "", - ""); - I_Method1(void, setValue, IN, const char *, value, - Properties::NON_VIRTUAL, - __void__setValue__C5_char_P1, - "", - ""); - I_Method1(int, compare, IN, const osgSim::ShapeAttribute &, sa, - Properties::NON_VIRTUAL, - __int__compare__C5_osgSim_ShapeAttribute_R1, - "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", - ""); - I_SimpleProperty(double, Double, - __double__getDouble, - 0); - I_SimpleProperty(int, Int, - __int__getInt, - 0); - I_SimpleProperty(const std::string &, Name, - __C5_std_string_R1__getName, - __void__setName__C5_std_string_R1); - I_SimpleProperty(const char *, String, - __C5_char_P1__getString, - 0); - I_SimpleProperty(const osgSim::ShapeAttribute::Type, Type, - __C5_Type__getType, - 0); - I_SimpleProperty(double, Value, - 0, - __void__setValue__double); -END_REFLECTOR - BEGIN_OBJECT_REFLECTOR(osgSim::ShapeAttributeList) I_DeclaringFile("osgSim/ShapeAttribute"); I_BaseType(osg::Object); @@ -135,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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index 92afb0e4d..beccac126 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -29,8 +29,6 @@ #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); @@ -40,6 +38,8 @@ 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 e5df19b49..9c2b0655e 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 d351562b3..6fe4db982 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgTerrain/Layer.cpp b/src/osgWrappers/osgTerrain/Layer.cpp index f4c7ca720..b34095e30 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -274,7 +274,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ContourLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, value, + I_Method1(void, setModifiedCount, IN, unsigned int, int, 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 &, copyop, + 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. ", @@ -397,7 +397,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, value, + I_Method1(void, setModifiedCount, IN, unsigned int, int, 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 &, copyop, + 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. ", @@ -520,7 +520,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ImageLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, value, + I_Method1(void, setModifiedCount, IN, unsigned int, int, 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -924,7 +924,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::ProxyLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, value, + I_Method1(void, setModifiedCount, IN, unsigned int, int, 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgTerrain/Locator.cpp b/src/osgWrappers/osgTerrain/Locator.cpp index 54768280f..f11c02a8d 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgTerrain/Terrain.cpp b/src/osgWrappers/osgTerrain/Terrain.cpp index 6a9b3cac8..d7a2e7ae9 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 9280885be..d1ac6d98b 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgTerrain/TerrainTile.cpp b/src/osgWrappers/osgTerrain/TerrainTile.cpp index 034c74947..178734b58 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 b92dd9a90..942bf89e0 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgText/KerningType.cpp b/src/osgWrappers/osgText/KerningType.cpp index d071ffbff..343fb87f7 100644 --- a/src/osgWrappers/osgText/KerningType.cpp +++ b/src/osgWrappers/osgText/KerningType.cpp @@ -20,8 +20,6 @@ #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); @@ -29,5 +27,7 @@ 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 a397cfdaf..3e9831bdb 100644 --- a/src/osgWrappers/osgText/String.cpp +++ b/src/osgWrappers/osgText/String.cpp @@ -20,8 +20,6 @@ #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); @@ -36,6 +34,8 @@ 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 e446843a7..a7d916ec6 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -28,8 +28,6 @@ #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); @@ -59,6 +57,8 @@ 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgText/Text3D.cpp b/src/osgWrappers/osgText/Text3D.cpp index 4f2308cf5..b8e294c15 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 &, copyop, + 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. ", @@ -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, - "Set the Font to use to render the text. ", - "setFont(0) sets the use of the default font. "); + "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. "); 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, - "return true, osgText::Text does support accept(PrimitiveFunctor&) . ", - ""); + "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&) . "); I_Method1(void, setThreadSafeRefUnref, IN, bool, threadSafe, Properties::VIRTUAL, __void__setThreadSafeRefUnref__bool, - "Set whether to use a mutex to ensure ref() and unref() are thread safe. ", - ""); + "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. "); 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 b18eebba3..f1c9fda6c 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 &, pos, IN, bool, withLODScale, + I_Method2(float, getDistanceToEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, 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 &, pos, IN, bool, withLODScale, + I_Method2(float, getDistanceFromEyePoint, IN, const osg::Vec3 &, x, IN, bool, x, 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 &, pos, IN, bool, withLODScale, + I_Method2(float, getDistanceToViewPoint, IN, const osg::Vec3 &, x, IN, bool, x, 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 a211a4293..0bc35261e 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, - "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. "); + "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. "); 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 135b58876..7b8d6d0f3 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -41,8 +41,6 @@ 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); @@ -56,6 +54,8 @@ 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 100597ef6..386809296 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 26a9fb0ad..dbbbb0bbb 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -36,12 +36,6 @@ 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); @@ -50,9 +44,39 @@ 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, "", ""); @@ -70,7 +94,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 &, copyop, + 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. ", @@ -270,30 +294,6 @@ 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 e80331daa..aaaa19750 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 784f1f648..4d4f4f2e4 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -43,8 +43,6 @@ #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); @@ -73,6 +71,8 @@ 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgUtil/Simplifier.cpp b/src/osgWrappers/osgUtil/Simplifier.cpp index 28ff1dc7a..d0ea7f382 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, - "simply the geometry, whilst protecting key points from being modified. ", - ""); + "a list of point indices ", + "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 5a9ede41f..7ba071784 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -33,12 +33,6 @@ #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); @@ -51,6 +45,12 @@ 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 *, x, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3 *, vertices, 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 *, x, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2 *, vertices, 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 *, x, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4 *, vertices, 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 *, x, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3d *, vertices, 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 *, x, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2d *, vertices, 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 *, x, + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4d *, vertices, 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, x, IN, GLsizei, count, + I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, 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 *, x, + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLubyte *, indices, 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 *, x, + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLushort *, indices, 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 *, x, + I_Method3(void, drawElements, IN, GLenum, mode, IN, GLsizei, count, IN, const GLuint *, indices, 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, x, IN, float, x, + I_Method3(void, vertex, IN, float, x, IN, float, y, IN, float, z, Properties::VIRTUAL, __void__vertex__float__float__float, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method1(void, vertex, IN, const osg::Vec3 &, x, + I_Method1(void, vertex, IN, const osg::Vec3 &, vert, Properties::VIRTUAL, __void__vertex__C5_osg_Vec3_R1, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method1(void, vertex, IN, const osg::Vec2 &, x, + I_Method1(void, vertex, IN, const osg::Vec2 &, vert, Properties::VIRTUAL, __void__vertex__C5_osg_Vec2_R1, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method1(void, vertex, IN, const osg::Vec4 &, x, + I_Method1(void, vertex, IN, const osg::Vec4 &, vert, Properties::VIRTUAL, __void__vertex__C5_osg_Vec4_R1, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method2(void, vertex, IN, float, x, IN, float, x, + I_Method2(void, vertex, IN, float, x, IN, float, y, Properties::VIRTUAL, __void__vertex__float__float, "Mimics the OpenGL glVertex() \"family of functions\". ", ""); - I_Method4(void, vertex, IN, float, x, IN, float, x, IN, float, x, IN, float, x, + I_Method4(void, vertex, IN, float, x, IN, float, y, IN, float, z, IN, float, w, 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 51ec8a7b8..b2c63d3fb 100644 --- a/src/osgWrappers/osgUtil/Tessellator.cpp +++ b/src/osgWrappers/osgUtil/Tessellator.cpp @@ -22,10 +22,6 @@ #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); @@ -42,6 +38,10 @@ 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 416fd3974..83af88df4 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgViewer/GraphicsWindow.cpp b/src/osgWrappers/osgViewer/GraphicsWindow.cpp index 95ad1817e..d5b66da1b 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, - "Return whether a valid and usable GraphicsContext has been created. ", - ""); + "Create a new mouse cursor from the usual bitmap data. ", + "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, x, true, + I_MethodWithDefaults1(void, requestContinuousUpdate, IN, bool, needed, 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, x, + I_Method2(void, requestWarpPointer, IN, float, x, IN, float, y, 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, - "Return whether a valid and usable GraphicsContext has been created. ", - ""); + "Create a new mouse cursor from the usual bitmap data. ", + "Return whether a valid and usable GraphicsContext has been created. "); I_Method0(bool, realizeImplementation, Properties::VIRTUAL, __bool__realizeImplementation, diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index c5673b09a..02777c02d 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index 7f02ce969..20ab1041b 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgViewer/ViewerBase.cpp b/src/osgWrappers/osgViewer/ViewerBase.cpp index 28de0a805..07d0dd5b9 100644 --- a/src/osgWrappers/osgViewer/ViewerBase.cpp +++ b/src/osgWrappers/osgViewer/ViewerBase.cpp @@ -28,20 +28,6 @@ #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); @@ -59,6 +45,20 @@ 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 c44bd98e6..af20259f1 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 &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, copyop, + 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. ", @@ -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 *, nv, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, 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. ", @@ -197,7 +197,7 @@ BEGIN_OBJECT_REFLECTOR(osgViewer::LODScaleHandler) __int__getKeyEventDecreaseLODScale, "", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, usage, + I_Method1(void, getUsage, IN, osg::ApplicationUsage &, x, Properties::VIRTUAL, __void__getUsage__osg_ApplicationUsage_R1, "Get the keyboard and mouse usage of this manipulator. ", ""); - I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 &, ea, IN, osgGA::GUIActionAdapter &, aa, + I_Method2(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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/osgVolume/FixedFunctionTechnique.cpp b/src/osgWrappers/osgVolume/FixedFunctionTechnique.cpp index 4ea11ad4c..64725a996 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgVolume/Layer.cpp b/src/osgWrappers/osgVolume/Layer.cpp index 38c7ae443..4f5443ac6 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -229,7 +229,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::ImageLayer) __void__dirty, "increment the modified count. ", "\" "); - I_Method1(void, setModifiedCount, IN, unsigned int, value, + I_Method1(void, setModifiedCount, IN, unsigned int, int, 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgVolume/Locator.cpp b/src/osgWrappers/osgVolume/Locator.cpp index 5270f9b74..d473361a8 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgVolume/Property.cpp b/src/osgWrappers/osgVolume/Property.cpp index 8e3675f71..75791cab7 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -494,7 +494,7 @@ BEGIN_OBJECT_REFLECTOR(osgVolume::PropertyAdjustmentCallback) __int__getKeyEventActivatesAlphaFuncAdjustment, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, x, IN, osg::Object *, object, IN, osg::NodeVisitor *, x, + I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgVolume/RayTracedTechnique.cpp b/src/osgWrappers/osgVolume/RayTracedTechnique.cpp index 9910d6870..70b4c54cb 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgVolume/Volume.cpp b/src/osgWrappers/osgVolume/Volume.cpp index 6a180bc39..8cc6af978 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 43e60fab4..e2bcd4a9c 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgVolume/VolumeTile.cpp b/src/osgWrappers/osgVolume/VolumeTile.cpp index b772edcd3..63a7c5c25 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 &, nv, + I_Method1(void, traverse, IN, osg::NodeVisitor &, x, 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 ca33fd669..0acb9f4b1 100644 --- a/src/osgWrappers/osgWidget/Browser.cpp +++ b/src/osgWrappers/osgWidget/Browser.cpp @@ -64,6 +64,10 @@ 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, @@ -84,10 +88,6 @@ 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 &, copyop, + I_ProtectedMethod1(osg::Object *, clone, IN, const osg::CopyOp &, x, 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 988e0bb39..2c4905acf 100644 --- a/src/osgWrappers/osgWidget/Frame.cpp +++ b/src/osgWrappers/osgWidget/Frame.cpp @@ -53,6 +53,26 @@ 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, @@ -161,26 +181,6 @@ 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgWidget/Label.cpp b/src/osgWrappers/osgWidget/Label.cpp index 716e7a6f3..66ff0b509 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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgWidget/StyleManager.cpp b/src/osgWrappers/osgWidget/StyleManager.cpp index 5a1a0b65b..ed32a1ea7 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp b/src/osgWrappers/osgWidget/ViewerEventHandlers.cpp index 2f2b5dc05..b8a026b2b 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 &, x, IN, osgGA::GUIActionAdapter &, x, 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 *, 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,16 +48,14 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::KeyboardHandler) ____KeyboardHandler__WindowManager_P1, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 *, 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. ", ""); END_REFLECTOR -TYPE_NAME_ALIAS(bool(osgWidget::MouseHandler::*), osgWidget::MouseHandler::MouseAction) -TYPE_NAME_ALIAS(bool(osgWidget::WindowManager::*), osgWidget::MouseHandler::MouseEvent) BEGIN_OBJECT_REFLECTOR(osgWidget::MouseHandler) I_DeclaringFile("osgWidget/ViewerEventHandlers"); @@ -67,7 +65,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::MouseHandler) ____MouseHandler__WindowManager_P1, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 *, 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. ", @@ -129,7 +127,7 @@ BEGIN_OBJECT_REFLECTOR(osgWidget::ResizeHandler) ____ResizeHandler__WindowManager_P1__osg_Camera_P1, "", ""); - I_Method4(bool, handle, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, 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 *, 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 1fa84b2d8..9dbb81cd3 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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", @@ -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 &, copyop, + 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. ", diff --git a/src/osgWrappers/osgWidget/Window.cpp b/src/osgWrappers/osgWidget/Window.cpp index 9d555ef50..3fc8206fb 100644 --- a/src/osgWrappers/osgWidget/Window.cpp +++ b/src/osgWrappers/osgWidget/Window.cpp @@ -28,10 +28,6 @@ #undef OUT #endif -TYPE_NAME_ALIAS(std::list< osg::observer_ptr< osgWidget::Window > >, osgWidget::Window::WindowList) - -TYPE_NAME_ALIAS(osgWidget::point_type(osgWidget::Widget::*), osgWidget::Window::Getter) - BEGIN_ENUM_REFLECTOR(osgWidget::Window::Strata) I_DeclaringFile("osgWidget/Window"); I_EnumLabel(osgWidget::Window::STRATA_NONE); @@ -62,6 +58,9 @@ 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); @@ -862,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 &, copyop, + 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. ",