diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp index 0bd5aa0e7..7c744591d 100644 --- a/src/osgWrappers/osg/BufferObject.cpp +++ b/src/osgWrappers/osg/BufferObject.cpp @@ -236,17 +236,17 @@ BEGIN_OBJECT_REFLECTOR(osg::BufferObject::Extensions) END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::DrawElements * >, osg::ElementsBufferObject::BufferEntryDrawElementstPair) +TYPE_NAME_ALIAS(std::pair< osg::BufferObject::BufferEntry COMMA osg::DrawElements * >, osg::ElementBufferObject::BufferEntryDrawElementstPair) -TYPE_NAME_ALIAS(std::vector< osg::ElementsBufferObject::BufferEntryDrawElementstPair >, osg::ElementsBufferObject::BufferEntryDrawElementsPairs) +TYPE_NAME_ALIAS(std::vector< osg::ElementBufferObject::BufferEntryDrawElementstPair >, osg::ElementBufferObject::BufferEntryDrawElementsPairs) -BEGIN_OBJECT_REFLECTOR(osg::ElementsBufferObject) +BEGIN_OBJECT_REFLECTOR(osg::ElementBufferObject) I_BaseType(osg::BufferObject); - I_Constructor0(____ElementsBufferObject, + I_Constructor0(____ElementBufferObject, "", ""); - I_ConstructorWithDefaults2(IN, const osg::ElementsBufferObject &, pbo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, - ____ElementsBufferObject__C5_ElementsBufferObject_R1__C5_CopyOp_R1, + I_ConstructorWithDefaults2(IN, const osg::ElementBufferObject &, pbo, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____ElementBufferObject__C5_ElementBufferObject_R1__C5_CopyOp_R1, "Copy constructor using CopyOp to manage deep vs shallow copy. ", ""); I_Method0(osg::Object *, cloneType, @@ -473,7 +473,7 @@ STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::DrawEle STD_PAIR_REFLECTOR(std::pair< osg::BufferObject::BufferEntry COMMA osg::Image * >) -STD_VECTOR_REFLECTOR(std::vector< osg::ElementsBufferObject::BufferEntryDrawElementstPair >) +STD_VECTOR_REFLECTOR(std::vector< osg::ElementBufferObject::BufferEntryDrawElementstPair >) STD_VECTOR_REFLECTOR(std::vector< osg::VertexBufferObject::BufferEntryArrayPair >) diff --git a/src/osgWrappers/osg/Geometry.cpp b/src/osgWrappers/osg/Geometry.cpp index c2556b758..b5eaa807e 100644 --- a/src/osgWrappers/osg/Geometry.cpp +++ b/src/osgWrappers/osg/Geometry.cpp @@ -577,9 +577,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) __osg_VertexBufferObject_P1__getOrCreateVertexBufferObject, "", ""); - I_Method0(osg::ElementsBufferObject *, getOrCreateElementsBufferObject, + I_Method0(osg::ElementBufferObject *, getOrCreateElementBufferObject, Properties::NON_VIRTUAL, - __osg_ElementsBufferObject_P1__getOrCreateElementsBufferObject, + __osg_ElementBufferObject_P1__getOrCreateElementBufferObject, "", ""); I_Method1(void, setFastPathHint, IN, bool, on, @@ -727,10 +727,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry) __void__addVertexBufferObjectIfRequired__osg_Array_P1, "", ""); - I_ProtectedMethod1(void, addElementsBufferObjectIfRequired, IN, osg::PrimitiveSet *, primitiveSet, + I_ProtectedMethod1(void, addElementBufferObjectIfRequired, IN, osg::PrimitiveSet *, primitiveSet, Properties::NON_VIRTUAL, Properties::NON_CONST, - __void__addElementsBufferObjectIfRequired__osg_PrimitiveSet_P1, + __void__addElementBufferObjectIfRequired__osg_PrimitiveSet_P1, "", ""); I_SimpleProperty(osg::Array *, ColorArray, diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index b0fd2b147..b26ee881b 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -256,40 +256,40 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElements) __void__dirty, "Dirty the primitive, which increments the modified count, to force buffer objects to update. ", ""); - I_Method1(void, setElementsBufferObject, IN, osg::ElementsBufferObject *, ebo, + I_Method1(void, setElementBufferObject, IN, osg::ElementBufferObject *, ebo, Properties::NON_VIRTUAL, - __void__setElementsBufferObject__osg_ElementsBufferObject_P1, - "Set the ElementsBufferObject. ", + __void__setElementBufferObject__osg_ElementBufferObject_P1, + "Set the ElementBufferObject. ", ""); - I_Method0(osg::ElementsBufferObject *, getElementsBufferObject, + I_Method0(osg::ElementBufferObject *, getElementBufferObject, Properties::NON_VIRTUAL, - __osg_ElementsBufferObject_P1__getElementsBufferObject, - "Get the ElementsBufferObject. ", + __osg_ElementBufferObject_P1__getElementBufferObject, + "Get the ElementBufferObject. ", "If no EBO is assigned returns NULL "); - I_Method0(const osg::ElementsBufferObject *, getElementsBufferObject, + I_Method0(const osg::ElementBufferObject *, getElementBufferObject, Properties::NON_VIRTUAL, - __C5_osg_ElementsBufferObject_P1__getElementsBufferObject, - "Get the const ElementsBufferObject. ", + __C5_osg_ElementBufferObject_P1__getElementBufferObject, + "Get the const ElementBufferObject. ", "If no EBO is assigned returns NULL "); - I_Method1(void, setElementsBufferObjectIndex, IN, unsigned int, index, + I_Method1(void, setElementBufferObjectIndex, IN, unsigned int, index, Properties::NON_VIRTUAL, - __void__setElementsBufferObjectIndex__unsigned_int, - "Set the index into the ElementsBufferObject, if used. ", + __void__setElementBufferObjectIndex__unsigned_int, + "Set the index into the ElementBufferObject, if used. ", ""); - I_Method0(unsigned int, getElementsBufferObjectIndex, + I_Method0(unsigned int, getElementBufferObjectIndex, Properties::NON_VIRTUAL, - __unsigned_int__getElementsBufferObjectIndex, - "Get the index into the ElementsBufferObject, if used. ", + __unsigned_int__getElementBufferObjectIndex, + "Get the index into the ElementBufferObject, if used. ", ""); I_SimpleProperty(osg::DrawElements *, DrawElements, __DrawElements_P1__getDrawElements, 0); - I_SimpleProperty(osg::ElementsBufferObject *, ElementsBufferObject, - __osg_ElementsBufferObject_P1__getElementsBufferObject, - __void__setElementsBufferObject__osg_ElementsBufferObject_P1); - I_SimpleProperty(unsigned int, ElementsBufferObjectIndex, - __unsigned_int__getElementsBufferObjectIndex, - __void__setElementsBufferObjectIndex__unsigned_int); + I_SimpleProperty(osg::ElementBufferObject *, ElementBufferObject, + __osg_ElementBufferObject_P1__getElementBufferObject, + __void__setElementBufferObject__osg_ElementBufferObject_P1); + I_SimpleProperty(unsigned int, ElementBufferObjectIndex, + __unsigned_int__getElementBufferObjectIndex, + __void__setElementBufferObjectIndex__unsigned_int); END_REFLECTOR TYPE_NAME_ALIAS(osg::VectorGLubyte, osg::DrawElementsUByte::vector_type) diff --git a/src/osgWrappers/osg/State.cpp b/src/osgWrappers/osg/State.cpp index 516ee04d5..9768db491 100644 --- a/src/osgWrappers/osg/State.cpp +++ b/src/osgWrappers/osg/State.cpp @@ -10,6 +10,8 @@ #include #include +#include +#include #include #include #include @@ -322,11 +324,76 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __void__dirtyAllVertexArrays, "dirty the vertex, normal, color, tex coords, secondary color, fog coord and index arrays. ", ""); + I_Method1(void, setCurrentVertexBufferObject, IN, osg::VertexBufferObject *, vbo, + Properties::NON_VIRTUAL, + __void__setCurrentVertexBufferObject__osg_VertexBufferObject_P1, + "", + ""); + I_Method0(const osg::VertexBufferObject *, getCurrentVertexBufferObject, + Properties::NON_VIRTUAL, + __C5_VertexBufferObject_P1__getCurrentVertexBufferObject, + "", + ""); + I_Method1(void, bindVertexBufferObject, IN, const osg::VertexBufferObject *, vbo, + Properties::NON_VIRTUAL, + __void__bindVertexBufferObject__C5_osg_VertexBufferObject_P1, + "", + ""); + I_Method0(void, unbindVertexBufferObject, + Properties::NON_VIRTUAL, + __void__unbindVertexBufferObject, + "", + ""); + I_Method1(void, setCurrentElementBufferObject, IN, osg::ElementBufferObject *, ebo, + Properties::NON_VIRTUAL, + __void__setCurrentElementBufferObject__osg_ElementBufferObject_P1, + "", + ""); + I_Method0(const osg::ElementBufferObject *, getCurrentElementBufferObject, + Properties::NON_VIRTUAL, + __C5_ElementBufferObject_P1__getCurrentElementBufferObject, + "", + ""); + I_Method1(void, bindElementBufferObject, IN, const osg::ElementBufferObject *, ebo, + Properties::NON_VIRTUAL, + __void__bindElementBufferObject__C5_osg_ElementBufferObject_P1, + "", + ""); + I_Method0(void, unbindElementBufferObject, + Properties::NON_VIRTUAL, + __void__unbindElementBufferObject, + "", + ""); + I_Method1(void, setCurrentPixelBufferObject, IN, osg::PixelBufferObject *, pbo, + Properties::NON_VIRTUAL, + __void__setCurrentPixelBufferObject__osg_PixelBufferObject_P1, + "", + ""); + I_Method0(const osg::PixelBufferObject *, getCurrentPixelBufferObject, + Properties::NON_VIRTUAL, + __C5_PixelBufferObject_P1__getCurrentPixelBufferObject, + "", + ""); + I_Method1(void, bindPixelBufferObject, IN, const osg::PixelBufferObject *, pbo, + Properties::NON_VIRTUAL, + __void__bindPixelBufferObject__C5_osg_PixelBufferObject_P1, + "", + ""); + I_Method0(void, unbindPixelBufferObject, + Properties::NON_VIRTUAL, + __void__unbindPixelBufferObject, + "", + ""); I_Method3(void, setInterleavedArrays, IN, GLenum, format, IN, GLsizei, stride, IN, const GLvoid *, pointer, Properties::NON_VIRTUAL, __void__setInterleavedArrays__GLenum__GLsizei__C5_GLvoid_P1, "Wrapper around glInterleavedArrays(. ", ".). also resets the internal array points and modes within osg::State to keep the other vertex array operations consistent. "); + I_Method1(void, setVertexPointer, IN, const osg::Array *, array, + Properties::NON_VIRTUAL, + __void__setVertexPointer__C5_Array_P1, + "Set the vertex pointer using an osg::Array, and manage any VBO that are required. ", + ""); I_Method4(void, setVertexPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr, Properties::NON_VIRTUAL, __void__setVertexPointer__GLint__GLenum__GLsizei__C5_GLvoid_P1, @@ -342,6 +409,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __void__dirtyVertexPointer, "", ""); + I_Method1(void, setNormalPointer, IN, const osg::Array *, array, + Properties::NON_VIRTUAL, + __void__setNormalPointer__C5_Array_P1, + "Set the normal pointer using an osg::Array, and manage any VBO that are required. ", + ""); I_Method3(void, setNormalPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr, Properties::NON_VIRTUAL, __void__setNormalPointer__GLenum__GLsizei__C5_GLvoid_P1, @@ -357,6 +429,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __void__dirtyNormalPointer, "", ""); + I_Method1(void, setColorPointer, IN, const osg::Array *, array, + Properties::NON_VIRTUAL, + __void__setColorPointer__C5_Array_P1, + "Set the color pointer using an osg::Array, and manage any VBO that are required. ", + ""); I_Method4(void, setColorPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr, Properties::NON_VIRTUAL, __void__setColorPointer__GLint__GLenum__GLsizei__C5_GLvoid_P1, @@ -377,6 +454,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __bool__isSecondaryColorSupported, "", ""); + I_Method1(void, setSecondaryColorPointer, IN, const osg::Array *, array, + Properties::NON_VIRTUAL, + __void__setSecondaryColorPointer__C5_Array_P1, + "Set the secondary color pointer using an osg::Array, and manage any VBO that are required. ", + ""); I_Method4(void, setSecondaryColorPointer, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr, Properties::NON_VIRTUAL, __void__setSecondaryColorPointer__GLint__GLenum__GLsizei__C5_GLvoid_P1, @@ -412,6 +494,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __bool__isFogCoordSupported, "", ""); + I_Method1(void, setFogCoordPointer, IN, const osg::Array *, array, + Properties::NON_VIRTUAL, + __void__setFogCoordPointer__C5_Array_P1, + "Set the fog coord pointer using an osg::Array, and manage any VBO that are required. ", + ""); I_Method3(void, setFogCoordPointer, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr, Properties::NON_VIRTUAL, __void__setFogCoordPointer__GLenum__GLsizei__C5_GLvoid_P1, @@ -427,6 +514,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __void__dirtyFogCoordPointer, "", ""); + I_Method2(void, setTexCoordPointer, IN, unsigned int, unit, IN, const osg::Array *, array, + Properties::NON_VIRTUAL, + __void__setTexCoordPointer__unsigned_int__C5_Array_P1, + "Set the tex coord pointer using an osg::Array, and manage any VBO that are required. ", + ""); I_Method5(void, setTexCoordPointer, IN, unsigned int, unit, IN, GLint, size, IN, GLenum, type, IN, GLsizei, stride, IN, const GLvoid *, ptr, Properties::NON_VIRTUAL, __void__setTexCoordPointer__unsigned_int__GLint__GLenum__GLsizei__C5_GLvoid_P1, @@ -472,6 +564,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __unsigned_int__getClientActiveTextureUnit, "Get the current tex coord array texture unit. ", ""); + I_Method3(void, setVertexAttribPointer, IN, unsigned int, unit, IN, const osg::Array *, array, IN, GLboolean, normalized, + Properties::NON_VIRTUAL, + __void__setVertexAttribPointer__unsigned_int__C5_Array_P1__GLboolean, + "Set the vertex attrib pointer using an osg::Array, and manage any VBO that are required. ", + ""); I_Method6(void, setVertexAttribPointer, IN, unsigned int, index, IN, GLint, size, IN, GLenum, type, IN, GLboolean, normalized, IN, GLsizei, stride, IN, const GLvoid *, ptr, Properties::NON_VIRTUAL, __void__setVertexAttribPointer__unsigned_int__GLint__GLenum__GLboolean__GLsizei__C5_GLvoid_P1, @@ -597,6 +694,11 @@ BEGIN_OBJECT_REFLECTOR(osg::State) __bool__checkGLErrors__C5_StateAttribute_P1, "", ""); + I_Method0(void, initializeExtensionProcs, + Properties::NON_VIRTUAL, + __void__initializeExtensionProcs, + "Initialize extension used by osg:State. ", + ""); @@ -644,12 +746,7 @@ BEGIN_OBJECT_REFLECTOR(osg::State) - I_ProtectedMethod0(void, initializeExtensionProcs, - Properties::NON_VIRTUAL, - Properties::NON_CONST, - __void__initializeExtensionProcs, - "", - ""); + I_SimpleProperty(bool, AbortRendering, __bool__getAbortRendering, 0); @@ -665,9 +762,21 @@ BEGIN_OBJECT_REFLECTOR(osg::State) I_SimpleProperty(unsigned int, ClientActiveTextureUnit, __unsigned_int__getClientActiveTextureUnit, __bool__setClientActiveTextureUnit__unsigned_int); + I_SimpleProperty(const osg::Array *, ColorPointer, + 0, + __void__setColorPointer__C5_Array_P1); I_SimpleProperty(unsigned int, ContextID, __unsigned_int__getContextID, __void__setContextID__unsigned_int); + I_SimpleProperty(osg::ElementBufferObject *, CurrentElementBufferObject, + 0, + __void__setCurrentElementBufferObject__osg_ElementBufferObject_P1); + I_SimpleProperty(osg::PixelBufferObject *, CurrentPixelBufferObject, + 0, + __void__setCurrentPixelBufferObject__osg_PixelBufferObject_P1); + I_SimpleProperty(osg::VertexBufferObject *, CurrentVertexBufferObject, + 0, + __void__setCurrentVertexBufferObject__osg_VertexBufferObject_P1); I_SimpleProperty(const osg::Viewport *, CurrentViewport, __C5_Viewport_P1__getCurrentViewport, 0); @@ -680,6 +789,9 @@ BEGIN_OBJECT_REFLECTOR(osg::State) I_SimpleProperty(osg::State::DynamicObjectRenderingCompletedCallback *, DynamicObjectRenderingCompletedCallback, __DynamicObjectRenderingCompletedCallback_P1__getDynamicObjectRenderingCompletedCallback, __void__setDynamicObjectRenderingCompletedCallback__DynamicObjectRenderingCompletedCallback_P1); + I_SimpleProperty(const osg::Array *, FogCoordPointer, + 0, + __void__setFogCoordPointer__C5_Array_P1); I_SimpleProperty(osg::FrameStamp *, FrameStamp, 0, __void__setFrameStamp__FrameStamp_P1); @@ -713,15 +825,24 @@ BEGIN_OBJECT_REFLECTOR(osg::State) I_SimpleProperty(const osg::Matrix &, ModelViewMatrix, __C5_osg_Matrix_R1__getModelViewMatrix, 0); + I_SimpleProperty(const osg::Array *, NormalPointer, + 0, + __void__setNormalPointer__C5_Array_P1); I_SimpleProperty(const osg::Matrix &, ProjectionMatrix, __C5_osg_Matrix_R1__getProjectionMatrix, 0); + I_SimpleProperty(const osg::Array *, SecondaryColorPointer, + 0, + __void__setSecondaryColorPointer__C5_Array_P1); I_SimpleProperty(osg::State::StateSetStack &, StateSetStack, __StateSetStack_R1__getStateSetStack, 0); I_SimpleProperty(unsigned int, StateSetStackSize, __unsigned_int__getStateSetStackSize, 0); + I_SimpleProperty(const osg::Array *, VertexPointer, + 0, + __void__setVertexPointer__C5_Array_P1); I_SimpleProperty(osg::Polytope, ViewFrustum, __Polytope__getViewFrustum, 0);