diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index 12e81f54d..4ab72ffda 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -40,10 +40,10 @@ BEGIN_OBJECT_REFLECTOR(osg::DrawArrays) ____DrawArrays__GLenum, "", ""); - I_Constructor3(IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count, - ____DrawArrays__GLenum__GLint__GLsizei, - "", - ""); + I_ConstructorWithDefaults4(IN, GLenum, mode, , IN, GLint, first, , IN, GLsizei, count, , IN, int, numInstances, 0, + ____DrawArrays__GLenum__GLint__GLsizei__int, + "", + ""); I_ConstructorWithDefaults2(IN, const osg::DrawArrays &, da, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, ____DrawArrays__C5_DrawArrays_R1__C5_CopyOp_R1, "", @@ -139,8 +139,8 @@ END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElements) I_DeclaringFile("osg/PrimitiveSet"); I_BaseType(osg::PrimitiveSet); - I_ConstructorWithDefaults2(IN, osg::PrimitiveSet::Type, primType, osg::PrimitiveSet::PrimitiveType, IN, GLenum, mode, 0, - ____DrawElements__Type__GLenum, + I_ConstructorWithDefaults3(IN, osg::PrimitiveSet::Type, primType, osg::PrimitiveSet::PrimitiveType, IN, GLenum, mode, 0, IN, int, numInstances, 0, + ____DrawElements__Type__GLenum__int, "", ""); I_ConstructorWithDefaults2(IN, const osg::DrawElements &, copy, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, @@ -410,8 +410,8 @@ END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet) I_DeclaringFile("osg/PrimitiveSet"); I_BaseType(osg::Object); - I_ConstructorWithDefaults2(IN, osg::PrimitiveSet::Type, primType, osg::PrimitiveSet::PrimitiveType, IN, GLenum, mode, 0, - ____PrimitiveSet__Type__GLenum, + I_ConstructorWithDefaults3(IN, osg::PrimitiveSet::Type, primType, osg::PrimitiveSet::PrimitiveType, IN, GLenum, mode, 0, IN, int, numInstances, 0, + ____PrimitiveSet__Type__GLenum__int, "", ""); I_ConstructorWithDefaults2(IN, const osg::PrimitiveSet &, prim, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, @@ -463,6 +463,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet) __C5_DrawElements_P1__getDrawElements, "", ""); + I_Method1(void, setNumInstances, IN, int, n, + Properties::NON_VIRTUAL, + __void__setNumInstances__int, + "", + ""); + I_Method0(int, getNumInstances, + Properties::NON_VIRTUAL, + __int__getNumInstances, + "", + ""); I_Method1(void, setMode, IN, GLenum, mode, Properties::NON_VIRTUAL, __void__setMode__GLenum, @@ -550,6 +560,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet) I_SimpleProperty(unsigned int, ModifiedCount, __unsigned_int__getModifiedCount, __void__setModifiedCount__unsigned_int); + I_SimpleProperty(int, NumInstances, + 0, + __void__setNumInstances__int); I_SimpleProperty(unsigned int, TotalDataSize, __unsigned_int__getTotalDataSize, 0); diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index 243da5bcf..9a9a71778 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -386,6 +386,16 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __void__unbindPixelBufferObject, "", ""); + I_Method4(void, glDrawArraysInstanced, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count, IN, GLsizei, primcount, + Properties::NON_VIRTUAL, + __void__glDrawArraysInstanced__GLenum__GLint__GLsizei__GLsizei, + "", + ""); + I_Method5(void, glDrawElementsInstanced, IN, GLenum, mode, IN, GLsizei, count, IN, GLenum, type, IN, const GLvoid *, indices, IN, GLsizei, primcount, + Properties::NON_VIRTUAL, + __void__glDrawElementsInstanced__GLenum__GLsizei__GLenum__C5_GLvoid_P1__GLsizei, + "", + ""); I_Method3(void, setInterleavedArrays, IN, GLenum, format, IN, GLsizei, stride, IN, const GLvoid *, pointer, Properties::NON_VIRTUAL, __void__setInterleavedArrays__GLenum__GLsizei__C5_GLvoid_P1, diff --git a/src/osgWrappers/osg/Timer.cpp b/src/osgWrappers/osg/Timer.cpp index 3a23d8e00..4ab58751c 100644 --- a/src/osgWrappers/osg/Timer.cpp +++ b/src/osgWrappers/osg/Timer.cpp @@ -88,7 +88,7 @@ BEGIN_VALUE_REFLECTOR(osg::Timer) I_Method0(double, getSecondsPerTick, Properties::NON_VIRTUAL, __double__getSecondsPerTick, - "Get the the number of ticks per second. ", + "Get the the number of seconds per tick. ", ""); I_StaticMethod0(osg::Timer *, instance, __Timer_P1__instance_S,