diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 58ee79129..de2bc4808 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Geode) I_Method1(void, accept, IN, osg::NodeVisitor &, nv); I_Method1(bool, addDrawable, IN, osg::Drawable *, drawable); I_Method1(bool, removeDrawable, IN, osg::Drawable *, drawable); - I_MethodWithDefaults2(bool, removeDrawable, IN, unsigned int, i, , IN, unsigned int, numDrawablesToRemove, 1); + I_MethodWithDefaults2(bool, removeDrawables, IN, unsigned int, i, , IN, unsigned int, numDrawablesToRemove, 1); I_Method2(bool, replaceDrawable, IN, osg::Drawable *, origDraw, IN, osg::Drawable *, newDraw); I_Method2(bool, setDrawable, IN, unsigned int, i, IN, osg::Drawable *, drawable); I_Method0(unsigned int, getNumDrawables); diff --git a/src/osgWrappers/osg/Group.cpp b/src/osgWrappers/osg/Group.cpp index 118605573..3e6641233 100644 --- a/src/osgWrappers/osg/Group.cpp +++ b/src/osgWrappers/osg/Group.cpp @@ -41,7 +41,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Group) I_Method1(bool, addChild, IN, osg::Node *, child); I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); I_Method1(bool, removeChild, IN, osg::Node *, child); - I_MethodWithDefaults2(bool, removeChild, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); + I_Method1(bool, removeChild, IN, unsigned int, pos); + I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove); I_Method2(bool, replaceChild, IN, osg::Node *, origChild, IN, osg::Node *, newChild); I_Method0(unsigned int, getNumChildren); I_Method2(bool, setChild, IN, unsigned int, i, IN, osg::Node *, node); diff --git a/src/osgWrappers/osg/LOD.cpp b/src/osgWrappers/osg/LOD.cpp index 1fdc94f4e..7804e08b8 100644 --- a/src/osgWrappers/osg/LOD.cpp +++ b/src/osgWrappers/osg/LOD.cpp @@ -52,7 +52,7 @@ BEGIN_OBJECT_REFLECTOR(osg::LOD) I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); I_Method1(bool, addChild, IN, osg::Node *, child); I_Method3(bool, addChild, IN, osg::Node *, child, IN, float, min, IN, float, max); - I_Method1(bool, removeChild, IN, osg::Node *, child); + I_MethodWithDefaults2(bool, removeChildren, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); I_Method1(void, setCenterMode, IN, osg::LOD::CenterMode, mode); I_Method0(osg::LOD::CenterMode, getCenterMode); I_Method1(void, setCenter, IN, const osg::Vec3 &, center); diff --git a/src/osgWrappers/osg/PagedLOD.cpp b/src/osgWrappers/osg/PagedLOD.cpp index 591fb7269..6fab73cb8 100644 --- a/src/osgWrappers/osg/PagedLOD.cpp +++ b/src/osgWrappers/osg/PagedLOD.cpp @@ -40,7 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::PagedLOD) I_Method1(bool, addChild, IN, osg::Node *, child); I_Method3(bool, addChild, IN, osg::Node *, child, IN, float, min, IN, float, max); I_MethodWithDefaults6(bool, addChild, IN, osg::Node *, child, , IN, float, min, , IN, float, max, , IN, const std::string &, filename, , IN, float, priorityOffset, 0.0f, IN, float, priorityScale, 1.0f); - I_Method1(bool, removeChild, IN, osg::Node *, child); + I_MethodWithDefaults2(bool, removeChildren, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); I_Method1(void, setDatabasePath, IN, const std::string &, path); I_Method0(const std::string &, getDatabasePath); I_Method2(void, setFileName, IN, unsigned int, childNo, IN, const std::string &, filename); diff --git a/src/osgWrappers/osg/ProxyNode.cpp b/src/osgWrappers/osg/ProxyNode.cpp index cce93d5a6..ab15d8f09 100644 --- a/src/osgWrappers/osg/ProxyNode.cpp +++ b/src/osgWrappers/osg/ProxyNode.cpp @@ -45,7 +45,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ProxyNode) I_Method1(void, traverse, IN, osg::NodeVisitor &, nv); I_Method1(bool, addChild, IN, osg::Node *, child); I_Method2(bool, addChild, IN, osg::Node *, child, IN, const std::string &, filename); - I_Method1(bool, removeChild, IN, osg::Node *, child); + I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove); I_Method1(void, setDatabasePath, IN, const std::string &, path); I_Method0(const std::string &, getDatabasePath); I_Method2(void, setFileName, IN, unsigned int, childNo, IN, const std::string &, filename); diff --git a/src/osgWrappers/osg/Switch.cpp b/src/osgWrappers/osg/Switch.cpp index 4cfe09a78..81a4288e6 100644 --- a/src/osgWrappers/osg/Switch.cpp +++ b/src/osgWrappers/osg/Switch.cpp @@ -43,8 +43,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Switch) I_Method2(bool, addChild, IN, osg::Node *, child, IN, bool, value); I_Method2(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child); I_Method3(bool, insertChild, IN, unsigned int, index, IN, osg::Node *, child, IN, bool, value); - I_Method1(bool, removeChild, IN, osg::Node *, child); - I_MethodWithDefaults2(bool, removeChild, IN, unsigned int, pos, , IN, unsigned int, numChildrenToRemove, 1); + I_Method2(bool, removeChildren, IN, unsigned int, pos, IN, unsigned int, numChildrenToRemove); I_Method2(void, setValue, IN, unsigned int, pos, IN, bool, value); I_Method1(bool, getValue, IN, unsigned int, pos); I_Method2(void, setChildValue, IN, const osg::Node *, child, IN, bool, value); diff --git a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp index 4e5493c74..ec57c02a4 100644 --- a/src/osgWrappers/osgParticle/PrecipitationEffect.cpp +++ b/src/osgWrappers/osgParticle/PrecipitationEffect.cpp @@ -90,6 +90,40 @@ END_REFLECTOR TYPE_NAME_ALIAS(std::map< osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell COMMA osgParticle::PrecipitationEffect::PrecipitationDrawable::DepthMatrixStartTime >, osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap); +BEGIN_OBJECT_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable) + I_BaseType(osg::Drawable); + I_Constructor0(); + I_ConstructorWithDefaults2(IN, const osgParticle::PrecipitationEffect::PrecipitationDrawable &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); + I_Method0(osg::Object *, cloneType); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + I_Method0(const char *, libraryName); + I_Method0(const char *, className); + I_Method1(bool, supports, IN, const osg::PrimitiveFunctor &, x); + I_Method1(void, accept, IN, osg::PrimitiveFunctor &, x); + I_Method1(bool, supports, IN, const osg::PrimitiveIndexFunctor &, x); + I_Method1(void, accept, IN, osg::PrimitiveIndexFunctor &, x); + I_Method1(void, setRequiresPreviousMatrix, IN, bool, flag); + I_Method0(bool, getRequiresPreviousMatrix); + I_Method1(void, setGeometry, IN, osg::Geometry *, geom); + I_Method0(osg::Geometry *, getGeometry); + I_Method0(const osg::Geometry *, getGeometry); + I_Method1(void, setDrawType, IN, GLenum, type); + I_Method0(GLenum, getDrawType); + I_Method1(void, setNumberOfVertices, IN, unsigned int, numVertices); + I_Method0(unsigned int, getNumberOfVertices); + I_Method1(void, drawImplementation, IN, osg::State &, state); + I_Method0(osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap &, getCurrentCellMatrixMap); + I_Method0(osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap &, getPreviousCellMatrixMap); + I_Method0(void, newFrame); + I_ReadOnlyProperty(osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap &, CurrentCellMatrixMap); + I_Property(GLenum, DrawType); + I_Property(osg::Geometry *, Geometry); + I_Property(unsigned int, NumberOfVertices); + I_ReadOnlyProperty(osgParticle::PrecipitationEffect::PrecipitationDrawable::CellMatrixMap &, PreviousCellMatrixMap); + I_Property(bool, RequiresPreviousMatrix); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osgParticle::PrecipitationEffect::PrecipitationDrawable::Cell) I_Constructor3(IN, int, in_i, IN, int, in_j, IN, int, in_k); END_REFLECTOR