FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further work on the new VBO support

Browse Source
This commit is contained in:
Robert Osfield
2007-04-27 14:52:30 +00:00
parent 2168eac1d4
commit 4968eb7136
11 changed files with 570 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgWrappers/osg/Drawable.cpp
View File

@@ -224,7 +224,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable)
"Return OpenGL display list for specified contextID. ",
"");
I_Method1(void, setUseVertexBufferObjects, IN, bool, flag,
Properties::NON_VIRTUAL,
Properties::VIRTUAL,
__void__setUseVertexBufferObjects__bool,
"When set to true, ignore the setUseDisplayList() settings, and hints to the drawImplementation method to use OpenGL vertex buffer objects for rendering. ",
"");
@@ -234,7 +234,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable)
"Return whether OpenGL vertex buffer objects should be used when supported by OpenGL driver. ",
"");
I_Method0(void, dirtyDisplayList,
Properties::NON_VIRTUAL,
Properties::VIRTUAL,
__void__dirtyDisplayList,
"Force a recompile on next draw() of any OpenGL display list associated with this geoset. ",
"");

80
src/osgWrappers/osg/Geometry.cpp
View File

@@ -11,6 +11,7 @@
#include <osgIntrospection/Attributes>
#include <osg/Array>
#include <osg/BufferObject>
#include <osg/CopyOp>
#include <osg/Drawable>
#include <osg/Geometry>
@@ -26,10 +27,14 @@
#undef OUT
#endif
TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayList)
TYPE_NAME_ALIAS(std::vector< osg::Geometry::ArrayData >, osg::Geometry::ArrayDataList)
TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::PrimitiveSet > >, osg::Geometry::PrimitiveSetList)
TYPE_NAME_ALIAS(std::vector< osg::Array * >, osg::Geometry::ArrayList)
TYPE_NAME_ALIAS(std::vector< osg::DrawElements * >, osg::Geometry::DrawElementsList)
BEGIN_ENUM_REFLECTOR(osg::Geometry::AttributeBinding)
I_EnumLabel(osg::Geometry::BIND_OFF);
I_EnumLabel(osg::Geometry::BIND_OVERALL);
@@ -402,14 +407,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
__unsigned_int__getNumTexCoordArrays,
"",
"");
I_Method0(osg::Geometry::ArrayList &, getTexCoordArrayList,
I_Method0(osg::Geometry::ArrayDataList &, getTexCoordArrayList,
Properties::NON_VIRTUAL,
__ArrayList_R1__getTexCoordArrayList,
__ArrayDataList_R1__getTexCoordArrayList,
"",
"");
I_Method0(const osg::Geometry::ArrayList &, getTexCoordArrayList,
I_Method0(const osg::Geometry::ArrayDataList &, getTexCoordArrayList,
Properties::NON_VIRTUAL,
__C5_ArrayList_R1__getTexCoordArrayList,
__C5_ArrayDataList_R1__getTexCoordArrayList,
"",
"");
I_Method2(void, setVertexAttribArray, IN, unsigned int, index, IN, osg::Array *, array,
@@ -482,14 +487,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
__unsigned_int__getNumVertexAttribArrays,
"",
"");
I_Method0(osg::Geometry::ArrayList &, getVertexAttribArrayList,
I_Method0(osg::Geometry::ArrayDataList &, getVertexAttribArrayList,
Properties::NON_VIRTUAL,
__ArrayList_R1__getVertexAttribArrayList,
__ArrayDataList_R1__getVertexAttribArrayList,
"",
"");
I_Method0(const osg::Geometry::ArrayList &, getVertexAttribArrayList,
I_Method0(const osg::Geometry::ArrayDataList &, getVertexAttribArrayList,
Properties::NON_VIRTUAL,
__C5_ArrayList_R1__getVertexAttribArrayList,
__C5_ArrayDataList_R1__getVertexAttribArrayList,
"",
"");
I_Method1(void, setPrimitiveSetList, IN, const osg::Geometry::PrimitiveSetList &, primitives,
@@ -547,6 +552,36 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
__unsigned_int__getPrimitiveSetIndex__C5_PrimitiveSet_P1,
"Get the index number of a primitive set, return a value between 0 and getNumPrimitiveSet()-1 if found, if not found then return getNumPrimitiveSet(). ",
"When checking for a valid find value use if ((value=geometry->getPrimitiveSetIndex(primitive))!=geometry.getNumPrimitiveSet())");
I_Method1(void, setUseVertexBufferObjects, IN, bool, flag,
Properties::VIRTUAL,
__void__setUseVertexBufferObjects__bool,
"When set to true, ignore the setUseDisplayList() settings, and hints to the drawImplementation method to use OpenGL vertex buffer objects for rendering. ",
"");
I_Method0(void, dirtyDisplayList,
Properties::VIRTUAL,
__void__dirtyDisplayList,
"Force a recompile on next draw() of any OpenGL display list associated with this geoset. ",
"");
I_Method1(bool, getArrayList, IN, osg::Geometry::ArrayList &, arrayList,
Properties::NON_VIRTUAL,
__bool__getArrayList__ArrayList_R1,
"",
"");
I_Method1(bool, getDrawElementsList, IN, osg::Geometry::DrawElementsList &, drawElementsList,
Properties::NON_VIRTUAL,
__bool__getDrawElementsList__DrawElementsList_R1,
"",
"");
I_Method0(osg::VertexBufferObject *, getOrCreateVertexBufferObject,
Properties::NON_VIRTUAL,
__osg_VertexBufferObject_P1__getOrCreateVertexBufferObject,
"",
"");
I_Method0(osg::ElementsBufferObject *, getOrCreateElementsBufferObject,
Properties::NON_VIRTUAL,
__osg_ElementsBufferObject_P1__getOrCreateElementsBufferObject,
"",
"");
I_Method1(void, setFastPathHint, IN, bool, on,
Properties::NON_VIRTUAL,
__void__setFastPathHint__bool,
@@ -686,6 +721,18 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
__void__computeCorrectBindingsAndArraySizes__Vec3ArrayData_R1__C5_char_P1,
"",
"");
I_ProtectedMethod1(void, addVertexBufferObjectIfRequired, IN, osg::Array *, array,
Properties::NON_VIRTUAL,
Properties::NON_CONST,
__void__addVertexBufferObjectIfRequired__osg_Array_P1,
"",
"");
I_ProtectedMethod1(void, addElementsBufferObjectIfRequired, IN, osg::PrimitiveSet *, primitiveSet,
Properties::NON_VIRTUAL,
Properties::NON_CONST,
__void__addElementsBufferObjectIfRequired__osg_PrimitiveSet_P1,
"",
"");
I_SimpleProperty(osg::Array *, ColorArray,
__Array_P1__getColorArray,
__void__setColorArray__Array_P1);
@@ -760,8 +807,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
0,
0,
0);
I_SimpleProperty(osg::Geometry::ArrayList &, TexCoordArrayList,
__ArrayList_R1__getTexCoordArrayList,
I_SimpleProperty(osg::Geometry::ArrayDataList &, TexCoordArrayList,
__ArrayDataList_R1__getTexCoordArrayList,
0);
I_ArrayProperty(const osg::Geometry::ArrayData &, TexCoordData,
__C5_ArrayData_R1__getTexCoordData__unsigned_int,
@@ -777,6 +824,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
0,
0,
0);
I_SimpleProperty(bool, UseVertexBufferObjects,
0,
__void__setUseVertexBufferObjects__bool);
I_SimpleProperty(osg::Array *, VertexArray,
__Array_P1__getVertexArray,
__void__setVertexArray__Array_P1);
@@ -787,8 +837,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Geometry)
0,
0,
0);
I_SimpleProperty(osg::Geometry::ArrayList &, VertexAttribArrayList,
__ArrayList_R1__getVertexAttribArrayList,
I_SimpleProperty(osg::Geometry::ArrayDataList &, VertexAttribArrayList,
__ArrayDataList_R1__getVertexAttribArrayList,
0);
I_ArrayProperty(osg::Geometry::AttributeBinding, VertexAttribBinding,
__AttributeBinding__getVertexAttribBinding__unsigned_int,
@@ -921,6 +971,10 @@ BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::PrimitiveSet >)
0);
END_REFLECTOR
STD_VECTOR_REFLECTOR(std::vector< osg::Array * >)
STD_VECTOR_REFLECTOR(std::vector< osg::DrawElements * >)
STD_VECTOR_REFLECTOR(std::vector< osg::Geometry::ArrayData >)
STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::PrimitiveSet > >)

26
src/osgWrappers/osg/PrimitiveSet.cpp
View File

@@ -241,6 +241,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElements)
____DrawElements__C5_DrawElements_R1__C5_CopyOp_R1,
"",
"");
I_Method0(osg::DrawElements *, getDrawElements,
Properties::VIRTUAL,
__DrawElements_P1__getDrawElements,
"",
"");
I_Method0(const osg::DrawElements *, getDrawElements,
Properties::VIRTUAL,
__C5_DrawElements_P1__getDrawElements,
"",
"");
I_Method1(void, setElementsBufferObject, IN, osg::ElementsBufferObject *, ebo,
Properties::NON_VIRTUAL,
__void__setElementsBufferObject__osg_ElementsBufferObject_P1,
@@ -266,6 +276,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::DrawElements)
__unsigned_int__getElementsBufferObjectIndex,
"Get the index into the ElementsBufferObject, 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);
@@ -823,6 +836,16 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet)
__bool__supportsBufferObject,
"",
"");
I_Method0(osg::DrawElements *, getDrawElements,
Properties::VIRTUAL,
__DrawElements_P1__getDrawElements,
"",
"");
I_Method0(const osg::DrawElements *, getDrawElements,
Properties::VIRTUAL,
__C5_DrawElements_P1__getDrawElements,
"",
"");
I_Method1(void, setMode, IN, GLenum, mode,
Properties::NON_VIRTUAL,
__void__setMode__GLenum,
@@ -901,6 +924,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveSet)
I_SimpleProperty(const GLvoid *, DataPointer,
__C5_GLvoid_P1__getDataPointer,
0);
I_SimpleProperty(osg::DrawElements *, DrawElements,
__DrawElements_P1__getDrawElements,
0);
I_SimpleProperty(GLenum, Mode,
__GLenum__getMode,
__void__setMode__GLenum);