diff --git a/Make/openscenegraph.pc b/Make/openscenegraph.pc index 93651476b..48bceb47b 100644 --- a/Make/openscenegraph.pc +++ b/Make/openscenegraph.pc @@ -7,8 +7,8 @@ includedir=${prefix}/include Name: openscenegraph Description: 3D scenegraph -Version: 1.0,0 +Version: 1.2,0 Requires: openthreads Conflicts: -Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgProducer -losgSim -losgText -losgUtil +Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgViewer -losgSim -losgText -losgUtil Cflags: -I${includedir} diff --git a/examples/osgspacewarp/osgspacewarp.cpp b/examples/osgspacewarp/osgspacewarp.cpp index b5a06ce04..7c4e55abc 100644 --- a/examples/osgspacewarp/osgspacewarp.cpp +++ b/examples/osgspacewarp/osgspacewarp.cpp @@ -111,7 +111,7 @@ osg::Node* createScene(unsigned int noStars) return group; } -int main( int argc, char **argv ) +int main(int , char **) { // construct the viewer. osgViewer::Viewer viewer; diff --git a/include/osg/Drawable b/include/osg/Drawable index 8fece31b5..920af24aa 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -125,6 +125,10 @@ class OSG_EXPORT Drawable : public Object virtual const Geometry* asGeometry() const { return 0; } + /** Compute the DataVariance based on an assestment of callback etc.*/ + virtual void computeDataVariance(); + + /** A vector of osg::Node pointers which is used to store the parent(s) of drawable.*/ typedef std::vector ParentList; diff --git a/include/osg/Object b/include/osg/Object index 1111237ff..5f265f9e1 100644 --- a/include/osg/Object +++ b/include/osg/Object @@ -102,6 +102,9 @@ class OSG_EXPORT Object : public Referenced /** Get the data variance of this object.*/ inline DataVariance getDataVariance() const { return _dataVariance; } + + /** Compute the DataVariance based on an assestment of callback etc.*/ + virtual void computeDataVariance() {} /** diff --git a/include/osg/StateSet b/include/osg/StateSet index 3d70e6c56..f57ea250e 100644 --- a/include/osg/StateSet +++ b/include/osg/StateSet @@ -92,6 +92,10 @@ class OSG_EXPORT StateSet : public Object inline unsigned int getNumParents() const { return _parents.size(); } + /** Compute the DataVariance based on an assestment of callback etc.*/ + virtual void computeDataVariance(); + + /** Set all the modes to on or off so that it defines a complete state, typically used for a default global state.*/ void setGlobalDefaults(); @@ -426,8 +430,6 @@ class OSG_EXPORT StateSet : public Object /** call release on all StateAttributes contained within this StateSet.*/ virtual void releaseGLObjects(State* state=0) const; - - protected : diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp index 6d924c5a1..192d6be5e 100644 --- a/src/osg/Drawable.cpp +++ b/src/osg/Drawable.cpp @@ -294,6 +294,19 @@ Drawable::~Drawable() dirtyDisplayList(); } +void Drawable::computeDataVariance() +{ + bool dynamic = false; + if (getUpdateCallback() || + getEventCallback() || + getCullCallback()) + { + dynamic = true; + } + + setDataVariance(dynamic ? DYNAMIC : STATIC); +} + void Drawable::addParent(osg::Node* node) { _parents.push_back(node); diff --git a/src/osg/StateSet.cpp b/src/osg/StateSet.cpp index c793cb98b..f2369f1ee 100644 --- a/src/osg/StateSet.cpp +++ b/src/osg/StateSet.cpp @@ -169,6 +169,78 @@ StateSet::~StateSet() clear(); } +void StateSet::computeDataVariance() +{ + bool dynamic = false; + + if (_updateCallback.valid() || + _eventCallback.valid()) + { + dynamic = true; + } + + // run attribute callbacks + for(AttributeList::iterator itr=_attributeList.begin(); + itr!=_attributeList.end(); + ++itr) + { + if (itr->second.first->getUpdateCallback() || + itr->second.first->getEventCallback() || + itr->second.first->getDataVariance()==DYNAMIC) + { + dynamic = true; + itr->second.first->setDataVariance(DYNAMIC); + } + } + + // run texture attribute callbacks. + for(unsigned int i=0;i<_textureAttributeList.size();++i) + { + AttributeList& attributeList = _textureAttributeList[i]; + for(AttributeList::iterator itr=attributeList.begin(); + itr!=attributeList.end(); + ++itr) + { + if (itr->second.first->getUpdateCallback() || + itr->second.first->getEventCallback() || + itr->second.first->getDataVariance()==DYNAMIC) + { + itr->second.first->setDataVariance(DYNAMIC); + dynamic = true; + } + } + } + + + // run uniform callbacks. + for(UniformList::iterator uitr = _uniformList.begin(); + uitr != _uniformList.end(); + ++uitr) + { + if (uitr->second.first->getUpdateCallback() || + uitr->second.first->getEventCallback() || + uitr->second.first->getDataVariance()==DYNAMIC) + { + uitr->second.first->setDataVariance(DYNAMIC); + dynamic = true; + } + } + +#if 0 + if (dynamic) + { + osg::notify(osg::NOTICE)<<"StateSet::computeDataVariance setting to DYNAMIC"< #include +#include #include #include #include @@ -672,13 +673,13 @@ int Viewer::run() realize(); } -#if 1 +#if 0 while (!done()) { frame(); } #else - int runTillFrameNumber = 10; + int runTillFrameNumber = 100; while (!done() && getFrameStamp()->getFrameNumber()setNumFramesToRetainObjects(2); + + // now make sure the scene graph is set up with the correct DataVariance to protect the dyamic elements of + // the scene graph from being run in parallel. + osgUtil::Optimizer::StaticObjectDetectionVisitor sodv; + getSceneData()->accept(sodv); } if (numThreadsOnBarrier>1) diff --git a/src/osgWrappers/osg/AlphaFunc.cpp b/src/osgWrappers/osg/AlphaFunc.cpp index e9ed5c95b..a5923c456 100644 --- a/src/osgWrappers/osg/AlphaFunc.cpp +++ b/src/osgWrappers/osg/AlphaFunc.cpp @@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::AlphaFunc::ComparisonFunction) I_EnumLabel(osg::AlphaFunc::ALWAYS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AlphaFunc) +BEGIN_OBJECT_REFLECTOR(osg::AlphaFunc) I_BaseType(osg::StateAttribute); I_Constructor0(____AlphaFunc, "", diff --git a/src/osgWrappers/osg/AnimationPath.cpp b/src/osgWrappers/osg/AnimationPath.cpp index 4f781c5f0..5ecb44567 100644 --- a/src/osgWrappers/osg/AnimationPath.cpp +++ b/src/osgWrappers/osg/AnimationPath.cpp @@ -36,7 +36,7 @@ BEGIN_ENUM_REFLECTOR(osg::AnimationPath::LoopMode) I_EnumLabel(osg::AnimationPath::NO_LOOPING); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AnimationPath) +BEGIN_OBJECT_REFLECTOR(osg::AnimationPath) I_VirtualBaseType(osg::Object); I_Constructor0(____AnimationPath, "", @@ -260,7 +260,7 @@ BEGIN_VALUE_REFLECTOR(osg::AnimationPath::ControlPoint) __void__setScale__C5_osg_Vec3d_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AnimationPathCallback) +BEGIN_OBJECT_REFLECTOR(osg::AnimationPathCallback) I_BaseType(osg::NodeCallback); I_Constructor0(____AnimationPathCallback, "", diff --git a/src/osgWrappers/osg/ApplicationUsage.cpp b/src/osgWrappers/osg/ApplicationUsage.cpp index ea17bed55..a631ee170 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -28,7 +28,7 @@ BEGIN_ENUM_REFLECTOR(osg::ApplicationUsage::Type) I_EnumLabel(osg::ApplicationUsage::KEYBOARD_MOUSE_BINDING); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ApplicationUsage) +BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage) I_BaseType(osg::Referenced); I_Constructor0(____ApplicationUsage, "", diff --git a/src/osgWrappers/osg/Array.cpp b/src/osgWrappers/osg/Array.cpp index 8a567e9e5..dbb9a1fbd 100644 --- a/src/osgWrappers/osg/Array.cpp +++ b/src/osgWrappers/osg/Array.cpp @@ -173,7 +173,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Array) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ArrayVisitor) +BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor) I_Constructor0(____ArrayVisitor, "", ""); @@ -269,7 +269,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ArrayVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstArrayVisitor) +BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) I_Constructor0(____ConstArrayVisitor, "", ""); @@ -365,7 +365,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstArrayVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstValueVisitor) +BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) I_Constructor0(____ConstValueVisitor, "", ""); @@ -478,7 +478,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::IndexArray) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ValueVisitor) +BEGIN_VALUE_REFLECTOR(osg::ValueVisitor) I_Constructor0(____ValueVisitor, "", ""); @@ -603,7 +603,7 @@ TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >, osg::Vec4bArray); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -685,7 +685,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::F 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array::Vec2ArrayType COMMA 2 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -767,7 +767,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2 COMMA osg::Array: 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bArrayType COMMA 2 COMMA GL_BYTE >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -849,7 +849,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -931,7 +931,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array::Vec3ArrayType COMMA 3 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -1013,7 +1013,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3 COMMA osg::Array: 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bArrayType COMMA 3 COMMA GL_BYTE >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -1095,7 +1095,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -1177,7 +1177,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array::Vec4ArrayType COMMA 4 COMMA GL_FLOAT >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -1259,7 +1259,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4 COMMA osg::Array: 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bArrayType COMMA 4 COMMA GL_BYTE >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -1341,7 +1341,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -1423,7 +1423,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Array::Vec4ubArrayType COMMA 4 COMMA GL_UNSIGNED_BYTE >) I_BaseType(osg::Array); I_BaseType(std::vector); I_Constructor0(____TemplateArray, @@ -1505,7 +1505,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4ub COMMA osg::Arra 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >) I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(____TemplateIndexArray, @@ -1592,7 +1592,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLbyte COMMA osg::Arra 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array::IntArrayType COMMA 1 COMMA GL_INT >) I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(____TemplateIndexArray, @@ -1679,7 +1679,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLint COMMA osg::Array 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Array::ShortArrayType COMMA 1 COMMA GL_SHORT >) I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(____TemplateIndexArray, @@ -1766,7 +1766,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLshort COMMA osg::Arr 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Array::UByteArrayType COMMA 1 COMMA GL_UNSIGNED_BYTE >) I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(____TemplateIndexArray, @@ -1853,7 +1853,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLubyte COMMA osg::Arr 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Array::UIntArrayType COMMA 1 COMMA GL_UNSIGNED_INT >) I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(____TemplateIndexArray, @@ -1940,7 +1940,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLuint COMMA osg::Arra 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT >) +BEGIN_OBJECT_REFLECTOR(osg::TemplateIndexArray< GLushort COMMA osg::Array::UShortArrayType COMMA 1 COMMA GL_UNSIGNED_SHORT >) I_BaseType(osg::IndexArray); I_BaseType(std::vector); I_Constructor0(____TemplateIndexArray, diff --git a/src/osgWrappers/osg/AutoTransform.cpp b/src/osgWrappers/osg/AutoTransform.cpp index cefe7c9a8..4f42cd93a 100644 --- a/src/osgWrappers/osg/AutoTransform.cpp +++ b/src/osgWrappers/osg/AutoTransform.cpp @@ -33,7 +33,7 @@ BEGIN_ENUM_REFLECTOR(osg::AutoTransform::AutoRotateMode) I_EnumLabel(osg::AutoTransform::ROTATE_TO_CAMERA); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::AutoTransform) +BEGIN_OBJECT_REFLECTOR(osg::AutoTransform) I_BaseType(osg::Transform); I_Constructor0(____AutoTransform, "", diff --git a/src/osgWrappers/osg/Billboard.cpp b/src/osgWrappers/osg/Billboard.cpp index 3175afcd0..2a9f357dd 100644 --- a/src/osgWrappers/osg/Billboard.cpp +++ b/src/osgWrappers/osg/Billboard.cpp @@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::Billboard::Mode) I_EnumLabel(osg::Billboard::AXIAL_ROT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Billboard) +BEGIN_OBJECT_REFLECTOR(osg::Billboard) I_BaseType(osg::Geode); I_Constructor0(____Billboard, "", diff --git a/src/osgWrappers/osg/BlendColor.cpp b/src/osgWrappers/osg/BlendColor.cpp index f84f0e4c2..dcf177949 100644 --- a/src/osgWrappers/osg/BlendColor.cpp +++ b/src/osgWrappers/osg/BlendColor.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendColor) +BEGIN_OBJECT_REFLECTOR(osg::BlendColor) I_BaseType(osg::StateAttribute); I_Constructor0(____BlendColor, "", @@ -115,7 +115,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendColor) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendColor::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::BlendColor::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/BlendEquation.cpp b/src/osgWrappers/osg/BlendEquation.cpp index 7f3804398..43dfc3418 100644 --- a/src/osgWrappers/osg/BlendEquation.cpp +++ b/src/osgWrappers/osg/BlendEquation.cpp @@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::BlendEquation::Equation) I_EnumLabel(osg::BlendEquation::FUNC_REVERSE_SUBTRACT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendEquation) +BEGIN_OBJECT_REFLECTOR(osg::BlendEquation) I_BaseType(osg::StateAttribute); I_Constructor0(____BlendEquation, "", @@ -120,7 +120,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendEquation) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendEquation::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::BlendEquation::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/BlendFunc.cpp b/src/osgWrappers/osg/BlendFunc.cpp index b5a9d023e..a8d817a89 100644 --- a/src/osgWrappers/osg/BlendFunc.cpp +++ b/src/osgWrappers/osg/BlendFunc.cpp @@ -42,7 +42,7 @@ BEGIN_ENUM_REFLECTOR(osg::BlendFunc::BlendFuncMode) I_EnumLabel(osg::BlendFunc::ZERO); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendFunc) +BEGIN_OBJECT_REFLECTOR(osg::BlendFunc) I_BaseType(osg::StateAttribute); I_Constructor0(____BlendFunc, "", @@ -205,7 +205,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendFunc) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BlendFunc::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::BlendFunc::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index 3ca195f36..fb268212d 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -121,7 +121,7 @@ BEGIN_VALUE_REFLECTOR(osg::BufferObject::BufferEntry) I_PublicMemberProperty(unsigned int, offset); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BufferObject::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, @@ -212,7 +212,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >, osg::PixelBufferObject::BufferEntryImagePair); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PixelBufferObject) +BEGIN_OBJECT_REFLECTOR(osg::PixelBufferObject) I_BaseType(osg::BufferObject); I_ConstructorWithDefaults1(IN, osg::Image *, image, 0, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp index 03a80736a..b965ae051 100644 --- a/src/osgWrappers/osg/Camera.cpp +++ b/src/osgWrappers/osg/Camera.cpp @@ -72,7 +72,7 @@ BEGIN_ENUM_REFLECTOR(osg::Camera::BufferComponent) I_EnumLabel(osg::Camera::COLOR_BUFFER7); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Camera) +BEGIN_OBJECT_REFLECTOR(osg::Camera) I_BaseType(osg::Transform); I_BaseType(osg::CullSettings); I_Constructor0(____Camera, @@ -578,7 +578,7 @@ BEGIN_VALUE_REFLECTOR(osg::Camera::Attachment) I_PublicMemberProperty(bool, _mipMapGeneration); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Camera::DrawCallback) +BEGIN_OBJECT_REFLECTOR(osg::Camera::DrawCallback) I_VirtualBaseType(osg::Object); I_Constructor0(____DrawCallback, "", diff --git a/src/osgWrappers/osg/CameraView.cpp b/src/osgWrappers/osg/CameraView.cpp index 5275a2a7b..f533c3361 100644 --- a/src/osgWrappers/osg/CameraView.cpp +++ b/src/osgWrappers/osg/CameraView.cpp @@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osg::CameraView::FieldOfViewMode) I_EnumLabel(osg::CameraView::VERTICAL); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CameraView) +BEGIN_OBJECT_REFLECTOR(osg::CameraView) I_BaseType(osg::Transform); I_Constructor0(____CameraView, "", diff --git a/src/osgWrappers/osg/ClampColor.cpp b/src/osgWrappers/osg/ClampColor.cpp index 8bd00d74e..21ed01c3b 100644 --- a/src/osgWrappers/osg/ClampColor.cpp +++ b/src/osgWrappers/osg/ClampColor.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClampColor) +BEGIN_OBJECT_REFLECTOR(osg::ClampColor) I_BaseType(osg::StateAttribute); I_Constructor0(____ClampColor, "", @@ -129,7 +129,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClampColor) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClampColor::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::ClampColor::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/ClearNode.cpp b/src/osgWrappers/osg/ClearNode.cpp index 463883c35..7b64e7d70 100644 --- a/src/osgWrappers/osg/ClearNode.cpp +++ b/src/osgWrappers/osg/ClearNode.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClearNode) +BEGIN_OBJECT_REFLECTOR(osg::ClearNode) I_BaseType(osg::Group); I_Constructor0(____ClearNode, "", diff --git a/src/osgWrappers/osg/ClipNode.cpp b/src/osgWrappers/osg/ClipNode.cpp index 07d7c3793..0b7585ffc 100644 --- a/src/osgWrappers/osg/ClipNode.cpp +++ b/src/osgWrappers/osg/ClipNode.cpp @@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::ClipPlane > >, osg::ClipNode::ClipPlaneList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClipNode) +BEGIN_OBJECT_REFLECTOR(osg::ClipNode) I_BaseType(osg::Group); I_Constructor0(____ClipNode, "", diff --git a/src/osgWrappers/osg/ClipPlane.cpp b/src/osgWrappers/osg/ClipPlane.cpp index 1157ba6f7..6d22112b5 100644 --- a/src/osgWrappers/osg/ClipPlane.cpp +++ b/src/osgWrappers/osg/ClipPlane.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClipPlane) +BEGIN_OBJECT_REFLECTOR(osg::ClipPlane) I_BaseType(osg::StateAttribute); I_Constructor0(____ClipPlane, "", diff --git a/src/osgWrappers/osg/ClusterCullingCallback.cpp b/src/osgWrappers/osg/ClusterCullingCallback.cpp index f371f458d..8561e0a41 100644 --- a/src/osgWrappers/osg/ClusterCullingCallback.cpp +++ b/src/osgWrappers/osg/ClusterCullingCallback.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ClusterCullingCallback) +BEGIN_OBJECT_REFLECTOR(osg::ClusterCullingCallback) I_BaseType(osg::Drawable::CullCallback); I_BaseType(osg::NodeCallback); I_Constructor0(____ClusterCullingCallback, diff --git a/src/osgWrappers/osg/CollectOccludersVisitor.cpp b/src/osgWrappers/osg/CollectOccludersVisitor.cpp index 134fc4c98..7e44ec3ae 100644 --- a/src/osgWrappers/osg/CollectOccludersVisitor.cpp +++ b/src/osgWrappers/osg/CollectOccludersVisitor.cpp @@ -29,7 +29,7 @@ TYPE_NAME_ALIAS(std::set< osg::ShadowVolumeOccluder >, osg::CollectOccludersVisitor::ShadowVolumeOccluderSet); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) +BEGIN_OBJECT_REFLECTOR(osg::CollectOccludersVisitor) I_BaseType(osg::NodeVisitor); I_BaseType(osg::CullStack); I_Constructor0(____CollectOccludersVisitor, diff --git a/src/osgWrappers/osg/ColorMask.cpp b/src/osgWrappers/osg/ColorMask.cpp index 46c2363a2..1c3c8e023 100644 --- a/src/osgWrappers/osg/ColorMask.cpp +++ b/src/osgWrappers/osg/ColorMask.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ColorMask) +BEGIN_OBJECT_REFLECTOR(osg::ColorMask) I_BaseType(osg::StateAttribute); I_Constructor0(____ColorMask, "", diff --git a/src/osgWrappers/osg/ColorMatrix.cpp b/src/osgWrappers/osg/ColorMatrix.cpp index 82d613658..1cd9ed5f1 100644 --- a/src/osgWrappers/osg/ColorMatrix.cpp +++ b/src/osgWrappers/osg/ColorMatrix.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ColorMatrix) +BEGIN_OBJECT_REFLECTOR(osg::ColorMatrix) I_BaseType(osg::StateAttribute); I_Constructor0(____ColorMatrix, "", diff --git a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp index 41aba28f2..6bcaa1f22 100644 --- a/src/osgWrappers/osg/ConvexPlanarOccluder.cpp +++ b/src/osgWrappers/osg/ConvexPlanarOccluder.cpp @@ -25,7 +25,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ConvexPlanarPolygon >, osg::ConvexPlanarOccluder::HoleList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) +BEGIN_OBJECT_REFLECTOR(osg::ConvexPlanarOccluder) I_BaseType(osg::Object); I_Constructor0(____ConvexPlanarOccluder, "", diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index 3bc4ffa5f..4d6d9a88a 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CoordinateSystemNode) +BEGIN_OBJECT_REFLECTOR(osg::CoordinateSystemNode) I_BaseType(osg::Group); I_Constructor0(____CoordinateSystemNode, "", @@ -129,7 +129,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CoordinateSystemNode) __void__setFormat__C5_std_string_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::EllipsoidModel) +BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel) I_BaseType(osg::Object); I_ConstructorWithDefaults2(IN, double, radiusEquator, osg::WGS_84_RADIUS_EQUATOR, IN, double, radiusPolar, osg::WGS_84_RADIUS_POLAR, ____EllipsoidModel__double__double, diff --git a/src/osgWrappers/osg/CopyOp.cpp b/src/osgWrappers/osg/CopyOp.cpp index a05fc61d3..a25343cd7 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -50,7 +50,7 @@ BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) I_EnumLabel(osg::CopyOp::DEEP_COPY_ALL); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CopyOp) +BEGIN_VALUE_REFLECTOR(osg::CopyOp) I_ConstructorWithDefaults1(IN, osg::CopyOp::CopyFlags, flags, osg::CopyOp::SHALLOW_COPY, Properties::NON_EXPLICIT, ____CopyOp__CopyFlags, diff --git a/src/osgWrappers/osg/CullFace.cpp b/src/osgWrappers/osg/CullFace.cpp index 013be997d..e74796098 100644 --- a/src/osgWrappers/osg/CullFace.cpp +++ b/src/osgWrappers/osg/CullFace.cpp @@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osg::CullFace::Mode) I_EnumLabel(osg::CullFace::FRONT_AND_BACK); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullFace) +BEGIN_OBJECT_REFLECTOR(osg::CullFace) I_BaseType(osg::StateAttribute); I_ConstructorWithDefaults1(IN, osg::CullFace::Mode, mode, osg::CullFace::BACK, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/CullSettings.cpp b/src/osgWrappers/osg/CullSettings.cpp index a0136996b..5b04cda77 100644 --- a/src/osgWrappers/osg/CullSettings.cpp +++ b/src/osgWrappers/osg/CullSettings.cpp @@ -64,7 +64,7 @@ BEGIN_ENUM_REFLECTOR(osg::CullSettings::CullingModeValues) I_EnumLabel(osg::CullSettings::ENABLE_ALL_CULLING); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullSettings) +BEGIN_VALUE_REFLECTOR(osg::CullSettings) I_Constructor0(____CullSettings, "", ""); diff --git a/src/osgWrappers/osg/CullingSet.cpp b/src/osgWrappers/osg/CullingSet.cpp index 7ef3972dd..405ae0753 100644 --- a/src/osgWrappers/osg/CullingSet.cpp +++ b/src/osgWrappers/osg/CullingSet.cpp @@ -50,7 +50,7 @@ BEGIN_ENUM_REFLECTOR(osg::CullingSet::MaskValues) I_EnumLabel(osg::CullingSet::ENABLE_ALL_CULLING); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CullingSet) +BEGIN_OBJECT_REFLECTOR(osg::CullingSet) I_BaseType(osg::Referenced); I_Constructor0(____CullingSet, "", diff --git a/src/osgWrappers/osg/Depth.cpp b/src/osgWrappers/osg/Depth.cpp index 8566d3f54..15a20ee45 100644 --- a/src/osgWrappers/osg/Depth.cpp +++ b/src/osgWrappers/osg/Depth.cpp @@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::Depth::Function) I_EnumLabel(osg::Depth::ALWAYS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Depth) +BEGIN_OBJECT_REFLECTOR(osg::Depth) I_BaseType(osg::StateAttribute); I_ConstructorWithDefaults4(IN, osg::Depth::Function, func, osg::Depth::LESS, IN, double, zNear, 0.0, IN, double, zFar, 1.0, IN, bool, writeMask, true, ____Depth__Function__double__double__bool, diff --git a/src/osgWrappers/osg/DisplaySettings.cpp b/src/osgWrappers/osg/DisplaySettings.cpp index ffc7fd150..2fb2721df 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -49,7 +49,7 @@ BEGIN_ENUM_REFLECTOR(osg::DisplaySettings::SplitStereoVerticalEyeMapping) I_EnumLabel(osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DisplaySettings) +BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) I_BaseType(osg::Referenced); I_Constructor0(____DisplaySettings, "", diff --git a/src/osgWrappers/osg/DrawPixels.cpp b/src/osgWrappers/osg/DrawPixels.cpp index 23787e540..e45557ac8 100644 --- a/src/osgWrappers/osg/DrawPixels.cpp +++ b/src/osgWrappers/osg/DrawPixels.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawPixels) +BEGIN_OBJECT_REFLECTOR(osg::DrawPixels) I_BaseType(osg::Drawable); I_Constructor0(____DrawPixels, "", diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index cecdc8680..b3c68f8e8 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -93,6 +93,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) __C5_Geometry_P1__asGeometry, "Convert 'const this' into a const Geometry pointer if Drawable is a Geometry, otherwise return 0. ", "Equivalent to dynamic_cast(this). "); + I_Method0(void, computeDataVariance, + Properties::VIRTUAL, + __void__computeDataVariance, + "Compute the DataVariance based on an assestment of callback etc. ", + ""); I_Method0(const osg::Drawable::ParentList &, getParents, Properties::NON_VIRTUAL, __C5_ParentList_R1__getParents, @@ -477,7 +482,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) __void__setUseVertexBufferObjects__bool); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::AttributeFunctor) +BEGIN_VALUE_REFLECTOR(osg::Drawable::AttributeFunctor) I_Constructor0(____AttributeFunctor, "", ""); @@ -538,7 +543,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::AttributeFunctor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) +BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) I_BaseType(osg::Object); I_Constructor0(____ComputeBoundingBoxCallback, "", @@ -579,7 +584,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ConstAttributeFunctor) +BEGIN_VALUE_REFLECTOR(osg::Drawable::ConstAttributeFunctor) I_Constructor0(____ConstAttributeFunctor, "", ""); @@ -640,7 +645,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::ConstAttributeFunctor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::CullCallback) +BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback) I_VirtualBaseType(osg::Object); I_Constructor0(____CullCallback, "", @@ -686,7 +691,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::CullCallback) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::DrawCallback) +BEGIN_OBJECT_REFLECTOR(osg::Drawable::DrawCallback) I_VirtualBaseType(osg::Object); I_Constructor0(____DrawCallback, "", @@ -732,7 +737,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::DrawCallback) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::EventCallback) +BEGIN_OBJECT_REFLECTOR(osg::Drawable::EventCallback) I_VirtualBaseType(osg::Object); I_Constructor0(____EventCallback, "", @@ -773,7 +778,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::EventCallback) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, @@ -1093,7 +1098,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::Extensions) __void__setVertexProgramSupported__bool); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback) +BEGIN_OBJECT_REFLECTOR(osg::Drawable::UpdateCallback) I_VirtualBaseType(osg::Object); I_Constructor0(____UpdateCallback, "", diff --git a/src/osgWrappers/osg/Fog.cpp b/src/osgWrappers/osg/Fog.cpp index 21b1c6b19..d218f2561 100644 --- a/src/osgWrappers/osg/Fog.cpp +++ b/src/osgWrappers/osg/Fog.cpp @@ -36,7 +36,7 @@ BEGIN_ENUM_REFLECTOR(osg::Fog::FogCoordinateSource) I_EnumLabel(osg::Fog::FRAGMENT_DEPTH); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Fog) +BEGIN_OBJECT_REFLECTOR(osg::Fog) I_BaseType(osg::StateAttribute); I_Constructor0(____Fog, "", diff --git a/src/osgWrappers/osg/FragmentProgram.cpp b/src/osgWrappers/osg/FragmentProgram.cpp index e71bc78d5..661148db7 100644 --- a/src/osgWrappers/osg/FragmentProgram.cpp +++ b/src/osgWrappers/osg/FragmentProgram.cpp @@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::FragmentProgram::Local TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::FragmentProgram::MatrixList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FragmentProgram) +BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram) I_BaseType(osg::StateAttribute); I_Constructor0(____FragmentProgram, "", @@ -194,7 +194,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FragmentProgram) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::FragmentProgram::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/FrameBufferObject.cpp b/src/osgWrappers/osg/FrameBufferObject.cpp index ac8015e2a..4afa7f03e 100644 --- a/src/osgWrappers/osg/FrameBufferObject.cpp +++ b/src/osgWrappers/osg/FrameBufferObject.cpp @@ -56,7 +56,7 @@ TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglFramebufferRenderbufferEXT); TYPE_NAME_ALIAS(void , osg::FBOExtensions::TglGenerateMipmapEXT); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FBOExtensions) +BEGIN_OBJECT_REFLECTOR(osg::FBOExtensions) I_BaseType(osg::Referenced); I_Method0(bool, isSupported, Properties::NON_VIRTUAL, @@ -141,7 +141,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::FrameBufferAttachment >, osg::FrameBufferObject::AttachmentMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrameBufferObject) +BEGIN_OBJECT_REFLECTOR(osg::FrameBufferObject) I_BaseType(osg::StateAttribute); I_Constructor0(____FrameBufferObject, "", @@ -230,7 +230,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrameBufferObject) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::RenderBuffer) +BEGIN_OBJECT_REFLECTOR(osg::RenderBuffer) I_BaseType(osg::Object); I_Constructor0(____RenderBuffer, "", diff --git a/src/osgWrappers/osg/FrameStamp.cpp b/src/osgWrappers/osg/FrameStamp.cpp index 45ba66262..3658288a4 100644 --- a/src/osgWrappers/osg/FrameStamp.cpp +++ b/src/osgWrappers/osg/FrameStamp.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrameStamp) +BEGIN_OBJECT_REFLECTOR(osg::FrameStamp) I_BaseType(osg::Referenced); I_Constructor0(____FrameStamp, "", diff --git a/src/osgWrappers/osg/FrontFace.cpp b/src/osgWrappers/osg/FrontFace.cpp index 6e7bac448..3b71d06d5 100644 --- a/src/osgWrappers/osg/FrontFace.cpp +++ b/src/osgWrappers/osg/FrontFace.cpp @@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::FrontFace::Mode) I_EnumLabel(osg::FrontFace::COUNTER_CLOCKWISE); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::FrontFace) +BEGIN_OBJECT_REFLECTOR(osg::FrontFace) I_BaseType(osg::StateAttribute); I_ConstructorWithDefaults1(IN, osg::FrontFace::Mode, face, osg::FrontFace::COUNTER_CLOCKWISE, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/GL2Extensions.cpp b/src/osgWrappers/osg/GL2Extensions.cpp index ed80b97c2..6d9dbf273 100644 --- a/src/osgWrappers/osg/GL2Extensions.cpp +++ b/src/osgWrappers/osg/GL2Extensions.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GL2Extensions) +BEGIN_OBJECT_REFLECTOR(osg::GL2Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 09c6f023a..09535d4a8 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Drawable > >, osg::Geode::DrawableList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Geode) +BEGIN_OBJECT_REFLECTOR(osg::Geode) I_BaseType(osg::Node); I_Constructor0(____Geode, "", diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index 9ce732de7..a9f10c174 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -38,7 +38,7 @@ BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding) I_EnumLabel(osg::Geometry::BIND_PER_VERTEX); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Geometry) +BEGIN_OBJECT_REFLECTOR(osg::Geometry) I_BaseType(osg::Drawable); I_Constructor0(____Geometry, "", diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp index 60c26ee14..29f82e5bf 100644 --- a/src/osgWrappers/osg/GraphicsContext.cpp +++ b/src/osgWrappers/osg/GraphicsContext.cpp @@ -360,7 +360,7 @@ BEGIN_VALUE_REFLECTOR(osg::GraphicsContext::ScreenIdentifier) I_PublicMemberProperty(unsigned int, screenNum); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) +BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits) I_BaseType(osg::Referenced); I_BaseType(osg::GraphicsContext::ScreenIdentifier); I_Constructor0(____Traits, diff --git a/src/osgWrappers/osg/GraphicsThread.cpp b/src/osgWrappers/osg/GraphicsThread.cpp index e7aa3da30..bde26bcdf 100644 --- a/src/osgWrappers/osg/GraphicsThread.cpp +++ b/src/osgWrappers/osg/GraphicsThread.cpp @@ -27,7 +27,7 @@ BEGIN_ENUM_REFLECTOR(osg::BarrierOperation::PreBlockOp) I_EnumLabel(osg::BarrierOperation::GL_FINISH); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BarrierOperation) +BEGIN_OBJECT_REFLECTOR(osg::BarrierOperation) I_BaseType(osg::Operation); I_ConstructorWithDefaults2(IN, int, numThreads, , IN, osg::BarrierOperation::PreBlockOp, op, osg::BarrierOperation::NO_OPERATION, ____BarrierOperation__int__PreBlockOp, @@ -41,7 +41,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::BarrierOperation) I_PublicMemberProperty(osg::BarrierOperation::PreBlockOp, _preBlockOp); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Block) +BEGIN_OBJECT_REFLECTOR(osg::Block) I_VirtualBaseType(osg::Referenced); I_Constructor0(____Block, "", @@ -109,7 +109,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Operation) I_PublicMemberProperty(bool, _keep); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::OperationsThread) +BEGIN_OBJECT_REFLECTOR(osg::OperationsThread) I_BaseType(osg::Referenced); I_Constructor0(____OperationsThread, "", @@ -185,7 +185,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::OperationsThread) __void__setParent__Object_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) +BEGIN_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) I_BaseType(osg::Operation); I_BaseType(osg::Block); I_Constructor0(____ReleaseContext_Block_MakeCurrentOperation, @@ -198,7 +198,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::SwapBuffersOperation) +BEGIN_OBJECT_REFLECTOR(osg::SwapBuffersOperation) I_BaseType(osg::Operation); I_Constructor0(____SwapBuffersOperation, "", diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index daac71258..3a46b2311 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Group) +BEGIN_OBJECT_REFLECTOR(osg::Group) I_BaseType(osg::Node); I_Constructor0(____Group, "", diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 14ef02a36..23b725973 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -31,7 +31,7 @@ BEGIN_ENUM_REFLECTOR(osg::Image::AllocationMode) I_EnumLabel(osg::Image::USE_MALLOC_FREE); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Image) +BEGIN_OBJECT_REFLECTOR(osg::Image) I_BaseType(osg::Object); I_Constructor0(____Image, "", diff --git a/src/osgWrappers/osg/ImageStream.cpp b/src/osgWrappers/osg/ImageStream.cpp index 253b13711..9782e5497 100644 --- a/src/osgWrappers/osg/ImageStream.cpp +++ b/src/osgWrappers/osg/ImageStream.cpp @@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::ImageStream::LoopingMode) I_EnumLabel(osg::ImageStream::LOOPING); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ImageStream) +BEGIN_OBJECT_REFLECTOR(osg::ImageStream) I_BaseType(osg::Image); I_Constructor0(____ImageStream, "", diff --git a/src/osgWrappers/osg/LOD.cpp b/src/osgWrappers/osg/LOD.cpp index d491a2d7b..e8bd0fa20 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -40,7 +40,7 @@ BEGIN_ENUM_REFLECTOR(osg::LOD::RangeMode) I_EnumLabel(osg::LOD::PIXEL_SIZE_ON_SCREEN); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LOD) +BEGIN_OBJECT_REFLECTOR(osg::LOD) I_BaseType(osg::Group); I_Constructor0(____LOD, "", diff --git a/src/osgWrappers/osg/Light.cpp b/src/osgWrappers/osg/Light.cpp index 1fae263df..1263c79dc 100644 --- a/src/osgWrappers/osg/Light.cpp +++ b/src/osgWrappers/osg/Light.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Light) +BEGIN_OBJECT_REFLECTOR(osg::Light) I_BaseType(osg::StateAttribute); I_Constructor0(____Light, "", diff --git a/src/osgWrappers/osg/LightModel.cpp b/src/osgWrappers/osg/LightModel.cpp index a9660ea49..8d015ab47 100644 --- a/src/osgWrappers/osg/LightModel.cpp +++ b/src/osgWrappers/osg/LightModel.cpp @@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osg::LightModel::ColorControl) I_EnumLabel(osg::LightModel::SINGLE_COLOR); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LightModel) +BEGIN_OBJECT_REFLECTOR(osg::LightModel) I_BaseType(osg::StateAttribute); I_Constructor0(____LightModel, "", diff --git a/src/osgWrappers/osg/LightSource.cpp b/src/osgWrappers/osg/LightSource.cpp index f449a7e6f..46343430b 100644 --- a/src/osgWrappers/osg/LightSource.cpp +++ b/src/osgWrappers/osg/LightSource.cpp @@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osg::LightSource::ReferenceFrame) I_EnumLabel(osg::LightSource::ABSOLUTE_RF); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LightSource) +BEGIN_OBJECT_REFLECTOR(osg::LightSource) I_BaseType(osg::Group); I_Constructor0(____LightSource, "", diff --git a/src/osgWrappers/osg/LineSegment.cpp b/src/osgWrappers/osg/LineSegment.cpp index 8a680656a..63fc60745 100644 --- a/src/osgWrappers/osg/LineSegment.cpp +++ b/src/osgWrappers/osg/LineSegment.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LineSegment) +BEGIN_OBJECT_REFLECTOR(osg::LineSegment) I_BaseType(osg::Referenced); I_Constructor0(____LineSegment, "", diff --git a/src/osgWrappers/osg/LineStipple.cpp b/src/osgWrappers/osg/LineStipple.cpp index 7298bb614..3bd6c7bd7 100644 --- a/src/osgWrappers/osg/LineStipple.cpp +++ b/src/osgWrappers/osg/LineStipple.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LineStipple) +BEGIN_OBJECT_REFLECTOR(osg::LineStipple) I_BaseType(osg::StateAttribute); I_Constructor0(____LineStipple, "", diff --git a/src/osgWrappers/osg/LineWidth.cpp b/src/osgWrappers/osg/LineWidth.cpp index 5527a13d7..618781e9f 100644 --- a/src/osgWrappers/osg/LineWidth.cpp +++ b/src/osgWrappers/osg/LineWidth.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LineWidth) +BEGIN_OBJECT_REFLECTOR(osg::LineWidth) I_BaseType(osg::StateAttribute); I_ConstructorWithDefaults1(IN, float, width, 1.0f, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/LogicOp.cpp b/src/osgWrappers/osg/LogicOp.cpp index 4b2ab8176..cd9dc237b 100644 --- a/src/osgWrappers/osg/LogicOp.cpp +++ b/src/osgWrappers/osg/LogicOp.cpp @@ -43,7 +43,7 @@ BEGIN_ENUM_REFLECTOR(osg::LogicOp::Opcode) I_EnumLabel(osg::LogicOp::OR_INVERTED); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::LogicOp) +BEGIN_OBJECT_REFLECTOR(osg::LogicOp) I_BaseType(osg::StateAttribute); I_Constructor0(____LogicOp, "", diff --git a/src/osgWrappers/osg/Material.cpp b/src/osgWrappers/osg/Material.cpp index 0a4e7f954..3af6695e8 100644 --- a/src/osgWrappers/osg/Material.cpp +++ b/src/osgWrappers/osg/Material.cpp @@ -40,7 +40,7 @@ BEGIN_ENUM_REFLECTOR(osg::Material::ColorMode) I_EnumLabel(osg::Material::OFF); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Material) +BEGIN_OBJECT_REFLECTOR(osg::Material) I_BaseType(osg::StateAttribute); I_Constructor0(____Material, "", diff --git a/src/osgWrappers/osg/MatrixTransform.cpp b/src/osgWrappers/osg/MatrixTransform.cpp index 862da3135..39c395c1b 100644 --- a/src/osgWrappers/osg/MatrixTransform.cpp +++ b/src/osgWrappers/osg/MatrixTransform.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::MatrixTransform) +BEGIN_OBJECT_REFLECTOR(osg::MatrixTransform) I_BaseType(osg::Transform); I_Constructor0(____MatrixTransform, "", diff --git a/src/osgWrappers/osg/Matrixd.cpp b/src/osgWrappers/osg/Matrixd.cpp index 043a956ae..f7663c634 100644 --- a/src/osgWrappers/osg/Matrixd.cpp +++ b/src/osgWrappers/osg/Matrixd.cpp @@ -492,7 +492,7 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixd) __void__setTrans__C5_Vec3d_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::RefMatrixd) +BEGIN_OBJECT_REFLECTOR(osg::RefMatrixd) I_BaseType(osg::Object); I_BaseType(osg::Matrixd); I_Constructor0(____RefMatrixd, diff --git a/src/osgWrappers/osg/Matrixf.cpp b/src/osgWrappers/osg/Matrixf.cpp index 224f9ed92..543b15c13 100644 --- a/src/osgWrappers/osg/Matrixf.cpp +++ b/src/osgWrappers/osg/Matrixf.cpp @@ -492,7 +492,7 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixf) __void__setTrans__C5_Vec3d_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::RefMatrixf) +BEGIN_OBJECT_REFLECTOR(osg::RefMatrixf) I_BaseType(osg::Object); I_BaseType(osg::Matrixf); I_Constructor0(____RefMatrixf, diff --git a/src/osgWrappers/osg/Multisample.cpp b/src/osgWrappers/osg/Multisample.cpp index b5d631e30..8c6236b7b 100644 --- a/src/osgWrappers/osg/Multisample.cpp +++ b/src/osgWrappers/osg/Multisample.cpp @@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osg::Multisample::Mode) I_EnumLabel(osg::Multisample::DONT_CARE); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Multisample) +BEGIN_OBJECT_REFLECTOR(osg::Multisample) I_BaseType(osg::StateAttribute); I_Constructor0(____Multisample, "", @@ -136,7 +136,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Multisample) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Multisample::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::Multisample::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 3a2ea8076..ab8dd79ee 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -35,7 +35,7 @@ TYPE_NAME_ALIAS(unsigned int, osg::Node::NodeMask); TYPE_NAME_ALIAS(std::vector< std::string >, osg::Node::DescriptionList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Node) +BEGIN_OBJECT_REFLECTOR(osg::Node) I_BaseType(osg::Object); I_Constructor0(____Node, "Construct a node. ", @@ -396,7 +396,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Node) __void__setUpdateCallback__NodeCallback_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) +BEGIN_OBJECT_REFLECTOR(osg::Node::ComputeBoundingSphereCallback) I_BaseType(osg::Object); I_Constructor0(____ComputeBoundingSphereCallback, "", diff --git a/src/osgWrappers/osg/NodeCallback.cpp b/src/osgWrappers/osg/NodeCallback.cpp index a5939c6b3..8bc5985b9 100644 --- a/src/osgWrappers/osg/NodeCallback.cpp +++ b/src/osgWrappers/osg/NodeCallback.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeCallback) +BEGIN_OBJECT_REFLECTOR(osg::NodeCallback) I_VirtualBaseType(osg::Object); I_Constructor0(____NodeCallback, "", diff --git a/src/osgWrappers/osg/NodeTrackerCallback.cpp b/src/osgWrappers/osg/NodeTrackerCallback.cpp index 15d7e79b9..d18ff7ae1 100644 --- a/src/osgWrappers/osg/NodeTrackerCallback.cpp +++ b/src/osgWrappers/osg/NodeTrackerCallback.cpp @@ -24,7 +24,7 @@ TYPE_NAME_ALIAS(std::vector< osg::observer_ptr< osg::Node > >, osg::NodeTrackerCallback::ObserveredNodePath); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeTrackerCallback) +BEGIN_OBJECT_REFLECTOR(osg::NodeTrackerCallback) I_BaseType(osg::NodeCallback); I_Constructor0(____NodeTrackerCallback, "", @@ -77,7 +77,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeTrackerCallback) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >) +BEGIN_OBJECT_REFLECTOR(osg::observer_ptr< osg::Node >) I_BaseType(osg::Observer); I_Constructor0(____observer_ptr, "", diff --git a/src/osgWrappers/osg/NodeVisitor.cpp b/src/osgWrappers/osg/NodeVisitor.cpp index 099577dbf..68087da5c 100644 --- a/src/osgWrappers/osg/NodeVisitor.cpp +++ b/src/osgWrappers/osg/NodeVisitor.cpp @@ -67,7 +67,7 @@ BEGIN_ENUM_REFLECTOR(osg::NodeVisitor::VisitorType) I_EnumLabel(osg::NodeVisitor::CULL_VISITOR); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::NodeVisitor) +BEGIN_OBJECT_REFLECTOR(osg::NodeVisitor) I_VirtualBaseType(osg::Referenced); I_ConstructorWithDefaults1(IN, osg::NodeVisitor::TraversalMode, tm, osg::NodeVisitor::TRAVERSE_NONE, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Object.cpp b/src/osgWrappers/osg/Object.cpp index 4ca76a3d8..099cf0b02 100644 --- a/src/osgWrappers/osg/Object.cpp +++ b/src/osgWrappers/osg/Object.cpp @@ -92,6 +92,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object) __DataVariance__getDataVariance, "Get the data variance of this object. ", ""); + I_Method0(void, computeDataVariance, + Properties::VIRTUAL, + __void__computeDataVariance, + "Compute the DataVariance based on an assestment of callback etc. ", + ""); I_Method1(void, setUserData, IN, osg::Referenced *, obj, Properties::NON_VIRTUAL, __void__setUserData__Referenced_P1, diff --git a/src/osgWrappers/osg/OccluderNode.cpp b/src/osgWrappers/osg/OccluderNode.cpp index 7e35b1e3f..85508bd58 100644 --- a/src/osgWrappers/osg/OccluderNode.cpp +++ b/src/osgWrappers/osg/OccluderNode.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::OccluderNode) +BEGIN_OBJECT_REFLECTOR(osg::OccluderNode) I_BaseType(osg::Group); I_Constructor0(____OccluderNode, "", diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index 982a8b527..2f1432f8a 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -27,7 +27,7 @@ TYPE_NAME_ALIAS(std::vector< osg::PagedLOD::PerRangeData >, osg::PagedLOD::PerRangeDataList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PagedLOD) +BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) I_BaseType(osg::LOD); I_Constructor0(____PagedLOD, "", diff --git a/src/osgWrappers/osg/Point.cpp b/src/osgWrappers/osg/Point.cpp index 1fae9c086..0b0c8af79 100644 --- a/src/osgWrappers/osg/Point.cpp +++ b/src/osgWrappers/osg/Point.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Point) +BEGIN_OBJECT_REFLECTOR(osg::Point) I_BaseType(osg::StateAttribute); I_Constructor0(____Point, "", @@ -157,7 +157,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Point) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Point::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::Point::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/PointSprite.cpp b/src/osgWrappers/osg/PointSprite.cpp index d7e29ac0a..542e308f6 100644 --- a/src/osgWrappers/osg/PointSprite.cpp +++ b/src/osgWrappers/osg/PointSprite.cpp @@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::PointSprite::CoordOriginMode) I_EnumLabel(osg::PointSprite::LOWER_LEFT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PointSprite) +BEGIN_OBJECT_REFLECTOR(osg::PointSprite) I_BaseType(osg::StateAttribute); I_Constructor0(____PointSprite, "", diff --git a/src/osgWrappers/osg/PolygonMode.cpp b/src/osgWrappers/osg/PolygonMode.cpp index f6e7a7b62..090f6345b 100644 --- a/src/osgWrappers/osg/PolygonMode.cpp +++ b/src/osgWrappers/osg/PolygonMode.cpp @@ -36,7 +36,7 @@ BEGIN_ENUM_REFLECTOR(osg::PolygonMode::Face) I_EnumLabel(osg::PolygonMode::BACK); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PolygonMode) +BEGIN_OBJECT_REFLECTOR(osg::PolygonMode) I_BaseType(osg::StateAttribute); I_Constructor0(____PolygonMode, "", diff --git a/src/osgWrappers/osg/PolygonOffset.cpp b/src/osgWrappers/osg/PolygonOffset.cpp index 9dcf930ca..ca26a81cf 100644 --- a/src/osgWrappers/osg/PolygonOffset.cpp +++ b/src/osgWrappers/osg/PolygonOffset.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PolygonOffset) +BEGIN_OBJECT_REFLECTOR(osg::PolygonOffset) I_BaseType(osg::StateAttribute); I_Constructor0(____PolygonOffset, "", diff --git a/src/osgWrappers/osg/PolygonStipple.cpp b/src/osgWrappers/osg/PolygonStipple.cpp index fadb8e510..ee35a1f0f 100644 --- a/src/osgWrappers/osg/PolygonStipple.cpp +++ b/src/osgWrappers/osg/PolygonStipple.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PolygonStipple) +BEGIN_OBJECT_REFLECTOR(osg::PolygonStipple) I_BaseType(osg::StateAttribute); I_Constructor0(____PolygonStipple, "", diff --git a/src/osgWrappers/osg/PositionAttitudeTransform.cpp b/src/osgWrappers/osg/PositionAttitudeTransform.cpp index 360403918..74d5a3524 100644 --- a/src/osgWrappers/osg/PositionAttitudeTransform.cpp +++ b/src/osgWrappers/osg/PositionAttitudeTransform.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PositionAttitudeTransform) +BEGIN_OBJECT_REFLECTOR(osg::PositionAttitudeTransform) I_BaseType(osg::Transform); I_Constructor0(____PositionAttitudeTransform, "", diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index 361c47c58..e5a2aaf8f 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -28,7 +28,7 @@ TYPE_NAME_ALIAS(osg::VectorGLsizei, osg::DrawArrayLengths::vector_type); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawArrayLengths) +BEGIN_OBJECT_REFLECTOR(osg::DrawArrayLengths) I_BaseType(osg::PrimitiveSet); I_BaseType(osg::VectorGLsizei); I_ConstructorWithDefaults1(IN, GLenum, mode, 0, @@ -127,7 +127,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawArrayLengths) __void__setFirst__GLint); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawArrays) +BEGIN_OBJECT_REFLECTOR(osg::DrawArrays) I_BaseType(osg::PrimitiveSet); I_ConstructorWithDefaults1(IN, GLenum, mode, 0, Properties::NON_EXPLICIT, @@ -232,7 +232,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(osg::VectorGLubyte, osg::DrawElementsUByte::vector_type); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElementsUByte) +BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUByte) I_BaseType(osg::PrimitiveSet); I_BaseType(osg::VectorGLubyte); I_ConstructorWithDefaults1(IN, GLenum, mode, 0, @@ -347,7 +347,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(osg::VectorGLuint, osg::DrawElementsUInt::vector_type); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElementsUInt) +BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUInt) I_BaseType(osg::PrimitiveSet); I_BaseType(osg::VectorGLuint); I_ConstructorWithDefaults1(IN, GLenum, mode, 0, @@ -462,7 +462,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(osg::VectorGLushort, osg::DrawElementsUShort::vector_type); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElementsUShort) +BEGIN_OBJECT_REFLECTOR(osg::DrawElementsUShort) I_BaseType(osg::PrimitiveSet); I_BaseType(osg::VectorGLushort); I_ConstructorWithDefaults1(IN, GLenum, mode, 0, diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index a3e25d90b..9b2dfb0b2 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindi TYPE_NAME_ALIAS(std::map< std::string COMMA osg::Program::ActiveVarInfo >, osg::Program::ActiveVarInfoMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Program) +BEGIN_OBJECT_REFLECTOR(osg::Program) I_BaseType(osg::StateAttribute); I_Constructor0(____Program, "", @@ -208,7 +208,7 @@ BEGIN_VALUE_REFLECTOR(osg::Program::ActiveVarInfo) I_PublicMemberProperty(GLint, _size); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Program::PerContextProgram) +BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram) I_BaseType(osg::Referenced); I_Constructor2(IN, const osg::Program *, program, IN, unsigned int, contextID, ____PerContextProgram__C5_Program_P1__unsigned_int, diff --git a/src/osgWrappers/osg/Projection.cpp b/src/osgWrappers/osg/Projection.cpp index 74e0f3d97..6e7c146c7 100644 --- a/src/osgWrappers/osg/Projection.cpp +++ b/src/osgWrappers/osg/Projection.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Projection) +BEGIN_OBJECT_REFLECTOR(osg::Projection) I_BaseType(osg::Group); I_Constructor0(____Projection, "", diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index 1f5ecc00d..175dcb21f 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -33,7 +33,7 @@ BEGIN_ENUM_REFLECTOR(osg::ProxyNode::CenterMode) I_EnumLabel(osg::ProxyNode::USER_DEFINED_CENTER); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ProxyNode) +BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) I_BaseType(osg::Group); I_Constructor0(____ProxyNode, "", diff --git a/src/osgWrappers/osg/Referenced.cpp b/src/osgWrappers/osg/Referenced.cpp index 17bc16a58..c5732d229 100644 --- a/src/osgWrappers/osg/Referenced.cpp +++ b/src/osgWrappers/osg/Referenced.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Referenced) +BEGIN_OBJECT_REFLECTOR(osg::Referenced) I_Constructor0(____Referenced, "", ""); diff --git a/src/osgWrappers/osg/Scissor.cpp b/src/osgWrappers/osg/Scissor.cpp index 47230c11a..914d98d6a 100644 --- a/src/osgWrappers/osg/Scissor.cpp +++ b/src/osgWrappers/osg/Scissor.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Scissor) +BEGIN_OBJECT_REFLECTOR(osg::Scissor) I_BaseType(osg::StateAttribute); I_Constructor0(____Scissor, "", diff --git a/src/osgWrappers/osg/Sequence.cpp b/src/osgWrappers/osg/Sequence.cpp index 2afb6529e..55cecbdee 100644 --- a/src/osgWrappers/osg/Sequence.cpp +++ b/src/osgWrappers/osg/Sequence.cpp @@ -35,7 +35,7 @@ BEGIN_ENUM_REFLECTOR(osg::Sequence::SequenceMode) I_EnumLabel(osg::Sequence::RESUME); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Sequence) +BEGIN_OBJECT_REFLECTOR(osg::Sequence) I_BaseType(osg::Group); I_Constructor0(____Sequence, "", diff --git a/src/osgWrappers/osg/ShadeModel.cpp b/src/osgWrappers/osg/ShadeModel.cpp index 9d9f228ff..e3bdd8d73 100644 --- a/src/osgWrappers/osg/ShadeModel.cpp +++ b/src/osgWrappers/osg/ShadeModel.cpp @@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::ShadeModel::Mode) I_EnumLabel(osg::ShadeModel::SMOOTH); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShadeModel) +BEGIN_OBJECT_REFLECTOR(osg::ShadeModel) I_BaseType(osg::StateAttribute); I_Constructor0(____ShadeModel, "", diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp index fbaac60a0..dd00cf34e 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::Shader::Type) I_EnumLabel(osg::Shader::UNDEFINED); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Shader) +BEGIN_OBJECT_REFLECTOR(osg::Shader) I_BaseType(osg::Object); I_ConstructorWithDefaults1(IN, osg::Shader::Type, type, osg::Shader::UNDEFINED, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index e53246405..738f90bd4 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -27,7 +27,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Box) +BEGIN_OBJECT_REFLECTOR(osg::Box) I_BaseType(osg::Shape); I_Constructor0(____Box, "", @@ -140,7 +140,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Box) __void__setRotation__C5_Quat_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Capsule) +BEGIN_OBJECT_REFLECTOR(osg::Capsule) I_BaseType(osg::Shape); I_Constructor0(____Capsule, "", @@ -264,7 +264,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Shape > >, osg::CompositeShape::ChildList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CompositeShape) +BEGIN_OBJECT_REFLECTOR(osg::CompositeShape) I_BaseType(osg::Shape); I_Constructor0(____CompositeShape, "", @@ -365,7 +365,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::CompositeShape) __void__setShape__Shape_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Cone) +BEGIN_OBJECT_REFLECTOR(osg::Cone) I_BaseType(osg::Shape); I_Constructor0(____Cone, "", @@ -503,7 +503,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Cone) __void__setRotation__C5_Quat_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstShapeVisitor) +BEGIN_VALUE_REFLECTOR(osg::ConstShapeVisitor) I_Constructor0(____ConstShapeVisitor, "", ""); @@ -559,7 +559,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConstShapeVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConvexHull) +BEGIN_OBJECT_REFLECTOR(osg::ConvexHull) I_BaseType(osg::TriangleMesh); I_Constructor0(____ConvexHull, "", @@ -605,7 +605,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ConvexHull) "Must be defined by derived classes. "); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Cylinder) +BEGIN_OBJECT_REFLECTOR(osg::Cylinder) I_BaseType(osg::Shape); I_Constructor0(____Cylinder, "", @@ -729,7 +729,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::vector< float >, osg::HeightField::HeightList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::HeightField) +BEGIN_OBJECT_REFLECTOR(osg::HeightField) I_BaseType(osg::Shape); I_Constructor0(____HeightField, "", @@ -925,7 +925,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::HeightField) __void__setYInterval__float); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::InfinitePlane) +BEGIN_OBJECT_REFLECTOR(osg::InfinitePlane) I_BaseType(osg::Shape); I_BaseType(osg::Plane); I_Constructor0(____InfinitePlane, @@ -1018,7 +1018,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Shape) "Must be defined by derived classes. "); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShapeVisitor) +BEGIN_VALUE_REFLECTOR(osg::ShapeVisitor) I_Constructor0(____ShapeVisitor, "", ""); @@ -1074,7 +1074,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShapeVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Sphere) +BEGIN_OBJECT_REFLECTOR(osg::Sphere) I_BaseType(osg::Shape); I_Constructor0(____Sphere, "", @@ -1160,7 +1160,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Sphere) __void__setRadius__float); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TriangleMesh) +BEGIN_OBJECT_REFLECTOR(osg::TriangleMesh) I_BaseType(osg::Shape); I_Constructor0(____TriangleMesh, "", diff --git a/src/osgWrappers/osg/ShapeDrawable.cpp b/src/osgWrappers/osg/ShapeDrawable.cpp index b0f4b8c11..ccf9402d6 100644 --- a/src/osgWrappers/osg/ShapeDrawable.cpp +++ b/src/osgWrappers/osg/ShapeDrawable.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::ShapeDrawable) +BEGIN_OBJECT_REFLECTOR(osg::ShapeDrawable) I_BaseType(osg::Drawable); I_Constructor0(____ShapeDrawable, "", @@ -139,7 +139,7 @@ BEGIN_ENUM_REFLECTOR(osg::TessellationHints::TessellationMode) I_EnumLabel(osg::TessellationHints::USE_TARGET_NUM_FACES); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TessellationHints) +BEGIN_OBJECT_REFLECTOR(osg::TessellationHints) I_BaseType(osg::Object); I_Constructor0(____TessellationHints, "", diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index c4523a273..64e34c4fe 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -37,7 +37,7 @@ BEGIN_ENUM_REFLECTOR(osg::State::CheckForGLErrors) I_EnumLabel(osg::State::ONCE_PER_ATTRIBUTE); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::State) +BEGIN_OBJECT_REFLECTOR(osg::State) I_BaseType(osg::Referenced); I_Constructor0(____State, "", diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index 5ef8eb38d..d0f06a61c 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -259,7 +259,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) __void__setUpdateCallback__Callback_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute::Callback) +BEGIN_OBJECT_REFLECTOR(osg::StateAttribute::Callback) I_VirtualBaseType(osg::Object); I_Constructor0(____Callback, "", diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 027a179c3..2742a3de7 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -54,7 +54,7 @@ BEGIN_ENUM_REFLECTOR(osg::StateSet::RenderBinMode) I_EnumLabel(osg::StateSet::OVERRIDE_RENDERBIN_DETAILS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet) +BEGIN_OBJECT_REFLECTOR(osg::StateSet) I_BaseType(osg::Object); I_Constructor0(____StateSet, "", @@ -118,6 +118,11 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet) __unsigned_int__getNumParents, "Get the number of parents of this StateSet. ", "the number of parents of this StateSet. "); + I_Method0(void, computeDataVariance, + Properties::VIRTUAL, + __void__computeDataVariance, + "Compute the DataVariance based on an assestment of callback etc. ", + ""); I_Method0(void, setGlobalDefaults, Properties::NON_VIRTUAL, __void__setGlobalDefaults, @@ -546,7 +551,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet) __void__setUpdateCallback__Callback_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateSet::Callback) +BEGIN_OBJECT_REFLECTOR(osg::StateSet::Callback) I_VirtualBaseType(osg::Object); I_Constructor0(____Callback, "", diff --git a/src/osgWrappers/osg/Stats.cpp b/src/osgWrappers/osg/Stats.cpp index bb574843f..d25e294b2 100644 --- a/src/osgWrappers/osg/Stats.cpp +++ b/src/osgWrappers/osg/Stats.cpp @@ -26,7 +26,7 @@ TYPE_NAME_ALIAS(std::vector< osg::Stats::AttributeMap >, osg::Stats::AttributeMa TYPE_NAME_ALIAS(std::map< std::string COMMA bool >, osg::Stats::CollectMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Stats) +BEGIN_OBJECT_REFLECTOR(osg::Stats) I_BaseType(osg::Referenced); I_Constructor1(IN, const std::string &, name, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Stencil.cpp b/src/osgWrappers/osg/Stencil.cpp index 7400ebe04..4bf605e0e 100644 --- a/src/osgWrappers/osg/Stencil.cpp +++ b/src/osgWrappers/osg/Stencil.cpp @@ -46,7 +46,7 @@ BEGIN_ENUM_REFLECTOR(osg::Stencil::Operation) I_EnumLabel(osg::Stencil::DECR_WRAP); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Stencil) +BEGIN_OBJECT_REFLECTOR(osg::Stencil) I_BaseType(osg::StateAttribute); I_Constructor0(____Stencil, "", diff --git a/src/osgWrappers/osg/StencilTwoSided.cpp b/src/osgWrappers/osg/StencilTwoSided.cpp index 95b655ccc..b70ea5658 100644 --- a/src/osgWrappers/osg/StencilTwoSided.cpp +++ b/src/osgWrappers/osg/StencilTwoSided.cpp @@ -51,7 +51,7 @@ BEGIN_ENUM_REFLECTOR(osg::StencilTwoSided::Operation) I_EnumLabel(osg::StencilTwoSided::DECR_WRAP); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StencilTwoSided) +BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided) I_BaseType(osg::StateAttribute); I_Constructor0(____StencilTwoSided, "", @@ -226,7 +226,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StencilTwoSided) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StencilTwoSided::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::StencilTwoSided::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 2307a5a0e..0e2ffc6a1 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -27,7 +27,7 @@ TYPE_NAME_ALIAS(std::vector< bool >, osg::Switch::ValueList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Switch) +BEGIN_OBJECT_REFLECTOR(osg::Switch) I_BaseType(osg::Group); I_Constructor0(____Switch, "", diff --git a/src/osgWrappers/osg/TexEnv.cpp b/src/osgWrappers/osg/TexEnv.cpp index a06ed62ba..a815830a9 100644 --- a/src/osgWrappers/osg/TexEnv.cpp +++ b/src/osgWrappers/osg/TexEnv.cpp @@ -33,7 +33,7 @@ BEGIN_ENUM_REFLECTOR(osg::TexEnv::Mode) I_EnumLabel(osg::TexEnv::ADD); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexEnv) +BEGIN_OBJECT_REFLECTOR(osg::TexEnv) I_BaseType(osg::StateAttribute); I_ConstructorWithDefaults1(IN, osg::TexEnv::Mode, mode, osg::TexEnv::MODULATE, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/TexEnvCombine.cpp b/src/osgWrappers/osg/TexEnvCombine.cpp index 210d72bab..268f7f263 100644 --- a/src/osgWrappers/osg/TexEnvCombine.cpp +++ b/src/osgWrappers/osg/TexEnvCombine.cpp @@ -59,7 +59,7 @@ BEGIN_ENUM_REFLECTOR(osg::TexEnvCombine::OperandParam) I_EnumLabel(osg::TexEnvCombine::ONE_MINUS_SRC_ALPHA); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexEnvCombine) +BEGIN_OBJECT_REFLECTOR(osg::TexEnvCombine) I_BaseType(osg::StateAttribute); I_Constructor0(____TexEnvCombine, "", diff --git a/src/osgWrappers/osg/TexEnvFilter.cpp b/src/osgWrappers/osg/TexEnvFilter.cpp index 0d3e4782e..3c07d75ca 100644 --- a/src/osgWrappers/osg/TexEnvFilter.cpp +++ b/src/osgWrappers/osg/TexEnvFilter.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexEnvFilter) +BEGIN_OBJECT_REFLECTOR(osg::TexEnvFilter) I_BaseType(osg::StateAttribute); I_ConstructorWithDefaults1(IN, float, lodBias, 0.0f, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/TexGen.cpp b/src/osgWrappers/osg/TexGen.cpp index a933b859d..ed39a342c 100644 --- a/src/osgWrappers/osg/TexGen.cpp +++ b/src/osgWrappers/osg/TexGen.cpp @@ -41,7 +41,7 @@ BEGIN_ENUM_REFLECTOR(osg::TexGen::Coord) I_EnumLabel(osg::TexGen::Q); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexGen) +BEGIN_OBJECT_REFLECTOR(osg::TexGen) I_BaseType(osg::StateAttribute); I_Constructor0(____TexGen, "", diff --git a/src/osgWrappers/osg/TexGenNode.cpp b/src/osgWrappers/osg/TexGenNode.cpp index ba4792807..71c1093d9 100644 --- a/src/osgWrappers/osg/TexGenNode.cpp +++ b/src/osgWrappers/osg/TexGenNode.cpp @@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osg::TexGenNode::ReferenceFrame) I_EnumLabel(osg::TexGenNode::ABSOLUTE_RF); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexGenNode) +BEGIN_OBJECT_REFLECTOR(osg::TexGenNode) I_BaseType(osg::Group); I_Constructor0(____TexGenNode, "", diff --git a/src/osgWrappers/osg/TexMat.cpp b/src/osgWrappers/osg/TexMat.cpp index 300163acb..014efe6d0 100644 --- a/src/osgWrappers/osg/TexMat.cpp +++ b/src/osgWrappers/osg/TexMat.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TexMat) +BEGIN_OBJECT_REFLECTOR(osg::TexMat) I_BaseType(osg::StateAttribute); I_Constructor0(____TexMat, "", diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp index 60773cf70..9683f1494 100644 --- a/src/osgWrappers/osg/Texture.cpp +++ b/src/osgWrappers/osg/Texture.cpp @@ -533,7 +533,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::Texture::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, @@ -767,7 +767,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture::Extensions) __void__setTextureMirroredRepeatSupported__bool); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture::TextureObject) +BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObject) I_BaseType(osg::Referenced); I_Constructor2(IN, GLuint, id, IN, GLenum, target, ____TextureObject__GLuint__GLenum, diff --git a/src/osgWrappers/osg/Texture3D.cpp b/src/osgWrappers/osg/Texture3D.cpp index a912ecdef..bc8a7bf24 100644 --- a/src/osgWrappers/osg/Texture3D.cpp +++ b/src/osgWrappers/osg/Texture3D.cpp @@ -223,7 +223,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture3D) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture3D::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::Texture3D::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/TextureCubeMap.cpp b/src/osgWrappers/osg/TextureCubeMap.cpp index a9a7d84bd..b717ddd15 100644 --- a/src/osgWrappers/osg/TextureCubeMap.cpp +++ b/src/osgWrappers/osg/TextureCubeMap.cpp @@ -34,7 +34,7 @@ BEGIN_ENUM_REFLECTOR(osg::TextureCubeMap::Face) I_EnumLabel(osg::TextureCubeMap::NEGATIVE_Z); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureCubeMap) +BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap) I_BaseType(osg::Texture); I_Constructor0(____TextureCubeMap, "", @@ -211,7 +211,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureCubeMap) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::TextureCubeMap::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::TextureCubeMap::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/Transform.cpp b/src/osgWrappers/osg/Transform.cpp index 02c862026..b1b1129fc 100644 --- a/src/osgWrappers/osg/Transform.cpp +++ b/src/osgWrappers/osg/Transform.cpp @@ -33,7 +33,7 @@ BEGIN_ENUM_REFLECTOR(osg::Transform::ReferenceFrame) I_EnumLabel(osg::Transform::ABSOLUTE_RF_INHERIT_VIEWPOINT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Transform) +BEGIN_OBJECT_REFLECTOR(osg::Transform) I_BaseType(osg::Group); I_Constructor0(____Transform, "", diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index 2f6a8adb9..7424c7055 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -148,7 +148,7 @@ BEGIN_ENUM_REFLECTOR(osg::Uniform::Type) I_EnumLabel(osg::Uniform::UNDEFINED); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Uniform) +BEGIN_OBJECT_REFLECTOR(osg::Uniform) I_BaseType(osg::Object); I_Constructor0(____Uniform, "", @@ -789,7 +789,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Uniform) __void__setUpdateCallback__Callback_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Uniform::Callback) +BEGIN_OBJECT_REFLECTOR(osg::Uniform::Callback) I_VirtualBaseType(osg::Object); I_Constructor0(____Callback, "", diff --git a/src/osgWrappers/osg/VertexProgram.cpp b/src/osgWrappers/osg/VertexProgram.cpp index 0c5f0b2a7..8ea8272cf 100644 --- a/src/osgWrappers/osg/VertexProgram.cpp +++ b/src/osgWrappers/osg/VertexProgram.cpp @@ -30,7 +30,7 @@ TYPE_NAME_ALIAS(std::map< GLuint COMMA osg::Vec4 >, osg::VertexProgram::LocalPa TYPE_NAME_ALIAS(std::map< GLenum COMMA osg::Matrix >, osg::VertexProgram::MatrixList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::VertexProgram) +BEGIN_OBJECT_REFLECTOR(osg::VertexProgram) I_BaseType(osg::StateAttribute); I_Constructor0(____VertexProgram, "", @@ -194,7 +194,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::VertexProgram) __void__setVertexProgram__C5_std_string_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::VertexProgram::Extensions) +BEGIN_OBJECT_REFLECTOR(osg::VertexProgram::Extensions) I_BaseType(osg::Referenced); I_Constructor1(IN, unsigned int, contextID, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osg/View.cpp b/src/osgWrappers/osg/View.cpp index 96c1ba9f6..5f49a9840 100644 --- a/src/osgWrappers/osg/View.cpp +++ b/src/osgWrappers/osg/View.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::View) +BEGIN_OBJECT_REFLECTOR(osg::View) I_VirtualBaseType(osg::Referenced); I_Constructor0(____View, "", diff --git a/src/osgWrappers/osg/Viewport.cpp b/src/osgWrappers/osg/Viewport.cpp index 77e9a7763..0c4f6a108 100644 --- a/src/osgWrappers/osg/Viewport.cpp +++ b/src/osgWrappers/osg/Viewport.cpp @@ -27,7 +27,7 @@ TYPE_NAME_ALIAS(double, osg::Viewport::value_type); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Viewport) +BEGIN_OBJECT_REFLECTOR(osg::Viewport) I_BaseType(osg::StateAttribute); I_Constructor0(____Viewport, "", diff --git a/src/osgWrappers/osg/observer_ptr.cpp b/src/osgWrappers/osg/observer_ptr.cpp index 8f1165165..7b829626b 100644 --- a/src/osgWrappers/osg/observer_ptr.cpp +++ b/src/osgWrappers/osg/observer_ptr.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Observer) +BEGIN_VALUE_REFLECTOR(osg::Observer) I_Constructor0(____Observer, "", ""); diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 483eb3090..e935c4ec1 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -48,7 +48,7 @@ BEGIN_ENUM_REFLECTOR(osgDB::DatabasePager::DrawablePolicy) I_EnumLabel(osgDB::DatabasePager::USE_VERTEX_ARRAYS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::DatabasePager) +BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) I_BaseType(osg::NodeVisitor::DatabaseRequestHandler); I_Constructor0(____DatabasePager, "", diff --git a/src/osgWrappers/osgDB/DotOsgWrapper.cpp b/src/osgWrappers/osgDB/DotOsgWrapper.cpp index 2eb3b5a38..4d310c605 100644 --- a/src/osgWrappers/osgDB/DotOsgWrapper.cpp +++ b/src/osgWrappers/osgDB/DotOsgWrapper.cpp @@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osgDB::DotOsgWrapper::ReadWriteMode) I_EnumLabel(osgDB::DotOsgWrapper::READ_ONLY); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::DotOsgWrapper) +BEGIN_OBJECT_REFLECTOR(osgDB::DotOsgWrapper) I_BaseType(osg::Referenced); I_ConstructorWithDefaults6(IN, osg::Object *, proto, , IN, const std::string &, name, , IN, const std::string &, associates, , IN, osgDB::DotOsgWrapper::ReadFunc, readFunc, , IN, osgDB::DotOsgWrapper::WriteFunc, writeFunc, , IN, osgDB::DotOsgWrapper::ReadWriteMode, readWriteMode, osgDB::DotOsgWrapper::READ_AND_WRITE, ____DotOsgWrapper__osg_Object_P1__C5_std_string_R1__C5_std_string_R1__ReadFunc__WriteFunc__ReadWriteMode, diff --git a/src/osgWrappers/osgDB/DynamicLibrary.cpp b/src/osgWrappers/osgDB/DynamicLibrary.cpp index bd26d15f9..98e7ace6f 100644 --- a/src/osgWrappers/osgDB/DynamicLibrary.cpp +++ b/src/osgWrappers/osgDB/DynamicLibrary.cpp @@ -24,7 +24,7 @@ TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::HANDLE); TYPE_NAME_ALIAS(void *, osgDB::DynamicLibrary::PROC_ADDRESS); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::DynamicLibrary) +BEGIN_OBJECT_REFLECTOR(osgDB::DynamicLibrary) I_BaseType(osg::Referenced); I_Method0(const std::string &, getName, Properties::NON_VIRTUAL, diff --git a/src/osgWrappers/osgDB/Field.cpp b/src/osgWrappers/osgDB/Field.cpp index 67c6c00a7..893e6e3de 100644 --- a/src/osgWrappers/osgDB/Field.cpp +++ b/src/osgWrappers/osgDB/Field.cpp @@ -31,7 +31,7 @@ BEGIN_ENUM_REFLECTOR(osgDB::Field::FieldType) I_EnumLabel(osgDB::Field::UNINITIALISED); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Field) +BEGIN_VALUE_REFLECTOR(osgDB::Field) I_Constructor0(____Field, "", ""); diff --git a/src/osgWrappers/osgDB/FieldReader.cpp b/src/osgWrappers/osgDB/FieldReader.cpp index a95e3c697..07458edd3 100644 --- a/src/osgWrappers/osgDB/FieldReader.cpp +++ b/src/osgWrappers/osgDB/FieldReader.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::FieldReader) +BEGIN_VALUE_REFLECTOR(osgDB::FieldReader) I_Constructor0(____FieldReader, "", ""); diff --git a/src/osgWrappers/osgDB/FieldReaderIterator.cpp b/src/osgWrappers/osgDB/FieldReaderIterator.cpp index 9f4696796..e3bcb1a5b 100644 --- a/src/osgWrappers/osgDB/FieldReaderIterator.cpp +++ b/src/osgWrappers/osgDB/FieldReaderIterator.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::FieldReaderIterator) +BEGIN_VALUE_REFLECTOR(osgDB::FieldReaderIterator) I_Constructor0(____FieldReaderIterator, "", ""); diff --git a/src/osgWrappers/osgDB/ImageOptions.cpp b/src/osgWrappers/osgDB/ImageOptions.cpp index a4c1b2457..029e6e84c 100644 --- a/src/osgWrappers/osgDB/ImageOptions.cpp +++ b/src/osgWrappers/osgDB/ImageOptions.cpp @@ -34,7 +34,7 @@ BEGIN_ENUM_REFLECTOR(osgDB::ImageOptions::ImageSamplingMode) I_EnumLabel(osgDB::ImageOptions::CUBIC); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::ImageOptions) +BEGIN_OBJECT_REFLECTOR(osgDB::ImageOptions) I_BaseType(osgDB::ReaderWriter::Options); I_Constructor0(____ImageOptions, "", @@ -120,7 +120,7 @@ BEGIN_VALUE_REFLECTOR(osgDB::ImageOptions::RatioWindow) I_PublicMemberProperty(double, windowHeight); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::ImageOptions::TexCoordRange) +BEGIN_OBJECT_REFLECTOR(osgDB::ImageOptions::TexCoordRange) I_BaseType(osg::Referenced); I_Constructor0(____TexCoordRange, "", diff --git a/src/osgWrappers/osgDB/Input.cpp b/src/osgWrappers/osgDB/Input.cpp index 21d882adf..eace14fce 100644 --- a/src/osgWrappers/osgDB/Input.cpp +++ b/src/osgWrappers/osgDB/Input.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Input) +BEGIN_OBJECT_REFLECTOR(osgDB::Input) I_BaseType(osgDB::FieldReaderIterator); I_Constructor0(____Input, "", diff --git a/src/osgWrappers/osgDB/ReaderWriter.cpp b/src/osgWrappers/osgDB/ReaderWriter.cpp index a28d16064..dff94ba92 100644 --- a/src/osgWrappers/osgDB/ReaderWriter.cpp +++ b/src/osgWrappers/osgDB/ReaderWriter.cpp @@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::ArchiveStatus) I_EnumLabel(osgDB::ReaderWriter::CREATE); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::ReaderWriter) +BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter) I_BaseType(osg::Object); I_Constructor0(____ReaderWriter, "", @@ -173,7 +173,7 @@ BEGIN_ENUM_REFLECTOR(osgDB::ReaderWriter::Options::CacheHintOptions) I_EnumLabel(osgDB::ReaderWriter::Options::CACHE_ALL); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options) +BEGIN_OBJECT_REFLECTOR(osgDB::ReaderWriter::Options) I_BaseType(osg::Object); I_Constructor0(____Options, "", diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp index a0e7ec523..4fbe145a1 100644 --- a/src/osgWrappers/osgDB/Registry.cpp +++ b/src/osgWrappers/osgDB/Registry.cpp @@ -55,7 +55,7 @@ BEGIN_VALUE_REFLECTOR(osgDB::RegisterDotOsgWrapperProxy) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Registry) +BEGIN_OBJECT_REFLECTOR(osgDB::Registry) I_BaseType(osg::Referenced); I_Method1(void, readCommandLine, IN, osg::ArgumentParser &, commandLine, Properties::NON_VIRTUAL, @@ -487,7 +487,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Registry) __void__setWriteFileCallback__WriteFileCallback_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Registry::ReadFileCallback) +BEGIN_OBJECT_REFLECTOR(osgDB::Registry::ReadFileCallback) I_BaseType(osg::Referenced); I_Constructor0(____ReadFileCallback, "", @@ -542,7 +542,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Registry::ReadFunctor) I_PublicMemberProperty(std::string, _filename); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::Registry::WriteFileCallback) +BEGIN_OBJECT_REFLECTOR(osgDB::Registry::WriteFileCallback) I_BaseType(osg::Referenced); I_Constructor0(____WriteFileCallback, "", diff --git a/src/osgWrappers/osgDB/SharedStateManager.cpp b/src/osgWrappers/osgDB/SharedStateManager.cpp index 8324efb07..9c0d019b7 100644 --- a/src/osgWrappers/osgDB/SharedStateManager.cpp +++ b/src/osgWrappers/osgDB/SharedStateManager.cpp @@ -29,7 +29,7 @@ BEGIN_ENUM_REFLECTOR(osgDB::SharedStateManager::ShareMode) I_EnumLabel(osgDB::SharedStateManager::SHARE_ALL); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::SharedStateManager) +BEGIN_OBJECT_REFLECTOR(osgDB::SharedStateManager) I_BaseType(osg::NodeVisitor); I_Constructor0(____SharedStateManager, "", diff --git a/src/osgWrappers/osgFX/AnisotropicLighting.cpp b/src/osgWrappers/osgFX/AnisotropicLighting.cpp index 39c96c637..10e2e04ac 100644 --- a/src/osgWrappers/osgFX/AnisotropicLighting.cpp +++ b/src/osgWrappers/osgFX/AnisotropicLighting.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::AnisotropicLighting) +BEGIN_OBJECT_REFLECTOR(osgFX::AnisotropicLighting) I_BaseType(osgFX::Effect); I_Constructor0(____AnisotropicLighting, "", diff --git a/src/osgWrappers/osgFX/BumpMapping.cpp b/src/osgWrappers/osgFX/BumpMapping.cpp index 92496d450..308524e60 100644 --- a/src/osgWrappers/osgFX/BumpMapping.cpp +++ b/src/osgWrappers/osgFX/BumpMapping.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::BumpMapping) +BEGIN_OBJECT_REFLECTOR(osgFX::BumpMapping) I_BaseType(osgFX::Effect); I_Constructor0(____BumpMapping, "", diff --git a/src/osgWrappers/osgFX/Cartoon.cpp b/src/osgWrappers/osgFX/Cartoon.cpp index 131f04f6c..da2f2eade 100644 --- a/src/osgWrappers/osgFX/Cartoon.cpp +++ b/src/osgWrappers/osgFX/Cartoon.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Cartoon) +BEGIN_OBJECT_REFLECTOR(osgFX::Cartoon) I_BaseType(osgFX::Effect); I_Constructor0(____Cartoon, "", diff --git a/src/osgWrappers/osgFX/MultiTextureControl.cpp b/src/osgWrappers/osgFX/MultiTextureControl.cpp index 7c0931dee..ddcb077a2 100644 --- a/src/osgWrappers/osgFX/MultiTextureControl.cpp +++ b/src/osgWrappers/osgFX/MultiTextureControl.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::MultiTextureControl) +BEGIN_OBJECT_REFLECTOR(osgFX::MultiTextureControl) I_BaseType(osg::Group); I_Constructor0(____MultiTextureControl, "", diff --git a/src/osgWrappers/osgFX/Registry.cpp b/src/osgWrappers/osgFX/Registry.cpp index fdc01ba33..fcd339cd3 100644 --- a/src/osgWrappers/osgFX/Registry.cpp +++ b/src/osgWrappers/osgFX/Registry.cpp @@ -23,7 +23,7 @@ TYPE_NAME_ALIAS(std::map< std::string COMMA osg::ref_ptr< const osgFX::Effect > >, osgFX::Registry::EffectMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Registry) +BEGIN_OBJECT_REFLECTOR(osgFX::Registry) I_BaseType(osg::Referenced); I_Method1(void, registerEffect, IN, const osgFX::Effect *, effect, Properties::NON_VIRTUAL, diff --git a/src/osgWrappers/osgFX/Scribe.cpp b/src/osgWrappers/osgFX/Scribe.cpp index 24980cbee..2cb167723 100644 --- a/src/osgWrappers/osgFX/Scribe.cpp +++ b/src/osgWrappers/osgFX/Scribe.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Scribe) +BEGIN_OBJECT_REFLECTOR(osgFX::Scribe) I_BaseType(osgFX::Effect); I_Constructor0(____Scribe, "", diff --git a/src/osgWrappers/osgFX/SpecularHighlights.cpp b/src/osgWrappers/osgFX/SpecularHighlights.cpp index 2a31d0b2e..675663039 100644 --- a/src/osgWrappers/osgFX/SpecularHighlights.cpp +++ b/src/osgWrappers/osgFX/SpecularHighlights.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::SpecularHighlights) +BEGIN_OBJECT_REFLECTOR(osgFX::SpecularHighlights) I_BaseType(osgFX::Effect); I_Constructor0(____SpecularHighlights, "", diff --git a/src/osgWrappers/osgFX/Validator.cpp b/src/osgWrappers/osgFX/Validator.cpp index c0c21c8b4..fd6ce404a 100644 --- a/src/osgWrappers/osgFX/Validator.cpp +++ b/src/osgWrappers/osgFX/Validator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFX::Validator) +BEGIN_OBJECT_REFLECTOR(osgFX::Validator) I_BaseType(osg::StateAttribute); I_Constructor0(____Validator, "", diff --git a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp index 7b26d107e..f6f4f0990 100644 --- a/src/osgWrappers/osgGA/AnimationPathManipulator.cpp +++ b/src/osgWrappers/osgGA/AnimationPathManipulator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::AnimationPathManipulator) I_BaseType(osgGA::MatrixManipulator); I_ConstructorWithDefaults1(IN, osg::AnimationPath *, animationPath, 0, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgGA/DriveManipulator.cpp b/src/osgWrappers/osgGA/DriveManipulator.cpp index cf5d58f6a..1f75cb076 100644 --- a/src/osgWrappers/osgGA/DriveManipulator.cpp +++ b/src/osgWrappers/osgGA/DriveManipulator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::DriveManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::DriveManipulator) I_BaseType(osgGA::MatrixManipulator); I_Constructor0(____DriveManipulator, "", diff --git a/src/osgWrappers/osgGA/EventQueue.cpp b/src/osgWrappers/osgGA/EventQueue.cpp index d79711de8..7e2a667a2 100644 --- a/src/osgWrappers/osgGA/EventQueue.cpp +++ b/src/osgWrappers/osgGA/EventQueue.cpp @@ -24,7 +24,7 @@ TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventQueue::Events); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::EventQueue) +BEGIN_OBJECT_REFLECTOR(osgGA::EventQueue) I_BaseType(osg::Referenced); I_ConstructorWithDefaults1(IN, osgGA::GUIEventAdapter::MouseYOrientation, mouseYOrientation, osgGA::GUIEventAdapter::Y_INCREASING_DOWNWARDS, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgGA/EventVisitor.cpp b/src/osgWrappers/osgGA/EventVisitor.cpp index 09c480448..117211d40 100644 --- a/src/osgWrappers/osgGA/EventVisitor.cpp +++ b/src/osgWrappers/osgGA/EventVisitor.cpp @@ -35,7 +35,7 @@ TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventAdapter > >, osgGA::EventVisitor::EventList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::EventVisitor) +BEGIN_OBJECT_REFLECTOR(osgGA::EventVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____EventVisitor, "", diff --git a/src/osgWrappers/osgGA/FlightManipulator.cpp b/src/osgWrappers/osgGA/FlightManipulator.cpp index 83119e26c..768dc27d4 100644 --- a/src/osgWrappers/osgGA/FlightManipulator.cpp +++ b/src/osgWrappers/osgGA/FlightManipulator.cpp @@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osgGA::FlightManipulator::YawControlMode) I_EnumLabel(osgGA::FlightManipulator::NO_AUTOMATIC_YAW); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::FlightManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::FlightManipulator) I_BaseType(osgGA::MatrixManipulator); I_Constructor0(____FlightManipulator, "", diff --git a/src/osgWrappers/osgGA/GUIEventAdapter.cpp b/src/osgWrappers/osgGA/GUIEventAdapter.cpp index 912238530..30b2046de 100644 --- a/src/osgWrappers/osgGA/GUIEventAdapter.cpp +++ b/src/osgWrappers/osgGA/GUIEventAdapter.cpp @@ -208,7 +208,7 @@ BEGIN_ENUM_REFLECTOR(osgGA::GUIEventAdapter::TabletPointerType) I_EnumLabel(osgGA::GUIEventAdapter::ERASER); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::GUIEventAdapter) +BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventAdapter) I_BaseType(osg::Referenced); I_Constructor0(____GUIEventAdapter, "", diff --git a/src/osgWrappers/osgGA/GUIEventHandler.cpp b/src/osgWrappers/osgGA/GUIEventHandler.cpp index 9d528ef0e..11fcf8762 100644 --- a/src/osgWrappers/osgGA/GUIEventHandler.cpp +++ b/src/osgWrappers/osgGA/GUIEventHandler.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::GUIEventHandler) +BEGIN_OBJECT_REFLECTOR(osgGA::GUIEventHandler) I_BaseType(osg::NodeCallback); I_BaseType(osg::Drawable::EventCallback); I_Constructor0(____GUIEventHandler, diff --git a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp index d4a89e7a3..b36f68a6c 100644 --- a/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp +++ b/src/osgWrappers/osgGA/KeySwitchMatrixManipulator.cpp @@ -32,7 +32,7 @@ TYPE_NAME_ALIAS(std::pair< std::string COMMA osg::ref_ptr< osgGA::MatrixManipul TYPE_NAME_ALIAS(std::map< int COMMA osgGA::KeySwitchMatrixManipulator::NamedManipulator >, osgGA::KeySwitchMatrixManipulator::KeyManipMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::KeySwitchMatrixManipulator) I_BaseType(osgGA::MatrixManipulator); I_Constructor0(____KeySwitchMatrixManipulator, "", diff --git a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp index 8d4ee8e70..b7050c8c7 100644 --- a/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp +++ b/src/osgWrappers/osgGA/NodeTrackerManipulator.cpp @@ -39,7 +39,7 @@ BEGIN_ENUM_REFLECTOR(osgGA::NodeTrackerManipulator::RotationMode) I_EnumLabel(osgGA::NodeTrackerManipulator::ELEVATION_AZIM); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::NodeTrackerManipulator) I_BaseType(osgGA::MatrixManipulator); I_Constructor0(____NodeTrackerManipulator, "", diff --git a/src/osgWrappers/osgGA/StateSetManipulator.cpp b/src/osgWrappers/osgGA/StateSetManipulator.cpp index 320019b91..0e9a4cce3 100644 --- a/src/osgWrappers/osgGA/StateSetManipulator.cpp +++ b/src/osgWrappers/osgGA/StateSetManipulator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::StateSetManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::StateSetManipulator) I_BaseType(osgGA::GUIEventHandler); I_ConstructorWithDefaults1(IN, osg::StateSet *, stateset, 0, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgGA/TerrainManipulator.cpp b/src/osgWrappers/osgGA/TerrainManipulator.cpp index 9823fc46b..d703fd6d5 100644 --- a/src/osgWrappers/osgGA/TerrainManipulator.cpp +++ b/src/osgWrappers/osgGA/TerrainManipulator.cpp @@ -31,7 +31,7 @@ BEGIN_ENUM_REFLECTOR(osgGA::TerrainManipulator::RotationMode) I_EnumLabel(osgGA::TerrainManipulator::ELEVATION_AZIM); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::TerrainManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::TerrainManipulator) I_BaseType(osgGA::MatrixManipulator); I_Constructor0(____TerrainManipulator, "", diff --git a/src/osgWrappers/osgGA/TrackballManipulator.cpp b/src/osgWrappers/osgGA/TrackballManipulator.cpp index ecaddcd7d..9f152727d 100644 --- a/src/osgWrappers/osgGA/TrackballManipulator.cpp +++ b/src/osgWrappers/osgGA/TrackballManipulator.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::TrackballManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::TrackballManipulator) I_BaseType(osgGA::MatrixManipulator); I_Constructor0(____TrackballManipulator, "", diff --git a/src/osgWrappers/osgGA/UFOManipulator.cpp b/src/osgWrappers/osgGA/UFOManipulator.cpp index 4b33c9f86..7fa7a746b 100644 --- a/src/osgWrappers/osgGA/UFOManipulator.cpp +++ b/src/osgWrappers/osgGA/UFOManipulator.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgGA::UFOManipulator) +BEGIN_OBJECT_REFLECTOR(osgGA::UFOManipulator) I_BaseType(osgGA::MatrixManipulator); I_Constructor0(____UFOManipulator, "Default constructor. ", diff --git a/src/osgWrappers/osgManipulator/AntiSquish.cpp b/src/osgWrappers/osgManipulator/AntiSquish.cpp index 3c14dadf0..c1af8b785 100644 --- a/src/osgWrappers/osgManipulator/AntiSquish.cpp +++ b/src/osgWrappers/osgManipulator/AntiSquish.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::AntiSquish) +BEGIN_OBJECT_REFLECTOR(osgManipulator::AntiSquish) I_BaseType(osg::MatrixTransform); I_Constructor0(____AntiSquish, "", diff --git a/src/osgWrappers/osgManipulator/Command.cpp b/src/osgWrappers/osgManipulator/Command.cpp index 893d8dbb2..f788b4871 100644 --- a/src/osgWrappers/osgManipulator/Command.cpp +++ b/src/osgWrappers/osgManipulator/Command.cpp @@ -108,7 +108,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::MotionCommand) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Rotate3DCommand) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Rotate3DCommand) I_BaseType(osgManipulator::MotionCommand); I_Constructor0(____Rotate3DCommand, "", @@ -151,7 +151,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Rotate3DCommand) __void__setRotation__C5_osg_Quat_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Scale1DCommand) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DCommand) I_BaseType(osgManipulator::MotionCommand); I_Constructor0(____Scale1DCommand, "", @@ -233,7 +233,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Scale1DCommand) __void__setScaleCenter__float); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Scale2DCommand) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DCommand) I_BaseType(osgManipulator::MotionCommand); I_Constructor0(____Scale2DCommand, "", @@ -315,7 +315,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Scale2DCommand) __void__setScaleCenter__C5_osg_Vec2_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::ScaleUniformCommand) +BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleUniformCommand) I_BaseType(osgManipulator::MotionCommand); I_Constructor0(____ScaleUniformCommand, "", @@ -371,7 +371,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::ScaleUniformCommand) __void__setScaleCenter__C5_osg_Vec3_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) I_BaseType(osgManipulator::MotionCommand); I_Constructor0(____TranslateInLineCommand, "", @@ -439,7 +439,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) __void__setTranslation__C5_osg_Vec3_R1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TranslateInPlaneCommand) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInPlaneCommand) I_BaseType(osgManipulator::MotionCommand); I_Constructor0(____TranslateInPlaneCommand, "", diff --git a/src/osgWrappers/osgManipulator/CommandManager.cpp b/src/osgWrappers/osgManipulator/CommandManager.cpp index 290b771c6..674cbb9fc 100644 --- a/src/osgWrappers/osgManipulator/CommandManager.cpp +++ b/src/osgWrappers/osgManipulator/CommandManager.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::CommandManager) +BEGIN_OBJECT_REFLECTOR(osgManipulator::CommandManager) I_BaseType(osg::Referenced); I_Constructor0(____CommandManager, "", diff --git a/src/osgWrappers/osgManipulator/Constraint.cpp b/src/osgWrappers/osgManipulator/Constraint.cpp index c3ae30b86..fbe09e188 100644 --- a/src/osgWrappers/osgManipulator/Constraint.cpp +++ b/src/osgWrappers/osgManipulator/Constraint.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Constraint) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Constraint) I_BaseType(osg::Referenced); I_Method1(bool, constrain, IN, osgManipulator::MotionCommand &, x, Properties::VIRTUAL, @@ -57,7 +57,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Constraint) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::GridConstraint) +BEGIN_OBJECT_REFLECTOR(osgManipulator::GridConstraint) I_BaseType(osgManipulator::Constraint); I_Constructor3(IN, osg::Node &, refNode, IN, const osg::Vec3d &, origin, IN, const osg::Vec3d &, spacing, ____GridConstraint__osg_Node_R1__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index 4cc1e1379..068d394e3 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -29,7 +29,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgManipulator::Dragger > >, osgManipulator::CompositeDragger::DraggerList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) I_BaseType(osgManipulator::Dragger); I_Method0(const osgManipulator::CompositeDragger *, getComposite, Properties::VIRTUAL, @@ -109,7 +109,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) __void__setParentDragger__Dragger_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Dragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) I_BaseType(osgManipulator::Selection); I_Method1(void, setCommandManager, IN, osgManipulator::CommandManager *, cm, Properties::VIRTUAL, diff --git a/src/osgWrappers/osgManipulator/Projector.cpp b/src/osgWrappers/osgManipulator/Projector.cpp index 2aa01d30b..0bd1f0c3c 100644 --- a/src/osgWrappers/osgManipulator/Projector.cpp +++ b/src/osgWrappers/osgManipulator/Projector.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) +BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) I_BaseType(osgManipulator::CylinderProjector); I_Constructor0(____CylinderPlaneProjector, "", @@ -53,7 +53,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::CylinderProjector) +BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderProjector) I_BaseType(osgManipulator::Projector); I_Constructor0(____CylinderProjector, "", @@ -96,7 +96,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::CylinderProjector) __void__setFront__bool); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::LineProjector) +BEGIN_OBJECT_REFLECTOR(osgManipulator::LineProjector) I_BaseType(osgManipulator::Projector); I_Constructor0(____LineProjector, "", @@ -143,7 +143,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::LineProjector) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::PlaneProjector) +BEGIN_OBJECT_REFLECTOR(osgManipulator::PlaneProjector) I_BaseType(osgManipulator::Projector); I_Constructor0(____PlaneProjector, "", @@ -206,7 +206,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Projector) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::SpherePlaneProjector) +BEGIN_OBJECT_REFLECTOR(osgManipulator::SpherePlaneProjector) I_BaseType(osgManipulator::SphereProjector); I_Constructor0(____SpherePlaneProjector, "", @@ -233,7 +233,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::SpherePlaneProjector) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::SphereProjector) +BEGIN_OBJECT_REFLECTOR(osgManipulator::SphereProjector) I_BaseType(osgManipulator::Projector); I_Constructor0(____SphereProjector, "", diff --git a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp index b891ed4fc..4ab5ac26b 100644 --- a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) I_BaseType(osgManipulator::Dragger); I_Constructor0(____RotateCylinderDragger, "", diff --git a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp index 37d238db7..693a8ebea 100644 --- a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) I_BaseType(osgManipulator::Dragger); I_Constructor0(____RotateSphereDragger, "", diff --git a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp index 9ec28322c..1bce35571 100644 --- a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp @@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osgManipulator::Scale1DDragger::ScaleMode) I_EnumLabel(osgManipulator::Scale1DDragger::SCALE_WITH_OPPOSITE_HANDLE_AS_PIVOT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) I_BaseType(osgManipulator::Dragger); I_ConstructorWithDefaults1(IN, osgManipulator::Scale1DDragger::ScaleMode, scaleMode, osgManipulator::Scale1DDragger::SCALE_WITH_ORIGIN_AS_PIVOT, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp index bdd540775..411531405 100644 --- a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp @@ -31,7 +31,7 @@ BEGIN_ENUM_REFLECTOR(osgManipulator::Scale2DDragger::ScaleMode) I_EnumLabel(osgManipulator::Scale2DDragger::SCALE_WITH_OPPOSITE_HANDLE_AS_PIVOT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) I_BaseType(osgManipulator::Dragger); I_ConstructorWithDefaults1(IN, osgManipulator::Scale2DDragger::ScaleMode, scaleMode, osgManipulator::Scale2DDragger::SCALE_WITH_ORIGIN_AS_PIVOT, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp b/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp index ec0ba9aaf..c00ddc29d 100644 --- a/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp +++ b/src/osgWrappers/osgManipulator/ScaleAxisDragger.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::ScaleAxisDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleAxisDragger) I_BaseType(osgManipulator::CompositeDragger); I_Constructor0(____ScaleAxisDragger, "", diff --git a/src/osgWrappers/osgManipulator/Selection.cpp b/src/osgWrappers/osgManipulator/Selection.cpp index 8d3b057d4..e2bfcaaba 100644 --- a/src/osgWrappers/osgManipulator/Selection.cpp +++ b/src/osgWrappers/osgManipulator/Selection.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Selection) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Selection) I_BaseType(osg::MatrixTransform); I_Constructor0(____Selection, "", diff --git a/src/osgWrappers/osgManipulator/TabBoxDragger.cpp b/src/osgWrappers/osgManipulator/TabBoxDragger.cpp index 76e58c358..fdca9859c 100644 --- a/src/osgWrappers/osgManipulator/TabBoxDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabBoxDragger.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TabBoxDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TabBoxDragger) I_BaseType(osgManipulator::CompositeDragger); I_Constructor0(____TabBoxDragger, "", diff --git a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp index 96fb99f76..14567d148 100644 --- a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TabPlaneDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneDragger) I_BaseType(osgManipulator::CompositeDragger); I_Constructor0(____TabPlaneDragger, "", diff --git a/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp b/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp index e82f7fa3c..8b4455e70 100644 --- a/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabPlaneTrackballDragger.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TabPlaneTrackballDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneTrackballDragger) I_BaseType(osgManipulator::CompositeDragger); I_Constructor0(____TabPlaneTrackballDragger, "", diff --git a/src/osgWrappers/osgManipulator/TrackballDragger.cpp b/src/osgWrappers/osgManipulator/TrackballDragger.cpp index 86aa3b7c0..57366d178 100644 --- a/src/osgWrappers/osgManipulator/TrackballDragger.cpp +++ b/src/osgWrappers/osgManipulator/TrackballDragger.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TrackballDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TrackballDragger) I_BaseType(osgManipulator::CompositeDragger); I_ConstructorWithDefaults1(IN, bool, useAutoTransform, false, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp index eea2d6b7b..b774da2eb 100644 --- a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) I_BaseType(osgManipulator::Dragger); I_Constructor0(____Translate1DDragger, "", diff --git a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp index f3a4159e6..5373fc048 100644 --- a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) I_BaseType(osgManipulator::Dragger); I_Constructor0(____Translate2DDragger, "", diff --git a/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp b/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp index af668b43e..a66500330 100644 --- a/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp +++ b/src/osgWrappers/osgManipulator/TranslateAxisDragger.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TranslateAxisDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateAxisDragger) I_BaseType(osgManipulator::CompositeDragger); I_Constructor0(____TranslateAxisDragger, "", diff --git a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp index 65c01c2d7..f66663cc6 100644 --- a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::TranslatePlaneDragger) +BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslatePlaneDragger) I_BaseType(osgManipulator::CompositeDragger); I_Constructor0(____TranslatePlaneDragger, "", diff --git a/src/osgWrappers/osgParticle/AccelOperator.cpp b/src/osgWrappers/osgParticle/AccelOperator.cpp index a74d7939b..686aad02d 100644 --- a/src/osgWrappers/osgParticle/AccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AccelOperator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::AccelOperator) +BEGIN_OBJECT_REFLECTOR(osgParticle::AccelOperator) I_BaseType(osgParticle::Operator); I_Constructor0(____AccelOperator, "", diff --git a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp index e00c3f118..0fe7c77fa 100644 --- a/src/osgWrappers/osgParticle/AngularAccelOperator.cpp +++ b/src/osgWrappers/osgParticle/AngularAccelOperator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::AngularAccelOperator) +BEGIN_OBJECT_REFLECTOR(osgParticle::AngularAccelOperator) I_BaseType(osgParticle::Operator); I_Constructor0(____AngularAccelOperator, "", diff --git a/src/osgWrappers/osgParticle/BoxPlacer.cpp b/src/osgWrappers/osgParticle/BoxPlacer.cpp index 413478563..ea21bd856 100644 --- a/src/osgWrappers/osgParticle/BoxPlacer.cpp +++ b/src/osgWrappers/osgParticle/BoxPlacer.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::BoxPlacer) +BEGIN_OBJECT_REFLECTOR(osgParticle::BoxPlacer) I_BaseType(osgParticle::CenteredPlacer); I_Constructor0(____BoxPlacer, "", diff --git a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp index 0a849bc59..8ad94f510 100644 --- a/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ConnectedParticleSystem.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ConnectedParticleSystem) +BEGIN_OBJECT_REFLECTOR(osgParticle::ConnectedParticleSystem) I_BaseType(osgParticle::ParticleSystem); I_Constructor0(____ConnectedParticleSystem, "", diff --git a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp index 1dbcd5cd4..5e3608832 100644 --- a/src/osgWrappers/osgParticle/ConstantRateCounter.cpp +++ b/src/osgWrappers/osgParticle/ConstantRateCounter.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ConstantRateCounter) +BEGIN_OBJECT_REFLECTOR(osgParticle::ConstantRateCounter) I_BaseType(osgParticle::Counter); I_Constructor0(____ConstantRateCounter, "", diff --git a/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp index 22ad9bcc7..9a8ca85cd 100644 --- a/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionDebrisEffect.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ExplosionDebrisEffect) +BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionDebrisEffect) I_BaseType(osgParticle::ParticleEffect); I_ConstructorWithDefaults1(IN, bool, automaticSetup, true, Properties::EXPLICIT, diff --git a/src/osgWrappers/osgParticle/ExplosionEffect.cpp b/src/osgWrappers/osgParticle/ExplosionEffect.cpp index 3a55ed8d2..f5cad5904 100644 --- a/src/osgWrappers/osgParticle/ExplosionEffect.cpp +++ b/src/osgWrappers/osgParticle/ExplosionEffect.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ExplosionEffect) +BEGIN_OBJECT_REFLECTOR(osgParticle::ExplosionEffect) I_BaseType(osgParticle::ParticleEffect); I_ConstructorWithDefaults1(IN, bool, automaticSetup, true, Properties::EXPLICIT, diff --git a/src/osgWrappers/osgParticle/FireEffect.cpp b/src/osgWrappers/osgParticle/FireEffect.cpp index ea48b1f77..498388ce1 100644 --- a/src/osgWrappers/osgParticle/FireEffect.cpp +++ b/src/osgWrappers/osgParticle/FireEffect.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::FireEffect) +BEGIN_OBJECT_REFLECTOR(osgParticle::FireEffect) I_BaseType(osgParticle::ParticleEffect); I_ConstructorWithDefaults1(IN, bool, automaticSetup, true, Properties::EXPLICIT, diff --git a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp index 95d2dff95..06110d832 100644 --- a/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp +++ b/src/osgWrappers/osgParticle/FluidFrictionOperator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::FluidFrictionOperator) +BEGIN_OBJECT_REFLECTOR(osgParticle::FluidFrictionOperator) I_BaseType(osgParticle::Operator); I_Constructor0(____FluidFrictionOperator, "", diff --git a/src/osgWrappers/osgParticle/FluidProgram.cpp b/src/osgWrappers/osgParticle/FluidProgram.cpp index 6cc98c521..9a5aea177 100644 --- a/src/osgWrappers/osgParticle/FluidProgram.cpp +++ b/src/osgWrappers/osgParticle/FluidProgram.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::FluidProgram) +BEGIN_OBJECT_REFLECTOR(osgParticle::FluidProgram) I_BaseType(osgParticle::Program); I_Constructor0(____FluidProgram, "", diff --git a/src/osgWrappers/osgParticle/ForceOperator.cpp b/src/osgWrappers/osgParticle/ForceOperator.cpp index 048d8a923..6af282554 100644 --- a/src/osgWrappers/osgParticle/ForceOperator.cpp +++ b/src/osgWrappers/osgParticle/ForceOperator.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ForceOperator) +BEGIN_OBJECT_REFLECTOR(osgParticle::ForceOperator) I_BaseType(osgParticle::Operator); I_Constructor0(____ForceOperator, "", diff --git a/src/osgWrappers/osgParticle/LinearInterpolator.cpp b/src/osgWrappers/osgParticle/LinearInterpolator.cpp index e70e1ad95..d7565ed8a 100644 --- a/src/osgWrappers/osgParticle/LinearInterpolator.cpp +++ b/src/osgWrappers/osgParticle/LinearInterpolator.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::LinearInterpolator) +BEGIN_OBJECT_REFLECTOR(osgParticle::LinearInterpolator) I_BaseType(osgParticle::Interpolator); I_Constructor0(____LinearInterpolator, "", diff --git a/src/osgWrappers/osgParticle/ModularEmitter.cpp b/src/osgWrappers/osgParticle/ModularEmitter.cpp index e2e5c8f87..606c57608 100644 --- a/src/osgWrappers/osgParticle/ModularEmitter.cpp +++ b/src/osgWrappers/osgParticle/ModularEmitter.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ModularEmitter) +BEGIN_OBJECT_REFLECTOR(osgParticle::ModularEmitter) I_BaseType(osgParticle::Emitter); I_Constructor0(____ModularEmitter, "", diff --git a/src/osgWrappers/osgParticle/ModularProgram.cpp b/src/osgWrappers/osgParticle/ModularProgram.cpp index 845dfd628..1d3fab8b0 100644 --- a/src/osgWrappers/osgParticle/ModularProgram.cpp +++ b/src/osgWrappers/osgParticle/ModularProgram.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ModularProgram) +BEGIN_OBJECT_REFLECTOR(osgParticle::ModularProgram) I_BaseType(osgParticle::Program); I_Constructor0(____ModularProgram, "", diff --git a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp index feaab0d4d..e1b711440 100644 --- a/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/MultiSegmentPlacer.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer) +BEGIN_OBJECT_REFLECTOR(osgParticle::MultiSegmentPlacer) I_BaseType(osgParticle::Placer); I_Constructor0(____MultiSegmentPlacer, "", diff --git a/src/osgWrappers/osgParticle/ParticleSystem.cpp b/src/osgWrappers/osgParticle/ParticleSystem.cpp index 15dfec501..14ae650f8 100644 --- a/src/osgWrappers/osgParticle/ParticleSystem.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystem.cpp @@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osgParticle::ParticleSystem::Alignment) I_EnumLabel(osgParticle::ParticleSystem::FIXED); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleSystem) +BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystem) I_BaseType(osg::Drawable); I_Constructor0(____ParticleSystem, "", diff --git a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp index cd2ad0d9a..6d0a5587c 100644 --- a/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp +++ b/src/osgWrappers/osgParticle/ParticleSystemUpdater.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater) +BEGIN_OBJECT_REFLECTOR(osgParticle::ParticleSystemUpdater) I_BaseType(osg::Node); I_Constructor0(____ParticleSystemUpdater, "", diff --git a/src/osgWrappers/osgParticle/PointPlacer.cpp b/src/osgWrappers/osgParticle/PointPlacer.cpp index 34159ddae..b8240b3a7 100644 --- a/src/osgWrappers/osgParticle/PointPlacer.cpp +++ b/src/osgWrappers/osgParticle/PointPlacer.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::PointPlacer) +BEGIN_OBJECT_REFLECTOR(osgParticle::PointPlacer) I_BaseType(osgParticle::CenteredPlacer); I_Constructor0(____PointPlacer, "", diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index 970184a69..b9ad96f1e 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -30,7 +30,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect) +BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect) I_BaseType(osg::Node); I_Constructor0(____PrecipitationEffect, "", @@ -274,7 +274,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::map< osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell COMMA osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime >, osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable) +BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable) I_BaseType(osg::Drawable); I_Constructor0(____PrecipitationDrawable, "", diff --git a/src/osgWrappers/osgParticle/RadialShooter.cpp b/src/osgWrappers/osgParticle/RadialShooter.cpp index 29108c4f5..ead12af4f 100644 --- a/src/osgWrappers/osgParticle/RadialShooter.cpp +++ b/src/osgWrappers/osgParticle/RadialShooter.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::RadialShooter) +BEGIN_OBJECT_REFLECTOR(osgParticle::RadialShooter) I_BaseType(osgParticle::Shooter); I_Constructor0(____RadialShooter, "", diff --git a/src/osgWrappers/osgParticle/RandomRateCounter.cpp b/src/osgWrappers/osgParticle/RandomRateCounter.cpp index a4429d039..bc0bfa42f 100644 --- a/src/osgWrappers/osgParticle/RandomRateCounter.cpp +++ b/src/osgWrappers/osgParticle/RandomRateCounter.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::RandomRateCounter) +BEGIN_OBJECT_REFLECTOR(osgParticle::RandomRateCounter) I_BaseType(osgParticle::VariableRateCounter); I_Constructor0(____RandomRateCounter, "", diff --git a/src/osgWrappers/osgParticle/SectorPlacer.cpp b/src/osgWrappers/osgParticle/SectorPlacer.cpp index 254edaac6..08e063f19 100644 --- a/src/osgWrappers/osgParticle/SectorPlacer.cpp +++ b/src/osgWrappers/osgParticle/SectorPlacer.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SectorPlacer) +BEGIN_OBJECT_REFLECTOR(osgParticle::SectorPlacer) I_BaseType(osgParticle::CenteredPlacer); I_Constructor0(____SectorPlacer, "", diff --git a/src/osgWrappers/osgParticle/SegmentPlacer.cpp b/src/osgWrappers/osgParticle/SegmentPlacer.cpp index 0e73fc68f..1954a98f1 100644 --- a/src/osgWrappers/osgParticle/SegmentPlacer.cpp +++ b/src/osgWrappers/osgParticle/SegmentPlacer.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SegmentPlacer) +BEGIN_OBJECT_REFLECTOR(osgParticle::SegmentPlacer) I_BaseType(osgParticle::Placer); I_Constructor0(____SegmentPlacer, "", diff --git a/src/osgWrappers/osgParticle/SmokeEffect.cpp b/src/osgWrappers/osgParticle/SmokeEffect.cpp index 902dc5e47..7e8947264 100644 --- a/src/osgWrappers/osgParticle/SmokeEffect.cpp +++ b/src/osgWrappers/osgParticle/SmokeEffect.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SmokeEffect) +BEGIN_OBJECT_REFLECTOR(osgParticle::SmokeEffect) I_BaseType(osgParticle::ParticleEffect); I_ConstructorWithDefaults1(IN, bool, automaticSetup, true, Properties::EXPLICIT, diff --git a/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp b/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp index 0e793a30f..8805509a3 100644 --- a/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp +++ b/src/osgWrappers/osgParticle/SmokeTrailEffect.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgParticle::SmokeTrailEffect) +BEGIN_OBJECT_REFLECTOR(osgParticle::SmokeTrailEffect) I_BaseType(osgParticle::ParticleEffect); I_ConstructorWithDefaults1(IN, bool, automaticSetup, true, Properties::EXPLICIT, diff --git a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp index ca3cd669f..b3c5d41c6 100644 --- a/src/osgWrappers/osgProducer/OsgCameraGroup.cpp +++ b/src/osgWrappers/osgProducer/OsgCameraGroup.cpp @@ -39,7 +39,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgProducer::GraphicsContextImplement TYPE_NAME_ALIAS(std::vector< Producer::ref_ptr< osgProducer::OsgSceneHandler > >, osgProducer::OsgCameraGroup::SceneHandlerList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgCameraGroup) +BEGIN_VALUE_REFLECTOR(osgProducer::OsgCameraGroup) I_Constructor0(____OsgCameraGroup, "", ""); diff --git a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp index d8fb46806..fc42b2e67 100644 --- a/src/osgWrappers/osgProducer/OsgSceneHandler.cpp +++ b/src/osgWrappers/osgProducer/OsgSceneHandler.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::OsgSceneHandler) +BEGIN_OBJECT_REFLECTOR(osgProducer::OsgSceneHandler) I_ConstructorWithDefaults1(IN, osg::DisplaySettings *, ds, NULL, Properties::NON_EXPLICIT, ____OsgSceneHandler__osg_DisplaySettings_P1, diff --git a/src/osgWrappers/osgProducer/Viewer.cpp b/src/osgWrappers/osgProducer/Viewer.cpp index 6b82a6808..c1b04d3fb 100644 --- a/src/osgWrappers/osgProducer/Viewer.cpp +++ b/src/osgWrappers/osgProducer/Viewer.cpp @@ -53,7 +53,7 @@ BEGIN_ENUM_REFLECTOR(osgProducer::Viewer::ViewerOptions) I_EnumLabel(osgProducer::Viewer::STANDARD_SETTINGS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::Viewer) +BEGIN_OBJECT_REFLECTOR(osgProducer::Viewer) I_BaseType(osgProducer::OsgCameraGroup); I_BaseType(osgGA::GUIActionAdapter); I_Constructor0(____Viewer, diff --git a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp index 162c1c1ae..d4dbb8534 100644 --- a/src/osgWrappers/osgProducer/ViewerEventHandler.cpp +++ b/src/osgWrappers/osgProducer/ViewerEventHandler.cpp @@ -32,7 +32,7 @@ BEGIN_ENUM_REFLECTOR(osgProducer::ViewerEventHandler::FrameStatsMode) I_EnumLabel(osgProducer::ViewerEventHandler::SCENE_STATS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgProducer::ViewerEventHandler) +BEGIN_OBJECT_REFLECTOR(osgProducer::ViewerEventHandler) I_BaseType(osgGA::GUIEventHandler); I_Constructor1(IN, osgProducer::OsgCameraGroup *, cg, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgShadow/OccluderGeometry.cpp b/src/osgWrappers/osgShadow/OccluderGeometry.cpp index 239a360ba..de5998eb6 100644 --- a/src/osgWrappers/osgShadow/OccluderGeometry.cpp +++ b/src/osgWrappers/osgShadow/OccluderGeometry.cpp @@ -33,7 +33,7 @@ TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::OccluderGeometry::Vec3List) TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::OccluderGeometry::UIntList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) +BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) I_BaseType(osg::Drawable); I_Constructor0(____OccluderGeometry, "", @@ -127,7 +127,7 @@ BEGIN_ENUM_REFLECTOR(osgShadow::ShadowVolumeGeometry::DrawMode) I_EnumLabel(osgShadow::ShadowVolumeGeometry::STENCIL_TWO_SIDED); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::ShadowVolumeGeometry) +BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowVolumeGeometry) I_BaseType(osg::Drawable); I_Constructor0(____ShadowVolumeGeometry, "", diff --git a/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp b/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp index 7f0025e2a..d76e96d18 100644 --- a/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp +++ b/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::ParallelSplitShadowMap) +BEGIN_OBJECT_REFLECTOR(osgShadow::ParallelSplitShadowMap) I_BaseType(osgShadow::ShadowTechnique); I_Constructor0(____ParallelSplitShadowMap, "", diff --git a/src/osgWrappers/osgShadow/ShadowMap.cpp b/src/osgWrappers/osgShadow/ShadowMap.cpp index 0934bdeb8..e0102b301 100644 --- a/src/osgWrappers/osgShadow/ShadowMap.cpp +++ b/src/osgWrappers/osgShadow/ShadowMap.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::ShadowMap) +BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowMap) I_BaseType(osgShadow::ShadowTechnique); I_Constructor0(____ShadowMap, "", diff --git a/src/osgWrappers/osgShadow/ShadowTechnique.cpp b/src/osgWrappers/osgShadow/ShadowTechnique.cpp index 0cf46056b..490497779 100644 --- a/src/osgWrappers/osgShadow/ShadowTechnique.cpp +++ b/src/osgWrappers/osgShadow/ShadowTechnique.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::ShadowTechnique) +BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowTechnique) I_BaseType(osg::Object); I_Constructor0(____ShadowTechnique, "", diff --git a/src/osgWrappers/osgShadow/ShadowTexture.cpp b/src/osgWrappers/osgShadow/ShadowTexture.cpp index 1e238390e..07b21f4d5 100644 --- a/src/osgWrappers/osgShadow/ShadowTexture.cpp +++ b/src/osgWrappers/osgShadow/ShadowTexture.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::ShadowTexture) +BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowTexture) I_BaseType(osgShadow::ShadowTechnique); I_Constructor0(____ShadowTexture, "", diff --git a/src/osgWrappers/osgShadow/ShadowVolume.cpp b/src/osgWrappers/osgShadow/ShadowVolume.cpp index 5382246a3..437115dee 100644 --- a/src/osgWrappers/osgShadow/ShadowVolume.cpp +++ b/src/osgWrappers/osgShadow/ShadowVolume.cpp @@ -25,7 +25,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::ShadowVolume) +BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowVolume) I_BaseType(osgShadow::ShadowTechnique); I_Constructor0(____ShadowVolume, "", diff --git a/src/osgWrappers/osgShadow/ShadowedScene.cpp b/src/osgWrappers/osgShadow/ShadowedScene.cpp index 1fba3c649..13d1e2fd5 100644 --- a/src/osgWrappers/osgShadow/ShadowedScene.cpp +++ b/src/osgWrappers/osgShadow/ShadowedScene.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgShadow::ShadowedScene) +BEGIN_OBJECT_REFLECTOR(osgShadow::ShadowedScene) I_BaseType(osg::Group); I_Constructor0(____ShadowedScene, "", diff --git a/src/osgWrappers/osgSim/BlinkSequence.cpp b/src/osgWrappers/osgSim/BlinkSequence.cpp index 35c031fd9..f6e2f7853 100644 --- a/src/osgWrappers/osgSim/BlinkSequence.cpp +++ b/src/osgWrappers/osgSim/BlinkSequence.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::BlinkSequence) +BEGIN_OBJECT_REFLECTOR(osgSim::BlinkSequence) I_BaseType(osg::Object); I_Constructor0(____BlinkSequence, "", @@ -128,7 +128,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::BlinkSequence) __void__setSequenceGroup__SequenceGroup_P1); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::SequenceGroup) +BEGIN_OBJECT_REFLECTOR(osgSim::SequenceGroup) I_BaseType(osg::Object); I_Constructor0(____SequenceGroup, "", diff --git a/src/osgWrappers/osgSim/ColorRange.cpp b/src/osgWrappers/osgSim/ColorRange.cpp index 1c74a9e93..41af08c0a 100644 --- a/src/osgWrappers/osgSim/ColorRange.cpp +++ b/src/osgWrappers/osgSim/ColorRange.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ColorRange) +BEGIN_OBJECT_REFLECTOR(osgSim::ColorRange) I_BaseType(osgSim::ScalarsToColors); I_Constructor2(IN, float, min, IN, float, max, ____ColorRange__float__float, diff --git a/src/osgWrappers/osgSim/DOFTransform.cpp b/src/osgWrappers/osgSim/DOFTransform.cpp index 39451a7af..425a6520a 100644 --- a/src/osgWrappers/osgSim/DOFTransform.cpp +++ b/src/osgWrappers/osgSim/DOFTransform.cpp @@ -34,7 +34,7 @@ BEGIN_ENUM_REFLECTOR(osgSim::DOFTransform::MultOrder) I_EnumLabel(osgSim::DOFTransform::RHP); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::DOFTransform) +BEGIN_OBJECT_REFLECTOR(osgSim::DOFTransform) I_BaseType(osg::Transform); I_Constructor0(____DOFTransform, "constructor ", diff --git a/src/osgWrappers/osgSim/GeographicLocation.cpp b/src/osgWrappers/osgSim/GeographicLocation.cpp index 398767453..eb830649a 100644 --- a/src/osgWrappers/osgSim/GeographicLocation.cpp +++ b/src/osgWrappers/osgSim/GeographicLocation.cpp @@ -20,7 +20,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::GeographicLocation) +BEGIN_OBJECT_REFLECTOR(osgSim::GeographicLocation) I_BaseType(osg::Referenced); I_Constructor0(____GeographicLocation, "", diff --git a/src/osgWrappers/osgSim/Impostor.cpp b/src/osgWrappers/osgSim/Impostor.cpp index f1e1c8398..5d81a66bb 100644 --- a/src/osgWrappers/osgSim/Impostor.cpp +++ b/src/osgWrappers/osgSim/Impostor.cpp @@ -28,7 +28,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgSim::ImpostorSprite > >, osgSim::Impostor::ImpostorSpriteList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::Impostor) +BEGIN_OBJECT_REFLECTOR(osgSim::Impostor) I_BaseType(osg::LOD); I_Constructor0(____Impostor, "", diff --git a/src/osgWrappers/osgSim/ImpostorSprite.cpp b/src/osgWrappers/osgSim/ImpostorSprite.cpp index 9e0704940..f43ce98b1 100644 --- a/src/osgWrappers/osgSim/ImpostorSprite.cpp +++ b/src/osgWrappers/osgSim/ImpostorSprite.cpp @@ -33,7 +33,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ImpostorSprite) +BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSprite) I_BaseType(osg::Drawable); I_Constructor0(____ImpostorSprite, "", @@ -240,7 +240,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ImpostorSprite) I_PublicMemberProperty(osg::Vec4, _color); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ImpostorSpriteManager) +BEGIN_OBJECT_REFLECTOR(osgSim::ImpostorSpriteManager) I_BaseType(osg::Referenced); I_Constructor0(____ImpostorSpriteManager, "", diff --git a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp index 8e7136660..7e67009b8 100644 --- a/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp +++ b/src/osgWrappers/osgSim/InsertImpostorsVisitor.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::InsertImpostorsVisitor) +BEGIN_OBJECT_REFLECTOR(osgSim::InsertImpostorsVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____InsertImpostorsVisitor, "Default to traversing all children. ", diff --git a/src/osgWrappers/osgSim/LightPointNode.cpp b/src/osgWrappers/osgSim/LightPointNode.cpp index 7b920801f..d9bfb43f6 100644 --- a/src/osgWrappers/osgSim/LightPointNode.cpp +++ b/src/osgWrappers/osgSim/LightPointNode.cpp @@ -28,7 +28,7 @@ TYPE_NAME_ALIAS(std::vector< osgSim::LightPoint >, osgSim::LightPointNode::LightPointList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::LightPointNode) +BEGIN_OBJECT_REFLECTOR(osgSim::LightPointNode) I_BaseType(osg::Node); I_Constructor0(____LightPointNode, "", diff --git a/src/osgWrappers/osgSim/LightPointSystem.cpp b/src/osgWrappers/osgSim/LightPointSystem.cpp index 76b4796f8..9b5dc1379 100644 --- a/src/osgWrappers/osgSim/LightPointSystem.cpp +++ b/src/osgWrappers/osgSim/LightPointSystem.cpp @@ -28,7 +28,7 @@ BEGIN_ENUM_REFLECTOR(osgSim::LightPointSystem::AnimationState) I_EnumLabel(osgSim::LightPointSystem::ANIMATION_RANDOM); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::LightPointSystem) +BEGIN_OBJECT_REFLECTOR(osgSim::LightPointSystem) I_BaseType(osg::Object); I_Constructor0(____LightPointSystem, "", diff --git a/src/osgWrappers/osgSim/LineOfSight.cpp b/src/osgWrappers/osgSim/LineOfSight.cpp index 09ecc711e..dfbf20606 100644 --- a/src/osgWrappers/osgSim/LineOfSight.cpp +++ b/src/osgWrappers/osgSim/LineOfSight.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::DatabaseCacheReadCallback) +BEGIN_OBJECT_REFLECTOR(osgSim::DatabaseCacheReadCallback) I_BaseType(osgUtil::IntersectionVisitor::ReadCallback); I_Constructor0(____DatabaseCacheReadCallback, "", diff --git a/src/osgWrappers/osgSim/MultiSwitch.cpp b/src/osgWrappers/osgSim/MultiSwitch.cpp index 53a629a0a..a4c74a6e0 100644 --- a/src/osgWrappers/osgSim/MultiSwitch.cpp +++ b/src/osgWrappers/osgSim/MultiSwitch.cpp @@ -28,7 +28,7 @@ TYPE_NAME_ALIAS(std::vector< bool >, osgSim::MultiSwitch::ValueList); TYPE_NAME_ALIAS(std::vector< osgSim::MultiSwitch::ValueList >, osgSim::MultiSwitch::SwitchSetList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::MultiSwitch) +BEGIN_OBJECT_REFLECTOR(osgSim::MultiSwitch) I_BaseType(osg::Group); I_Constructor0(____MultiSwitch, "", diff --git a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp index 05eafd2a5..52cc4d7d0 100644 --- a/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp +++ b/src/osgWrappers/osgSim/OpenFlightOptimizer.cpp @@ -31,7 +31,7 @@ BEGIN_ENUM_REFLECTOR(osgFlightUtil::Optimizer::OptimizationOptions) I_EnumLabel(osgFlightUtil::Optimizer::ALL_OPTIMIZATIONS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFlightUtil::Optimizer) +BEGIN_VALUE_REFLECTOR(osgFlightUtil::Optimizer) I_Constructor0(____Optimizer, "", ""); @@ -47,7 +47,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFlightUtil::Optimizer) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MakeLitVisitor) +BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MakeLitVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____MakeLitVisitor, "default to traversing all children. ", @@ -59,7 +59,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MakeLitVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MergeGeodesVisitor) +BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MergeGeodesVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____MergeGeodesVisitor, "default to traversing all children. ", @@ -76,7 +76,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::MergeGeodesVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::TessellateVisitor) +BEGIN_OBJECT_REFLECTOR(osgFlightUtil::Optimizer::TessellateVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____TessellateVisitor, "default to traversing all children. ", diff --git a/src/osgWrappers/osgSim/OverlayNode.cpp b/src/osgWrappers/osgSim/OverlayNode.cpp index 4da59279c..5f7585f5f 100644 --- a/src/osgWrappers/osgSim/OverlayNode.cpp +++ b/src/osgWrappers/osgSim/OverlayNode.cpp @@ -27,7 +27,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::OverlayNode) +BEGIN_OBJECT_REFLECTOR(osgSim::OverlayNode) I_BaseType(osg::Group); I_Constructor0(____OverlayNode, "", diff --git a/src/osgWrappers/osgSim/ScalarBar.cpp b/src/osgWrappers/osgSim/ScalarBar.cpp index 8d3ed51fc..904c66ac5 100644 --- a/src/osgWrappers/osgSim/ScalarBar.cpp +++ b/src/osgWrappers/osgSim/ScalarBar.cpp @@ -30,7 +30,7 @@ BEGIN_ENUM_REFLECTOR(osgSim::ScalarBar::Orientation) I_EnumLabel(osgSim::ScalarBar::VERTICAL); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ScalarBar) +BEGIN_OBJECT_REFLECTOR(osgSim::ScalarBar) I_BaseType(osg::Geode); I_Constructor0(____ScalarBar, "Default constructor. ", @@ -210,7 +210,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ScalarBar) __void__setWidth__float); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ScalarBar::ScalarPrinter) +BEGIN_OBJECT_REFLECTOR(osgSim::ScalarBar::ScalarPrinter) I_BaseType(osg::Referenced); I_Constructor0(____ScalarPrinter, "", diff --git a/src/osgWrappers/osgSim/ScalarsToColors.cpp b/src/osgWrappers/osgSim/ScalarsToColors.cpp index 34462adc8..b99eabdea 100644 --- a/src/osgWrappers/osgSim/ScalarsToColors.cpp +++ b/src/osgWrappers/osgSim/ScalarsToColors.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ScalarsToColors) +BEGIN_OBJECT_REFLECTOR(osgSim::ScalarsToColors) I_BaseType(osg::Referenced); I_Constructor2(IN, float, scalarMin, IN, float, scalarMax, ____ScalarsToColors__float__float, diff --git a/src/osgWrappers/osgSim/Sector.cpp b/src/osgWrappers/osgSim/Sector.cpp index 31e71ab7f..c16f967fc 100644 --- a/src/osgWrappers/osgSim/Sector.cpp +++ b/src/osgWrappers/osgSim/Sector.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::AzimElevationSector) +BEGIN_OBJECT_REFLECTOR(osgSim::AzimElevationSector) I_BaseType(osgSim::Sector); I_BaseType(osgSim::AzimRange); I_BaseType(osgSim::ElevationRange); @@ -86,7 +86,7 @@ BEGIN_VALUE_REFLECTOR(osgSim::AzimRange) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::AzimSector) +BEGIN_OBJECT_REFLECTOR(osgSim::AzimSector) I_BaseType(osgSim::Sector); I_BaseType(osgSim::AzimRange); I_Constructor0(____AzimSector, @@ -127,7 +127,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::AzimSector) "Must be defined by derived classes. "); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ConeSector) +BEGIN_OBJECT_REFLECTOR(osgSim::ConeSector) I_BaseType(osgSim::Sector); I_Constructor0(____ConeSector, "", @@ -201,7 +201,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ConeSector) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::DirectionalSector) +BEGIN_OBJECT_REFLECTOR(osgSim::DirectionalSector) I_BaseType(osgSim::Sector); I_Constructor0(____DirectionalSector, "", @@ -351,7 +351,7 @@ BEGIN_VALUE_REFLECTOR(osgSim::ElevationRange) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::ElevationSector) +BEGIN_OBJECT_REFLECTOR(osgSim::ElevationSector) I_BaseType(osgSim::Sector); I_BaseType(osgSim::ElevationRange); I_Constructor0(____ElevationSector, diff --git a/src/osgWrappers/osgSim/SphereSegment.cpp b/src/osgWrappers/osgSim/SphereSegment.cpp index 6d8265dec..723fb15fc 100644 --- a/src/osgWrappers/osgSim/SphereSegment.cpp +++ b/src/osgWrappers/osgSim/SphereSegment.cpp @@ -39,7 +39,7 @@ BEGIN_ENUM_REFLECTOR(osgSim::SphereSegment::DrawMask) I_EnumLabel(osgSim::SphereSegment::ALL); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::SphereSegment) +BEGIN_OBJECT_REFLECTOR(osgSim::SphereSegment) I_BaseType(osg::Geode); I_Constructor0(____SphereSegment, "Default constructor. ", diff --git a/src/osgWrappers/osgSim/VisibilityGroup.cpp b/src/osgWrappers/osgSim/VisibilityGroup.cpp index 713dd240f..4494047a9 100644 --- a/src/osgWrappers/osgSim/VisibilityGroup.cpp +++ b/src/osgWrappers/osgSim/VisibilityGroup.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgSim::VisibilityGroup) +BEGIN_OBJECT_REFLECTOR(osgSim::VisibilityGroup) I_BaseType(osg::Group); I_Constructor0(____VisibilityGroup, "", diff --git a/src/osgWrappers/osgTerrain/DataSet.cpp b/src/osgWrappers/osgTerrain/DataSet.cpp index c6d214b27..3b99b163a 100644 --- a/src/osgWrappers/osgTerrain/DataSet.cpp +++ b/src/osgWrappers/osgTerrain/DataSet.cpp @@ -69,7 +69,7 @@ BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::MipMappingMode) I_EnumLabel(osgTerrain::DataSet::MIP_MAPPING_IMAGERY); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::DataSet) +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet) I_BaseType(osg::Referenced); I_Method1(void, insertTileToQuadMap, IN, osgTerrain::DataSet::CompositeDestination *, tile, Properties::NON_VIRTUAL, @@ -606,7 +606,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgTerrain::DataSet::DestinationTile TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgTerrain::DataSet::CompositeDestination > >, osgTerrain::DataSet::CompositeDestination::ChildList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeDestination) +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeDestination) I_BaseType(osg::Referenced); I_BaseType(osgTerrain::DataSet::SpatialProperties); I_Constructor0(____CompositeDestination, @@ -708,7 +708,7 @@ TYPE_NAME_ALIAS(osgTerrain::DataSet::CompositeSource::base_source_iterator< osgT TYPE_NAME_ALIAS(osgTerrain::DataSet::CompositeSource::base_source_iterator< osgTerrain::DataSet::CompositeSource::LODSourceAdvancer >, osgTerrain::DataSet::CompositeSource::source_lod_iterator); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeSource) +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::CompositeSource) I_BaseType(osg::Referenced); I_BaseType(osgTerrain::DataSet::SpatialProperties); I_ConstructorWithDefaults1(IN, osgTerrain::DataSet::CompositeType, type, osgTerrain::DataSet::GROUP, @@ -805,7 +805,7 @@ TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Image > >, osgTerrain::DataSet:: TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::Node > >, osgTerrain::DataSet::DestinationData::ModelList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationData) +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationData) I_BaseType(osg::Referenced); I_Constructor1(IN, osgTerrain::DataSet *, dataSet, Properties::NON_EXPLICIT, @@ -834,7 +834,7 @@ BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::DestinationTile::Position) I_EnumLabel(osgTerrain::DataSet::DestinationTile::NUMBER_OF_POSITIONS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationTile) +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::DestinationTile) I_BaseType(osg::Referenced); I_BaseType(osgTerrain::DataSet::SpatialProperties); I_Constructor0(____DestinationTile, @@ -1005,7 +1005,7 @@ BEGIN_ENUM_REFLECTOR(osgTerrain::DataSet::Source::ParameterPolicy) I_EnumLabel(osgTerrain::DataSet::Source::PREFER_FILE_SETTINGS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::DataSet::Source) +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::Source) I_BaseType(osg::Referenced); I_BaseType(osgTerrain::DataSet::SpatialProperties); I_Constructor0(____Source, @@ -1288,7 +1288,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::map< const osg::CoordinateSystemNode * COMMA osgTerrain::DataSet::SpatialProperties >, osgTerrain::DataSet::SourceData::SpatialPropertiesMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::DataSet::SourceData) +BEGIN_OBJECT_REFLECTOR(osgTerrain::DataSet::SourceData) I_BaseType(osg::Referenced); I_BaseType(osgTerrain::DataSet::SpatialProperties); I_ConstructorWithDefaults1(IN, osgTerrain::DataSet::Source *, source, 0, diff --git a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp index d14be2272..737c018fd 100644 --- a/src/osgWrappers/osgTerrain/HeightFieldNode.cpp +++ b/src/osgWrappers/osgTerrain/HeightFieldNode.cpp @@ -26,7 +26,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgTerrain::HeightFieldNode) +BEGIN_OBJECT_REFLECTOR(osgTerrain::HeightFieldNode) I_BaseType(osg::Group); I_Constructor0(____HeightFieldNode, "", diff --git a/src/osgWrappers/osgText/FadeText.cpp b/src/osgWrappers/osgText/FadeText.cpp index 5da32ae55..7571b0565 100644 --- a/src/osgWrappers/osgText/FadeText.cpp +++ b/src/osgWrappers/osgText/FadeText.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::FadeText) +BEGIN_OBJECT_REFLECTOR(osgText::FadeText) I_BaseType(osgText::Text); I_Constructor0(____FadeText, "", diff --git a/src/osgWrappers/osgText/Font.cpp b/src/osgWrappers/osgText/Font.cpp index 6c3f1e82e..ea844b250 100644 --- a/src/osgWrappers/osgText/Font.cpp +++ b/src/osgWrappers/osgText/Font.cpp @@ -28,7 +28,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font) +BEGIN_OBJECT_REFLECTOR(osgText::Font) I_BaseType(osg::Object); I_ConstructorWithDefaults1(IN, osgText::Font::FontImplementation *, implementation, 0, Properties::NON_EXPLICIT, @@ -295,7 +295,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::FontImplementation) I_PublicMemberProperty(osgText::Font *, _facade); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Font::Glyph) +BEGIN_OBJECT_REFLECTOR(osgText::Font::Glyph) I_BaseType(osg::Image); I_Constructor0(____Glyph, "", diff --git a/src/osgWrappers/osgText/Text.cpp b/src/osgWrappers/osgText/Text.cpp index 178251aaa..7c4abb362 100644 --- a/src/osgWrappers/osgText/Text.cpp +++ b/src/osgWrappers/osgText/Text.cpp @@ -107,7 +107,7 @@ BEGIN_ENUM_REFLECTOR(osgText::Text::ColorGradientMode) I_EnumLabel(osgText::Text::OVERALL); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgText::Text) +BEGIN_OBJECT_REFLECTOR(osgText::Text) I_BaseType(osg::Drawable); I_Constructor0(____Text, "", diff --git a/src/osgWrappers/osgUtil/CullVisitor.cpp b/src/osgWrappers/osgUtil/CullVisitor.cpp index b3f24dca4..963799d84 100644 --- a/src/osgWrappers/osgUtil/CullVisitor.cpp +++ b/src/osgWrappers/osgUtil/CullVisitor.cpp @@ -50,7 +50,7 @@ TYPE_NAME_ALIAS(osg::Matrix::value_type, osgUtil::CullVisitor::value_type); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::CullVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::CullVisitor) I_BaseType(osg::NodeVisitor); I_BaseType(osg::CullStack); I_Constructor0(____CullVisitor, diff --git a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp index fd9855987..7cd134516 100644 --- a/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp +++ b/src/osgWrappers/osgUtil/DelaunayTriangulator.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::DelaunayConstraint) +BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayConstraint) I_BaseType(osg::Geometry); I_Constructor0(____DelaunayConstraint, "", @@ -91,7 +91,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::DelaunayConstraint > >, osgUtil::DelaunayTriangulator::linelist); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::DelaunayTriangulator) +BEGIN_OBJECT_REFLECTOR(osgUtil::DelaunayTriangulator) I_BaseType(osg::Referenced); I_Constructor0(____DelaunayTriangulator, "", diff --git a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp index f87a5d34a..f3e77be0b 100644 --- a/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp +++ b/src/osgWrappers/osgUtil/DisplayRequirementsVisitor.cpp @@ -24,7 +24,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::DisplayRequirementsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::DisplayRequirementsVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____DisplayRequirementsVisitor, "Default to traversing all children, and requiresDoubleBuffer, requiresRGB and requiresDepthBuffer to true and with alpha and stencil off. ", diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index 24af4ca42..ea49e5e80 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -40,7 +40,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::GLObjectsVisitor::ModeValues) I_EnumLabel(osgUtil::GLObjectsVisitor::CHECK_BLACK_LISTED_MODES); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) I_BaseType(osg::NodeVisitor); I_ConstructorWithDefaults1(IN, osgUtil::GLObjectsVisitor::Mode, mode, osgUtil::GLObjectsVisitor::COMPILE_DISPLAY_LISTS|osgUtil::GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES|osgUtil::GLObjectsVisitor::CHECK_BLACK_LISTED_MODES, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp index c03db63ed..5fdfa26f3 100644 --- a/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HalfWayMapGenerator.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::HalfWayMapGenerator) +BEGIN_OBJECT_REFLECTOR(osgUtil::HalfWayMapGenerator) I_BaseType(osgUtil::CubeMapGenerator); I_ConstructorWithDefaults2(IN, const osg::Vec3 &, light_direction, , IN, int, texture_size, 64, ____HalfWayMapGenerator__C5_osg_Vec3_R1__int, diff --git a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp index 72eb2daa2..92099173b 100644 --- a/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/HighlightMapGenerator.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::HighlightMapGenerator) +BEGIN_OBJECT_REFLECTOR(osgUtil::HighlightMapGenerator) I_BaseType(osgUtil::CubeMapGenerator); I_ConstructorWithDefaults4(IN, const osg::Vec3 &, light_direction, , IN, const osg::Vec4 &, light_color, , IN, float, specular_exponent, , IN, int, texture_size, 64, ____HighlightMapGenerator__C5_osg_Vec3_R1__C5_osg_Vec4_R1__float__int, diff --git a/src/osgWrappers/osgUtil/IntersectVisitor.cpp b/src/osgWrappers/osgUtil/IntersectVisitor.cpp index c46678f98..647cf8017 100644 --- a/src/osgWrappers/osgUtil/IntersectVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectVisitor.cpp @@ -196,7 +196,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::IntersectVisitor::LODSelectionMode) I_EnumLabel(osgUtil::IntersectVisitor::USE_SEGMENT_START_POINT_AS_EYE_POINT_FOR_LOD_LEVEL_SELECTION); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::IntersectVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____IntersectVisitor, "", @@ -302,7 +302,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::IntersectVisitor) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::PickVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::PickVisitor) I_BaseType(osgUtil::IntersectVisitor); I_Constructor5(IN, const osg::Viewport *, viewport, IN, const osg::Matrixd &, proj, IN, const osg::Matrixd &, view, IN, float, mx, IN, float, my, ____PickVisitor__C5_osg_Viewport_P1__C5_osg_Matrixd_R1__C5_osg_Matrixd_R1__float__float, diff --git a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp index 6fbd4806a..d057ded76 100644 --- a/src/osgWrappers/osgUtil/IntersectionVisitor.cpp +++ b/src/osgWrappers/osgUtil/IntersectionVisitor.cpp @@ -32,7 +32,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectionVisitor) I_BaseType(osg::NodeVisitor); I_ConstructorWithDefaults2(IN, osgUtil::Intersector *, intersector, 0, IN, osgUtil::IntersectionVisitor::ReadCallback *, readCallback, 0, ____IntersectionVisitor__Intersector_P1__ReadCallback_P1, @@ -291,7 +291,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::Intersector > >, osgUtil::IntersectorGroup::Intersectors); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::IntersectorGroup) +BEGIN_OBJECT_REFLECTOR(osgUtil::IntersectorGroup) I_BaseType(osgUtil::Intersector); I_Constructor0(____IntersectorGroup, "", diff --git a/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp b/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp index cd278d30e..95c6e2ce8 100644 --- a/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp +++ b/src/osgWrappers/osgUtil/LineSegmentIntersector.cpp @@ -27,7 +27,7 @@ TYPE_NAME_ALIAS(std::multiset< osgUtil::LineSegmentIntersector::Intersection >, osgUtil::LineSegmentIntersector::Intersections); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::LineSegmentIntersector) +BEGIN_OBJECT_REFLECTOR(osgUtil::LineSegmentIntersector) I_BaseType(osgUtil::Intersector); I_Constructor2(IN, const osg::Vec3d &, start, IN, const osg::Vec3d &, end, ____LineSegmentIntersector__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp index 594b96c38..abddc962e 100644 --- a/src/osgWrappers/osgUtil/Optimizer.cpp +++ b/src/osgWrappers/osgUtil/Optimizer.cpp @@ -39,7 +39,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::BaseOptimizerVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::BaseOptimizerVisitor) I_BaseType(osg::NodeVisitor); I_Constructor2(IN, osgUtil::Optimizer *, optimizer, IN, unsigned int, operation, ____BaseOptimizerVisitor__Optimizer_P1__unsigned_int, @@ -88,7 +88,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Optimizer::OptimizationOptions) I_EnumLabel(osgUtil::Optimizer::ALL_OPTIMIZATIONS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer) +BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer) I_Constructor0(____Optimizer, "", ""); @@ -181,7 +181,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::CheckGeometryVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CheckGeometryVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -202,7 +202,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::CombineLODsVisitor::GroupList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineLODsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineLODsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -222,7 +222,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineLODsVisitor) I_PublicMemberProperty(osgUtil::Optimizer::CombineLODsVisitor::GroupList, _groupList); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineStaticTransformsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CombineStaticTransformsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -243,7 +243,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::CopySharedSubgraphsVisitor::SharedNodeList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::CopySharedSubgraphsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::CopySharedSubgraphsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -267,7 +267,7 @@ TYPE_NAME_ALIAS(std::vector< osg::NodePath >, osgUtil::Optimizer::FlattenBillboa TYPE_NAME_ALIAS(std::map< osg::Billboard * COMMA osgUtil::Optimizer::FlattenBillboardVisitor::NodePathList >, osgUtil::Optimizer::FlattenBillboardVisitor::BillboardNodePathMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenBillboardVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenBillboardVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -292,7 +292,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenBillboardVisitor) I_PublicMemberProperty(osgUtil::Optimizer::FlattenBillboardVisitor::BillboardNodePathMap, _billboards); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -336,7 +336,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsVisit ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::IsOperationPermissibleForObjectCallback) I_BaseType(osg::Referenced); I_Constructor0(____IsOperationPermissibleForObjectCallback, "", @@ -363,7 +363,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::IsOperationPermissibleForObj ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeodesVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeodesVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -382,7 +382,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeodesVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeometryVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::MergeGeometryVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -449,7 +449,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveEmptyNodesVisitor::NodeList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveEmptyNodesVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveEmptyNodesVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -476,7 +476,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor::NodeList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveLoadedProxyNodesVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -498,7 +498,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Node * >, osgUtil::Optimizer::RemoveRedundantNodesVisitor::NodeList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::RemoveRedundantNodesVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -530,7 +530,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::SpatializeGroupsVisitor::GroupsToDivideList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::SpatializeGroupsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::SpatializeGroupsVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -555,7 +555,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::SpatializeGroupsVisitor) I_PublicMemberProperty(osgUtil::Optimizer::SpatializeGroupsVisitor::GroupsToDivideList, _groupsToDivideList); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::StateVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StateVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -584,7 +584,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::StateVisitor) ""); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::StaticObjectDetectionVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::StaticObjectDetectionVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -605,7 +605,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::set< osg::Group * >, osgUtil::Optimizer::TessellateVisitor::GroupList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::TessellateVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TessellateVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -740,7 +740,7 @@ BEGIN_VALUE_REFLECTOR(osgUtil::Optimizer::TextureAtlasBuilder) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureAtlasVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureAtlasVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, @@ -777,7 +777,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureAtlasVisitor) 0); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::TextureVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults7(IN, bool, changeAutoUnRef, , IN, bool, valueAutoUnRef, , IN, bool, changeClientImageStorage, , IN, bool, valueClientImageStorage, , IN, bool, changeAnisotropy, , IN, float, valueAnisotropy, , IN, osgUtil::Optimizer *, optimizer, 0, ____TextureVisitor__bool__bool__bool__bool__bool__float__Optimizer_P1, diff --git a/src/osgWrappers/osgUtil/PlaneIntersector.cpp b/src/osgWrappers/osgUtil/PlaneIntersector.cpp index 504cbff60..7d13d8e13 100644 --- a/src/osgWrappers/osgUtil/PlaneIntersector.cpp +++ b/src/osgWrappers/osgUtil/PlaneIntersector.cpp @@ -28,7 +28,7 @@ TYPE_NAME_ALIAS(std::vector< osgUtil::PlaneIntersector::Intersection >, osgUtil::PlaneIntersector::Intersections); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::PlaneIntersector) +BEGIN_OBJECT_REFLECTOR(osgUtil::PlaneIntersector) I_BaseType(osgUtil::Intersector); I_ConstructorWithDefaults2(IN, const osg::Plane &, plane, , IN, const osg::Polytope &, boundingPolytope, osg::Polytope(), ____PlaneIntersector__C5_osg_Plane_R1__C5_osg_Polytope_R1, diff --git a/src/osgWrappers/osgUtil/PolytopeIntersector.cpp b/src/osgWrappers/osgUtil/PolytopeIntersector.cpp index bb7b5a301..827ecda42 100644 --- a/src/osgWrappers/osgUtil/PolytopeIntersector.cpp +++ b/src/osgWrappers/osgUtil/PolytopeIntersector.cpp @@ -26,7 +26,7 @@ TYPE_NAME_ALIAS(std::set< osgUtil::PolytopeIntersector::Intersection >, osgUtil::PolytopeIntersector::Intersections); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::PolytopeIntersector) +BEGIN_OBJECT_REFLECTOR(osgUtil::PolytopeIntersector) I_BaseType(osgUtil::Intersector); I_Constructor1(IN, const osg::Polytope &, polytope, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp index 1a0e242b2..09afee61a 100644 --- a/src/osgWrappers/osgUtil/PositionalStateContainer.cpp +++ b/src/osgWrappers/osgUtil/PositionalStateContainer.cpp @@ -32,7 +32,7 @@ TYPE_NAME_ALIAS(std::vector< osgUtil::PositionalStateContainer::AttrMatrixPair > TYPE_NAME_ALIAS(std::map< unsigned int COMMA osgUtil::PositionalStateContainer::AttrMatrixList >, osgUtil::PositionalStateContainer::TexUnitAttrMatrixListMap); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::PositionalStateContainer) +BEGIN_OBJECT_REFLECTOR(osgUtil::PositionalStateContainer) I_BaseType(osg::Object); I_Constructor0(____PositionalStateContainer, "", diff --git a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp index 12ab220f6..7b3930c4a 100644 --- a/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp +++ b/src/osgWrappers/osgUtil/ReflectionMapGenerator.cpp @@ -21,7 +21,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::ReflectionMapGenerator) +BEGIN_OBJECT_REFLECTOR(osgUtil::ReflectionMapGenerator) I_BaseType(osgUtil::CubeMapGenerator); I_ConstructorWithDefaults1(IN, int, texture_size, 64, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgUtil/RenderBin.cpp b/src/osgWrappers/osgUtil/RenderBin.cpp index a11580825..82c55d97a 100644 --- a/src/osgWrappers/osgUtil/RenderBin.cpp +++ b/src/osgWrappers/osgUtil/RenderBin.cpp @@ -48,7 +48,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::RenderBin::SortMode) I_EnumLabel(osgUtil::RenderBin::SORT_BACK_TO_FRONT); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderBin) +BEGIN_OBJECT_REFLECTOR(osgUtil::RenderBin) I_BaseType(osg::Object); I_Constructor0(____RenderBin, "", diff --git a/src/osgWrappers/osgUtil/RenderLeaf.cpp b/src/osgWrappers/osgUtil/RenderLeaf.cpp index d59e4d58d..b8ce85990 100644 --- a/src/osgWrappers/osgUtil/RenderLeaf.cpp +++ b/src/osgWrappers/osgUtil/RenderLeaf.cpp @@ -25,7 +25,7 @@ #include -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderLeaf) +BEGIN_OBJECT_REFLECTOR(osgUtil::RenderLeaf) I_BaseType(osg::Referenced); I_ConstructorWithDefaults4(IN, osg::Drawable *, drawable, , IN, osg::RefMatrix *, projection, , IN, osg::RefMatrix *, modelview, , IN, float, depth, 0.0f, ____RenderLeaf__osg_Drawable_P1__osg_RefMatrix_P1__osg_RefMatrix_P1__float, diff --git a/src/osgWrappers/osgUtil/RenderStage.cpp b/src/osgWrappers/osgUtil/RenderStage.cpp index 3d3fb59f8..9282b3e6a 100644 --- a/src/osgWrappers/osgUtil/RenderStage.cpp +++ b/src/osgWrappers/osgUtil/RenderStage.cpp @@ -37,7 +37,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::RenderStage) +BEGIN_OBJECT_REFLECTOR(osgUtil::RenderStage) I_BaseType(osgUtil::RenderBin); I_Constructor0(____RenderStage, "", diff --git a/src/osgWrappers/osgUtil/SceneView.cpp b/src/osgWrappers/osgUtil/SceneView.cpp index 674a628a7..ff82cf4e8 100644 --- a/src/osgWrappers/osgUtil/SceneView.cpp +++ b/src/osgWrappers/osgUtil/SceneView.cpp @@ -69,7 +69,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::SceneView::FusionDistanceMode) I_EnumLabel(osgUtil::SceneView::PROPORTIONAL_TO_SCREEN_DISTANCE); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::SceneView) +BEGIN_OBJECT_REFLECTOR(osgUtil::SceneView) I_BaseType(osg::Object); I_BaseType(osg::CullSettings); I_ConstructorWithDefaults1(IN, osg::DisplaySettings *, ds, NULL, diff --git a/src/osgWrappers/osgUtil/Simplifier.cpp b/src/osgWrappers/osgUtil/Simplifier.cpp index eec6d650e..7fe58a1a1 100644 --- a/src/osgWrappers/osgUtil/Simplifier.cpp +++ b/src/osgWrappers/osgUtil/Simplifier.cpp @@ -24,7 +24,7 @@ TYPE_NAME_ALIAS(std::vector< unsigned int >, osgUtil::Simplifier::IndexList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Simplifier) +BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier) I_BaseType(osg::NodeVisitor); I_ConstructorWithDefaults3(IN, float, sampleRatio, 1.0f, IN, float, maximumError, FLT_MAX, IN, float, maximumLength, 0.0, ____Simplifier__float__float__float, @@ -140,7 +140,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Simplifier) __void__setSmoothing__bool); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Simplifier::ContinueSimplificationCallback) +BEGIN_OBJECT_REFLECTOR(osgUtil::Simplifier::ContinueSimplificationCallback) I_BaseType(osg::Referenced); I_Constructor0(____ContinueSimplificationCallback, "", diff --git a/src/osgWrappers/osgUtil/SmoothingVisitor.cpp b/src/osgWrappers/osgUtil/SmoothingVisitor.cpp index c32f5875e..93009f82f 100644 --- a/src/osgWrappers/osgUtil/SmoothingVisitor.cpp +++ b/src/osgWrappers/osgUtil/SmoothingVisitor.cpp @@ -22,7 +22,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::SmoothingVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::SmoothingVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____SmoothingVisitor, "default to traversing all children. ", diff --git a/src/osgWrappers/osgUtil/StateGraph.cpp b/src/osgWrappers/osgUtil/StateGraph.cpp index ecc743c44..a73e81e7f 100644 --- a/src/osgWrappers/osgUtil/StateGraph.cpp +++ b/src/osgWrappers/osgUtil/StateGraph.cpp @@ -34,7 +34,7 @@ TYPE_NAME_ALIAS(std::map< const osg::StateSet * COMMA osg::ref_ptr< osgUtil::St TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osgUtil::RenderLeaf > >, osgUtil::StateGraph::LeafList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::StateGraph) +BEGIN_OBJECT_REFLECTOR(osgUtil::StateGraph) I_BaseType(osg::Referenced); I_Constructor0(____StateGraph, "", diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index fd7a65002..3d19df5c9 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -47,7 +47,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Statistics::StatsType) I_EnumLabel(osgUtil::Statistics::STAT_RESTART); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Statistics) +BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) I_BaseType(osg::PrimitiveFunctor); I_Constructor0(____Statistics, "", @@ -228,7 +228,7 @@ TYPE_NAME_ALIAS(std::set< osg::Drawable * >, osgUtil::StatsVisitor::DrawableSet) TYPE_NAME_ALIAS(std::set< osg::StateSet * >, osgUtil::StatsVisitor::StateSetSet); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::StatsVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::StatsVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____StatsVisitor, "", diff --git a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp index a8598e3f6..acba2b519 100644 --- a/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp +++ b/src/osgWrappers/osgUtil/TangentSpaceGenerator.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::TangentSpaceGenerator) +BEGIN_OBJECT_REFLECTOR(osgUtil::TangentSpaceGenerator) I_BaseType(osg::Referenced); I_Constructor0(____TangentSpaceGenerator, "", diff --git a/src/osgWrappers/osgUtil/Tessellator.cpp b/src/osgWrappers/osgUtil/Tessellator.cpp index 4f379561c..79c620708 100644 --- a/src/osgWrappers/osgUtil/Tessellator.cpp +++ b/src/osgWrappers/osgUtil/Tessellator.cpp @@ -40,7 +40,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Tessellator::TessellationType) I_EnumLabel(osgUtil::Tessellator::TESS_TYPE_POLYGONS); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Tessellator) +BEGIN_OBJECT_REFLECTOR(osgUtil::Tessellator) I_BaseType(osg::Referenced); I_Constructor0(____Tessellator, "", @@ -147,7 +147,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::vector< osg::Vec3 * >, osgUtil::Tessellator::Prim::VecList); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::Tessellator::Prim) +BEGIN_OBJECT_REFLECTOR(osgUtil::Tessellator::Prim) I_BaseType(osg::Referenced); I_Constructor1(IN, GLenum, mode, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp index 859573fd8..918994aeb 100644 --- a/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp +++ b/src/osgWrappers/osgUtil/TransformAttributeFunctor.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::TransformAttributeFunctor) +BEGIN_OBJECT_REFLECTOR(osgUtil::TransformAttributeFunctor) I_BaseType(osg::Drawable::AttributeFunctor); I_Constructor1(IN, const osg::Matrix &, m, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgUtil/TransformCallback.cpp b/src/osgWrappers/osgUtil/TransformCallback.cpp index e46b0a5b6..b53113dcf 100644 --- a/src/osgWrappers/osgUtil/TransformCallback.cpp +++ b/src/osgWrappers/osgUtil/TransformCallback.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::TransformCallback) +BEGIN_OBJECT_REFLECTOR(osgUtil::TransformCallback) I_BaseType(osg::NodeCallback); I_Constructor3(IN, const osg::Vec3 &, pivot, IN, const osg::Vec3 &, axis, IN, float, angularVelocity, ____TransformCallback__C5_osg_Vec3_R1__C5_osg_Vec3_R1__float, diff --git a/src/osgWrappers/osgUtil/TriStripVisitor.cpp b/src/osgWrappers/osgUtil/TriStripVisitor.cpp index cea3e4ec3..3a77a718e 100644 --- a/src/osgWrappers/osgUtil/TriStripVisitor.cpp +++ b/src/osgWrappers/osgUtil/TriStripVisitor.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::TriStripVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::TriStripVisitor) I_BaseType(osgUtil::BaseOptimizerVisitor); I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgUtil/UpdateVisitor.cpp b/src/osgWrappers/osgUtil/UpdateVisitor.cpp index 3c5efc3a6..f1fac7ae0 100644 --- a/src/osgWrappers/osgUtil/UpdateVisitor.cpp +++ b/src/osgWrappers/osgUtil/UpdateVisitor.cpp @@ -30,7 +30,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgUtil::UpdateVisitor) +BEGIN_OBJECT_REFLECTOR(osgUtil::UpdateVisitor) I_BaseType(osg::NodeVisitor); I_Constructor0(____UpdateVisitor, "", diff --git a/src/osgWrappers/osgViewer/CompositeViewer.cpp b/src/osgWrappers/osgViewer/CompositeViewer.cpp index 01909540e..0a28ce57a 100644 --- a/src/osgWrappers/osgViewer/CompositeViewer.cpp +++ b/src/osgWrappers/osgViewer/CompositeViewer.cpp @@ -43,7 +43,7 @@ BEGIN_ENUM_REFLECTOR(osgViewer::CompositeViewer::BarrierPosition) I_EnumLabel(osgViewer::CompositeViewer::AfterSwapBuffers); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::CompositeViewer) +BEGIN_OBJECT_REFLECTOR(osgViewer::CompositeViewer) I_BaseType(osg::Referenced); I_Constructor0(____CompositeViewer, "", diff --git a/src/osgWrappers/osgViewer/HelpHandler.cpp b/src/osgWrappers/osgViewer/HelpHandler.cpp index dbeb29488..3f8064ccf 100644 --- a/src/osgWrappers/osgViewer/HelpHandler.cpp +++ b/src/osgWrappers/osgViewer/HelpHandler.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::HelpHandler) +BEGIN_OBJECT_REFLECTOR(osgViewer::HelpHandler) I_BaseType(osgGA::GUIEventHandler); I_ConstructorWithDefaults1(IN, osg::ApplicationUsage *, au, 0, Properties::NON_EXPLICIT, diff --git a/src/osgWrappers/osgViewer/Scene.cpp b/src/osgWrappers/osgViewer/Scene.cpp index 90be2349c..c53b07017 100644 --- a/src/osgWrappers/osgViewer/Scene.cpp +++ b/src/osgWrappers/osgViewer/Scene.cpp @@ -23,7 +23,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::Scene) +BEGIN_OBJECT_REFLECTOR(osgViewer::Scene) I_VirtualBaseType(osg::Referenced); I_Constructor0(____Scene, "", diff --git a/src/osgWrappers/osgViewer/StatsHandler.cpp b/src/osgWrappers/osgViewer/StatsHandler.cpp index 50a773b1a..4c27a51ac 100644 --- a/src/osgWrappers/osgViewer/StatsHandler.cpp +++ b/src/osgWrappers/osgViewer/StatsHandler.cpp @@ -31,7 +31,7 @@ BEGIN_ENUM_REFLECTOR(osgViewer::StatsHandler::StatsType) I_EnumLabel(osgViewer::StatsHandler::LAST); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::StatsHandler) +BEGIN_OBJECT_REFLECTOR(osgViewer::StatsHandler) I_BaseType(osgGA::GUIEventHandler); I_Constructor0(____StatsHandler, "", diff --git a/src/osgWrappers/osgViewer/View.cpp b/src/osgWrappers/osgViewer/View.cpp index 4891d3e55..248a45978 100644 --- a/src/osgWrappers/osgViewer/View.cpp +++ b/src/osgWrappers/osgViewer/View.cpp @@ -29,7 +29,7 @@ #undef OUT #endif -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::EndOfDynamicDrawBlock) +BEGIN_OBJECT_REFLECTOR(osgViewer::EndOfDynamicDrawBlock) I_BaseType(osg::State::DynamicObjectRenderingCompletedCallback); I_Constructor1(IN, unsigned, int, Properties::NON_EXPLICIT, @@ -68,7 +68,7 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osgGA::GUIEventHandler > >, osgViewer::View::EventHandlers); -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::View) +BEGIN_OBJECT_REFLECTOR(osgViewer::View) I_BaseType(osg::View); I_BaseType(osgGA::GUIActionAdapter); I_Constructor0(____View, diff --git a/src/osgWrappers/osgViewer/Viewer.cpp b/src/osgWrappers/osgViewer/Viewer.cpp index efc7aa4b0..429fc3f1b 100644 --- a/src/osgWrappers/osgViewer/Viewer.cpp +++ b/src/osgWrappers/osgViewer/Viewer.cpp @@ -49,7 +49,7 @@ BEGIN_ENUM_REFLECTOR(osgViewer::Viewer::BarrierPosition) I_EnumLabel(osgViewer::Viewer::AfterSwapBuffers); END_REFLECTOR -BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgViewer::Viewer) +BEGIN_OBJECT_REFLECTOR(osgViewer::Viewer) I_BaseType(osgViewer::View); I_Constructor0(____Viewer, "",