From 5e6bab7de19f098eac4ae350bc10581ac2cd8bc7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 9 Dec 2007 14:54:02 +0000 Subject: [PATCH] Updated wrappers --- include/osg/Hint | 2 +- src/osgWrappers/osg/Array.cpp | 423 ++++++++++++++++++ src/osgWrappers/osg/ClipPlane.cpp | 5 + src/osgWrappers/osg/Drawable.cpp | 87 ++++ src/osgWrappers/osg/Image.cpp | 18 + src/osgWrappers/osg/Light.cpp | 5 + src/osgWrappers/osg/PrimitiveSet.cpp | 33 ++ src/osgWrappers/osgDB/DatabasePager.cpp | 26 ++ .../osgShadow/ParallelSplitShadowMap.cpp | 152 +++++++ .../osgUtil/PolytopeIntersector.cpp | 39 +- src/osgWrappers/osgUtil/Statistics.cpp | 18 + 11 files changed, 804 insertions(+), 4 deletions(-) create mode 100644 src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp diff --git a/include/osg/Hint b/include/osg/Hint index cd9e7a88b..196b125e6 100644 --- a/include/osg/Hint +++ b/include/osg/Hint @@ -60,7 +60,7 @@ public: /** Return the member identifier within the attribute's class type. Used for light number/clip plane number etc.*/ virtual unsigned int getMember() const { return static_cast(_target); } - inline void setTarget(GLenum target); + void setTarget(GLenum target); inline GLenum getTarget() const { return _target; } inline void setMode(GLenum mode) { _mode = mode; } diff --git a/src/osgWrappers/osg/Array.cpp b/src/osgWrappers/osg/Array.cpp index c7d2cfd19..ba1a4b13f 100644 --- a/src/osgWrappers/osg/Array.cpp +++ b/src/osgWrappers/osg/Array.cpp @@ -16,12 +16,15 @@ #include #include #include +#include #include #include #include +#include #include #include #include +#include #include #include @@ -53,6 +56,10 @@ BEGIN_ENUM_REFLECTOR(osg::Array::Type) I_EnumLabel(osg::Array::Vec2bArrayType); I_EnumLabel(osg::Array::Vec3bArrayType); I_EnumLabel(osg::Array::Vec4bArrayType); + I_EnumLabel(osg::Array::DoubleArrayType); + I_EnumLabel(osg::Array::Vec2dArrayType); + I_EnumLabel(osg::Array::Vec3dArrayType); + I_EnumLabel(osg::Array::Vec4dArrayType); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Array) @@ -252,6 +259,11 @@ BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor) __void__apply__FloatArray_R1, "", ""); + I_Method1(void, apply, IN, osg::DoubleArray &, x, + Properties::VIRTUAL, + __void__apply__DoubleArray_R1, + "", + ""); I_Method1(void, apply, IN, osg::Vec2Array &, x, Properties::VIRTUAL, __void__apply__Vec2Array_R1, @@ -302,6 +314,21 @@ BEGIN_VALUE_REFLECTOR(osg::ArrayVisitor) __void__apply__Vec4sArray_R1, "", ""); + I_Method1(void, apply, IN, osg::Vec2dArray &, x, + Properties::VIRTUAL, + __void__apply__Vec2dArray_R1, + "", + ""); + I_Method1(void, apply, IN, osg::Vec3dArray &, x, + Properties::VIRTUAL, + __void__apply__Vec3dArray_R1, + "", + ""); + I_Method1(void, apply, IN, osg::Vec4dArray &, x, + Properties::VIRTUAL, + __void__apply__Vec4dArray_R1, + "", + ""); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) @@ -349,6 +376,11 @@ BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) __void__apply__C5_FloatArray_R1, "", ""); + I_Method1(void, apply, IN, const osg::DoubleArray &, x, + Properties::VIRTUAL, + __void__apply__C5_DoubleArray_R1, + "", + ""); I_Method1(void, apply, IN, const osg::Vec2Array &, x, Properties::VIRTUAL, __void__apply__C5_Vec2Array_R1, @@ -399,6 +431,21 @@ BEGIN_VALUE_REFLECTOR(osg::ConstArrayVisitor) __void__apply__C5_Vec4sArray_R1, "", ""); + I_Method1(void, apply, IN, const osg::Vec2dArray &, x, + Properties::VIRTUAL, + __void__apply__C5_Vec2dArray_R1, + "", + ""); + I_Method1(void, apply, IN, const osg::Vec3dArray &, x, + Properties::VIRTUAL, + __void__apply__C5_Vec3dArray_R1, + "", + ""); + I_Method1(void, apply, IN, const osg::Vec4dArray &, x, + Properties::VIRTUAL, + __void__apply__C5_Vec4dArray_R1, + "", + ""); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) @@ -441,6 +488,11 @@ BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) __void__apply__C5_GLfloat_R1, "", ""); + I_Method1(void, apply, IN, const GLdouble &, x, + Properties::VIRTUAL, + __void__apply__C5_GLdouble_R1, + "", + ""); I_Method1(void, apply, IN, const osg::Vec4ub &, x, Properties::VIRTUAL, __void__apply__C5_Vec4ub_R1, @@ -491,6 +543,21 @@ BEGIN_VALUE_REFLECTOR(osg::ConstValueVisitor) __void__apply__C5_Vec4s_R1, "", ""); + I_Method1(void, apply, IN, const osg::Vec2d &, x, + Properties::VIRTUAL, + __void__apply__C5_Vec2d_R1, + "", + ""); + I_Method1(void, apply, IN, const osg::Vec3d &, x, + Properties::VIRTUAL, + __void__apply__C5_Vec3d_R1, + "", + ""); + I_Method1(void, apply, IN, const osg::Vec4d &, x, + Properties::VIRTUAL, + __void__apply__C5_Vec4d_R1, + "", + ""); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::IndexArray) @@ -556,6 +623,11 @@ BEGIN_VALUE_REFLECTOR(osg::ValueVisitor) __void__apply__GLfloat_R1, "", ""); + I_Method1(void, apply, IN, GLdouble &, x, + Properties::VIRTUAL, + __void__apply__GLdouble_R1, + "", + ""); I_Method1(void, apply, IN, osg::Vec2 &, x, Properties::VIRTUAL, __void__apply__Vec2_R1, @@ -606,6 +678,21 @@ BEGIN_VALUE_REFLECTOR(osg::ValueVisitor) __void__apply__Vec4s_R1, "", ""); + I_Method1(void, apply, IN, osg::Vec2d &, x, + Properties::VIRTUAL, + __void__apply__Vec2d_R1, + "", + ""); + I_Method1(void, apply, IN, osg::Vec3d &, x, + Properties::VIRTUAL, + __void__apply__Vec3d_R1, + "", + ""); + I_Method1(void, apply, IN, osg::Vec4d &, x, + Properties::VIRTUAL, + __void__apply__Vec4d_R1, + "", + ""); END_REFLECTOR TYPE_NAME_ALIAS(osg::TemplateIndexArray< GLbyte COMMA osg::Array::ByteArrayType COMMA 1 COMMA GL_BYTE >, osg::ByteArray) @@ -642,6 +729,96 @@ 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) +TYPE_NAME_ALIAS(osg::TemplateArray< GLdouble COMMA osg::Array::DoubleArrayType COMMA 1 COMMA GL_DOUBLE >, osg::DoubleArray) + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec2d COMMA osg::Array::Vec2dArrayType COMMA 2 COMMA GL_DOUBLE >, osg::Vec2dArray) + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec3d COMMA osg::Array::Vec3dArrayType COMMA 3 COMMA GL_DOUBLE >, osg::Vec3dArray) + +TYPE_NAME_ALIAS(osg::TemplateArray< osg::Vec4d COMMA osg::Array::Vec4dArrayType COMMA 4 COMMA GL_DOUBLE >, osg::Vec4dArray) + +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLdouble COMMA osg::Array::DoubleArrayType COMMA 1 COMMA GL_DOUBLE >) + I_DeclaringFile("osg/Array"); + I_BaseType(osg::Array); + I_Constructor0(____TemplateArray, + "", + ""); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< GLdouble COMMA osg::Array::DoubleArrayType COMMA 1 COMMA GL_DOUBLE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____TemplateArray__C5_TemplateArray_R1__C5_CopyOp_R1, + "", + ""); + I_Constructor1(IN, unsigned int, no, + Properties::NON_EXPLICIT, + ____TemplateArray__unsigned_int, + "", + ""); + I_Constructor2(IN, unsigned int, no, IN, GLdouble *, ptr, + ____TemplateArray__unsigned_int__T_P1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __Object_P1__clone__C5_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ArrayVisitor_R1, + "", + ""); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ConstArrayVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ValueVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ConstValueVisitor_R1, + "", + ""); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs, + Properties::VIRTUAL, + __int__compare__unsigned_int__unsigned_int, + "Return -1 if lhs element is less than rhs element, 0 if equal, 1 if lhs element is greater than rhs element. ", + ""); + I_Method0(void, trim, + Properties::VIRTUAL, + __void__trim, + "Frees unused space on this vector - i.e. ", + "the difference between size() and max_size() of the underlying vector. "); + I_Method0(const GLvoid *, getDataPointer, + Properties::VIRTUAL, + __C5_GLvoid_P1__getDataPointer, + "", + ""); + I_Method0(unsigned int, getTotalDataSize, + Properties::VIRTUAL, + __unsigned_int__getTotalDataSize, + "", + ""); + I_Method0(unsigned int, getNumElements, + Properties::VIRTUAL, + __unsigned_int__getNumElements, + "", + ""); + I_SimpleProperty(const GLvoid *, DataPointer, + __C5_GLvoid_P1__getDataPointer, + 0); + I_SimpleProperty(unsigned int, TotalDataSize, + __unsigned_int__getTotalDataSize, + 0); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< GLfloat COMMA osg::Array::FloatArrayType COMMA 1 COMMA GL_FLOAT >) I_DeclaringFile("osg/Array"); I_BaseType(osg::Array); @@ -891,6 +1068,88 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2b COMMA osg::Array::Vec2bAr 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2d COMMA osg::Array::Vec2dArrayType COMMA 2 COMMA GL_DOUBLE >) + I_DeclaringFile("osg/Array"); + I_BaseType(osg::Array); + I_Constructor0(____TemplateArray, + "", + ""); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec2d COMMA osg::Array::Vec2dArrayType COMMA 2 COMMA GL_DOUBLE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____TemplateArray__C5_TemplateArray_R1__C5_CopyOp_R1, + "", + ""); + I_Constructor1(IN, unsigned int, no, + Properties::NON_EXPLICIT, + ____TemplateArray__unsigned_int, + "", + ""); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec2d *, ptr, + ____TemplateArray__unsigned_int__T_P1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __Object_P1__clone__C5_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ArrayVisitor_R1, + "", + ""); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ConstArrayVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ValueVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ConstValueVisitor_R1, + "", + ""); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs, + Properties::VIRTUAL, + __int__compare__unsigned_int__unsigned_int, + "Return -1 if lhs element is less than rhs element, 0 if equal, 1 if lhs element is greater than rhs element. ", + ""); + I_Method0(void, trim, + Properties::VIRTUAL, + __void__trim, + "Frees unused space on this vector - i.e. ", + "the difference between size() and max_size() of the underlying vector. "); + I_Method0(const GLvoid *, getDataPointer, + Properties::VIRTUAL, + __C5_GLvoid_P1__getDataPointer, + "", + ""); + I_Method0(unsigned int, getTotalDataSize, + Properties::VIRTUAL, + __unsigned_int__getTotalDataSize, + "", + ""); + I_Method0(unsigned int, getNumElements, + Properties::VIRTUAL, + __unsigned_int__getNumElements, + "", + ""); + I_SimpleProperty(const GLvoid *, DataPointer, + __C5_GLvoid_P1__getDataPointer, + 0); + I_SimpleProperty(unsigned int, TotalDataSize, + __unsigned_int__getTotalDataSize, + 0); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec2s COMMA osg::Array::Vec2sArrayType COMMA 2 COMMA GL_SHORT >) I_DeclaringFile("osg/Array"); I_BaseType(osg::Array); @@ -1140,6 +1399,88 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3b COMMA osg::Array::Vec3bAr 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3d COMMA osg::Array::Vec3dArrayType COMMA 3 COMMA GL_DOUBLE >) + I_DeclaringFile("osg/Array"); + I_BaseType(osg::Array); + I_Constructor0(____TemplateArray, + "", + ""); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec3d COMMA osg::Array::Vec3dArrayType COMMA 3 COMMA GL_DOUBLE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____TemplateArray__C5_TemplateArray_R1__C5_CopyOp_R1, + "", + ""); + I_Constructor1(IN, unsigned int, no, + Properties::NON_EXPLICIT, + ____TemplateArray__unsigned_int, + "", + ""); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec3d *, ptr, + ____TemplateArray__unsigned_int__T_P1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __Object_P1__clone__C5_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ArrayVisitor_R1, + "", + ""); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ConstArrayVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ValueVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ConstValueVisitor_R1, + "", + ""); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs, + Properties::VIRTUAL, + __int__compare__unsigned_int__unsigned_int, + "Return -1 if lhs element is less than rhs element, 0 if equal, 1 if lhs element is greater than rhs element. ", + ""); + I_Method0(void, trim, + Properties::VIRTUAL, + __void__trim, + "Frees unused space on this vector - i.e. ", + "the difference between size() and max_size() of the underlying vector. "); + I_Method0(const GLvoid *, getDataPointer, + Properties::VIRTUAL, + __C5_GLvoid_P1__getDataPointer, + "", + ""); + I_Method0(unsigned int, getTotalDataSize, + Properties::VIRTUAL, + __unsigned_int__getTotalDataSize, + "", + ""); + I_Method0(unsigned int, getNumElements, + Properties::VIRTUAL, + __unsigned_int__getNumElements, + "", + ""); + I_SimpleProperty(const GLvoid *, DataPointer, + __C5_GLvoid_P1__getDataPointer, + 0); + I_SimpleProperty(unsigned int, TotalDataSize, + __unsigned_int__getTotalDataSize, + 0); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec3s COMMA osg::Array::Vec3sArrayType COMMA 3 COMMA GL_SHORT >) I_DeclaringFile("osg/Array"); I_BaseType(osg::Array); @@ -1389,6 +1730,88 @@ BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4b COMMA osg::Array::Vec4bAr 0); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4d COMMA osg::Array::Vec4dArrayType COMMA 4 COMMA GL_DOUBLE >) + I_DeclaringFile("osg/Array"); + I_BaseType(osg::Array); + I_Constructor0(____TemplateArray, + "", + ""); + I_ConstructorWithDefaults2(IN, const osg::TemplateArray< osg::Vec4d COMMA osg::Array::Vec4dArrayType COMMA 4 COMMA GL_DOUBLE > &, ta, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____TemplateArray__C5_TemplateArray_R1__C5_CopyOp_R1, + "", + ""); + I_Constructor1(IN, unsigned int, no, + Properties::NON_EXPLICIT, + ____TemplateArray__unsigned_int, + "", + ""); + I_Constructor2(IN, unsigned int, no, IN, osg::Vec4d *, ptr, + ____TemplateArray__unsigned_int__T_P1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __Object_P1__clone__C5_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(void, accept, IN, osg::ArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ArrayVisitor_R1, + "", + ""); + I_Method1(void, accept, IN, osg::ConstArrayVisitor &, av, + Properties::VIRTUAL, + __void__accept__ConstArrayVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ValueVisitor_R1, + "", + ""); + I_Method2(void, accept, IN, unsigned int, index, IN, osg::ConstValueVisitor &, vv, + Properties::VIRTUAL, + __void__accept__unsigned_int__ConstValueVisitor_R1, + "", + ""); + I_Method2(int, compare, IN, unsigned int, lhs, IN, unsigned int, rhs, + Properties::VIRTUAL, + __int__compare__unsigned_int__unsigned_int, + "Return -1 if lhs element is less than rhs element, 0 if equal, 1 if lhs element is greater than rhs element. ", + ""); + I_Method0(void, trim, + Properties::VIRTUAL, + __void__trim, + "Frees unused space on this vector - i.e. ", + "the difference between size() and max_size() of the underlying vector. "); + I_Method0(const GLvoid *, getDataPointer, + Properties::VIRTUAL, + __C5_GLvoid_P1__getDataPointer, + "", + ""); + I_Method0(unsigned int, getTotalDataSize, + Properties::VIRTUAL, + __unsigned_int__getTotalDataSize, + "", + ""); + I_Method0(unsigned int, getNumElements, + Properties::VIRTUAL, + __unsigned_int__getNumElements, + "", + ""); + I_SimpleProperty(const GLvoid *, DataPointer, + __C5_GLvoid_P1__getDataPointer, + 0); + I_SimpleProperty(unsigned int, TotalDataSize, + __unsigned_int__getTotalDataSize, + 0); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::TemplateArray< osg::Vec4s COMMA osg::Array::Vec4sArrayType COMMA 4 COMMA GL_SHORT >) I_DeclaringFile("osg/Array"); I_BaseType(osg::Array); diff --git a/src/osgWrappers/osg/ClipPlane.cpp b/src/osgWrappers/osg/ClipPlane.cpp index 1164384a0..01d3b11e0 100644 --- a/src/osgWrappers/osg/ClipPlane.cpp +++ b/src/osgWrappers/osg/ClipPlane.cpp @@ -32,6 +32,11 @@ BEGIN_OBJECT_REFLECTOR(osg::ClipPlane) I_Constructor0(____ClipPlane, "", ""); + I_Constructor1(IN, unsigned int, no, + Properties::NON_EXPLICIT, + ____ClipPlane__unsigned_int, + "", + ""); I_Constructor2(IN, unsigned int, no, IN, const osg::Vec4d &, plane, ____ClipPlane__unsigned_int__C5_Vec4d_R1, "", diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index ec76772e2..c000ed214 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -23,8 +23,11 @@ #include #include #include +#include #include +#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -581,6 +584,26 @@ BEGIN_VALUE_REFLECTOR(osg::Drawable::AttributeFunctor) __void__apply__AttributeType__unsigned__Vec4ub_P1, "", ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, double *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__double_P1, + "", + ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec2d *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__Vec2d_P1, + "", + ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec3d *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__Vec3d_P1, + "", + ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, osg::Vec4d *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__Vec4d_P1, + "", + ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Drawable::ComputeBoundingBoxCallback) @@ -685,6 +708,26 @@ BEGIN_VALUE_REFLECTOR(osg::Drawable::ConstAttributeFunctor) __void__apply__AttributeType__unsigned__C5_Vec4ub_P1, "", ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const double *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__C5_double_P1, + "", + ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const osg::Vec2d *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__C5_Vec2d_P1, + "", + ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const osg::Vec3d *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__C5_Vec3d_P1, + "", + ""); + I_Method3(void, apply, IN, osg::Drawable::AttributeType, x, IN, unsigned, int, IN, const osg::Vec4d *, x, + Properties::VIRTUAL, + __void__apply__AttributeType__unsigned__C5_Vec4d_P1, + "", + ""); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Drawable::CullCallback) @@ -946,6 +989,26 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) __void__glMultiTexCoord4fv__GLenum__C5_GLfloat_P1, "", ""); + I_Method2(void, glMultiTexCoord1d, IN, GLenum, target, IN, GLdouble, coord, + Properties::NON_VIRTUAL, + __void__glMultiTexCoord1d__GLenum__GLdouble, + "", + ""); + I_Method2(void, glMultiTexCoord2dv, IN, GLenum, target, IN, const GLdouble *, coord, + Properties::NON_VIRTUAL, + __void__glMultiTexCoord2dv__GLenum__C5_GLdouble_P1, + "", + ""); + I_Method2(void, glMultiTexCoord3dv, IN, GLenum, target, IN, const GLdouble *, coord, + Properties::NON_VIRTUAL, + __void__glMultiTexCoord3dv__GLenum__C5_GLdouble_P1, + "", + ""); + I_Method2(void, glMultiTexCoord4dv, IN, GLenum, target, IN, const GLdouble *, coord, + Properties::NON_VIRTUAL, + __void__glMultiTexCoord4dv__GLenum__C5_GLdouble_P1, + "", + ""); I_Method2(void, glVertexAttrib1s, IN, unsigned int, index, IN, GLshort, s, Properties::NON_VIRTUAL, __void__glVertexAttrib1s__unsigned_int__GLshort, @@ -956,6 +1019,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) __void__glVertexAttrib1f__unsigned_int__GLfloat, "", ""); + I_Method2(void, glVertexAttrib1d, IN, unsigned int, index, IN, GLdouble, f, + Properties::NON_VIRTUAL, + __void__glVertexAttrib1d__unsigned_int__GLdouble, + "", + ""); I_Method2(void, glVertexAttrib2fv, IN, unsigned int, index, IN, const GLfloat *, v, Properties::NON_VIRTUAL, __void__glVertexAttrib2fv__unsigned_int__C5_GLfloat_P1, @@ -971,6 +1039,21 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) __void__glVertexAttrib4fv__unsigned_int__C5_GLfloat_P1, "", ""); + I_Method2(void, glVertexAttrib2dv, IN, unsigned int, index, IN, const GLdouble *, v, + Properties::NON_VIRTUAL, + __void__glVertexAttrib2dv__unsigned_int__C5_GLdouble_P1, + "", + ""); + I_Method2(void, glVertexAttrib3dv, IN, unsigned int, index, IN, const GLdouble *, v, + Properties::NON_VIRTUAL, + __void__glVertexAttrib3dv__unsigned_int__C5_GLdouble_P1, + "", + ""); + I_Method2(void, glVertexAttrib4dv, IN, unsigned int, index, IN, const GLdouble *, v, + Properties::NON_VIRTUAL, + __void__glVertexAttrib4dv__unsigned_int__C5_GLdouble_P1, + "", + ""); I_Method2(void, glVertexAttrib4ubv, IN, unsigned int, index, IN, const GLubyte *, v, Properties::NON_VIRTUAL, __void__glVertexAttrib4ubv__unsigned_int__C5_GLubyte_P1, @@ -1147,6 +1230,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Drawable::Extensions) + + + + diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 8ec463239..72dd23b7f 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -14,6 +14,9 @@ #include #include #include +#include +#include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -248,6 +251,21 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) __C5_unsigned_char_P1__data__int__int__int, "", ""); + I_MethodWithDefaults3(osg::Vec4, getColor, IN, unsigned int, s, , IN, unsigned, t, 0, IN, unsigned, r, 0, + Properties::NON_VIRTUAL, + __Vec4__getColor__unsigned_int__unsigned__unsigned, + "Get the color value for specified texcoord. ", + ""); + I_Method1(osg::Vec4, getColor, IN, const osg::Vec2 &, texcoord, + Properties::NON_VIRTUAL, + __Vec4__getColor__C5_Vec2_R1, + "Get the color value for specified texcoord. ", + ""); + I_Method1(osg::Vec4, getColor, IN, const osg::Vec3 &, texcoord, + Properties::NON_VIRTUAL, + __Vec4__getColor__C5_Vec3_R1, + "Get the color value for specified texcoord. ", + ""); I_Method0(void, flipHorizontal, Properties::NON_VIRTUAL, __void__flipHorizontal, diff --git a/src/osgWrappers/osg/Light.cpp b/src/osgWrappers/osg/Light.cpp index f2b179b72..b4115f3e9 100644 --- a/src/osgWrappers/osg/Light.cpp +++ b/src/osgWrappers/osg/Light.cpp @@ -32,6 +32,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Light) I_Constructor0(____Light, "", ""); + I_Constructor1(IN, unsigned int, lightnum, + Properties::NON_EXPLICIT, + ____Light__unsigned_int, + "", + ""); I_ConstructorWithDefaults2(IN, const osg::Light &, light, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, ____Light__C5_Light_R1__C5_CopyOp_R1, "Copy constructor using CopyOp to manage deep vs shallow copy. ", diff --git a/src/osgWrappers/osg/PrimitiveSet.cpp b/src/osgWrappers/osg/PrimitiveSet.cpp index 4ef51a0a4..343adcd7f 100644 --- a/src/osgWrappers/osg/PrimitiveSet.cpp +++ b/src/osgWrappers/osg/PrimitiveSet.cpp @@ -16,8 +16,11 @@ #include #include #include +#include #include +#include #include +#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -643,6 +646,21 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveFunctor) __void__setVertexArray__unsigned_int__C5_Vec4_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2d *, vertices, + Properties::PURE_VIRTUAL, + __void__setVertexArray__unsigned_int__C5_Vec2d_P1, + "Sets the array of vertices used to describe the primitives. ", + "Somehow mimics the OpenGL glVertexPointer() function. "); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3d *, vertices, + Properties::PURE_VIRTUAL, + __void__setVertexArray__unsigned_int__C5_Vec3d_P1, + "Sets the array of vertices used to describe the primitives. ", + "Somehow mimics the OpenGL glVertexPointer() function. "); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4d *, vertices, + Properties::PURE_VIRTUAL, + __void__setVertexArray__unsigned_int__C5_Vec4d_P1, + "Sets the array of vertices used to describe the primitives. ", + "Somehow mimics the OpenGL glVertexPointer() function. "); I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count, Properties::PURE_VIRTUAL, __void__drawArrays__GLenum__GLint__GLsizei, @@ -725,6 +743,21 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::PrimitiveIndexFunctor) __void__setVertexArray__unsigned_int__C5_Vec4_P1, "", ""); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2d *, vertices, + Properties::PURE_VIRTUAL, + __void__setVertexArray__unsigned_int__C5_Vec2d_P1, + "", + ""); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3d *, vertices, + Properties::PURE_VIRTUAL, + __void__setVertexArray__unsigned_int__C5_Vec3d_P1, + "", + ""); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4d *, vertices, + Properties::PURE_VIRTUAL, + __void__setVertexArray__unsigned_int__C5_Vec4d_P1, + "", + ""); I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, first, IN, GLsizei, count, Properties::PURE_VIRTUAL, __void__drawArrays__GLenum__GLint__GLsizei, diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index 44e6ed0c5..0df2d581b 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -293,6 +293,26 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) __void__resetStats, "Reset the Stats variables. ", ""); + I_Method1(void, setMaximumNumOfRemovedChildPagedLODs, IN, unsigned int, number, + Properties::NON_VIRTUAL, + __void__setMaximumNumOfRemovedChildPagedLODs__unsigned_int, + "Set the maximum number of PagedLOD child to remove per frame. ", + ""); + I_Method0(unsigned int, getMaximumNumOfRemovedChildPagedLODs, + Properties::NON_VIRTUAL, + __unsigned_int__getMaximumNumOfRemovedChildPagedLODs, + "Get the maximum number of PagedLOD child to remove per frame. ", + ""); + I_Method1(void, setMinimumNumOfInactivePagedLODs, IN, unsigned int, number, + Properties::NON_VIRTUAL, + __void__setMinimumNumOfInactivePagedLODs__unsigned_int, + "Set the minimum number of inactive PagedLOD child to keep. ", + ""); + I_Method0(unsigned int, getMinimumNumOfInactivePagedLODs, + Properties::NON_VIRTUAL, + __unsigned_int__getMinimumNumOfInactivePagedLODs, + "Get the minimum number of inactive PagedLOD child to keep. ", + ""); I_StaticMethod0(osg::ref_ptr< osgDB::DatabasePager > &, prototype, __osg_ref_ptrT1_DatabasePager__R1__prototype_S, "get the prototype singleton used by DatabasePager::create(). ", @@ -353,9 +373,15 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) I_SimpleProperty(unsigned int, MaximumNumOfObjectsToCompilePerFrame, __unsigned_int__getMaximumNumOfObjectsToCompilePerFrame, __void__setMaximumNumOfObjectsToCompilePerFrame__unsigned_int); + I_SimpleProperty(unsigned int, MaximumNumOfRemovedChildPagedLODs, + __unsigned_int__getMaximumNumOfRemovedChildPagedLODs, + __void__setMaximumNumOfRemovedChildPagedLODs__unsigned_int); I_SimpleProperty(double, MaximumTimeToMergeTile, __double__getMaximumTimeToMergeTile, 0); + I_SimpleProperty(unsigned int, MinimumNumOfInactivePagedLODs, + __unsigned_int__getMinimumNumOfInactivePagedLODs, + __void__setMinimumNumOfInactivePagedLODs__unsigned_int); I_SimpleProperty(double, MinimumTimeAvailableForGLCompileAndDeletePerFrame, __double__getMinimumTimeAvailableForGLCompileAndDeletePerFrame, __void__setMinimumTimeAvailableForGLCompileAndDeletePerFrame__double); diff --git a/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp b/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp new file mode 100644 index 000000000..6956ac881 --- /dev/null +++ b/src/osgWrappers/osgShadow/ParallelSplitShadowMap.cpp @@ -0,0 +1,152 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +// Must undefine IN and OUT macros defined in Windows headers +#ifdef IN +#undef IN +#endif +#ifdef OUT +#undef OUT +#endif + +BEGIN_OBJECT_REFLECTOR(osgShadow::ParallelSplitShadowMap) + I_DeclaringFile("osgShadow/ParallelSplitShadowMap"); + I_BaseType(osgShadow::ShadowTechnique); + I_ConstructorWithDefaults2(IN, osg::Geode **, debugGroup, NULL, IN, int, icountplanes, 3, + ____ParallelSplitShadowMap__osg_Geode_P1P1__int, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgShadow::ParallelSplitShadowMap &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____ParallelSplitShadowMap__C5_ParallelSplitShadowMap_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + Properties::VIRTUAL, + __osg_Object_P1__cloneType, + "Clone the type of an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop, + Properties::VIRTUAL, + __osg_Object_P1__clone__C5_osg_CopyOp_R1, + "Clone an object, with Object* return type. ", + "Must be defined by derived classes. "); + I_Method1(bool, isSameKindAs, IN, const osg::Object *, obj, + Properties::VIRTUAL, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + Properties::VIRTUAL, + __C5_char_P1__libraryName, + "return the name of the object's library. ", + "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. "); + I_Method0(const char *, className, + Properties::VIRTUAL, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); + I_Method0(void, init, + Properties::VIRTUAL, + __void__init, + "Initialize the ShadowedScene and local cached data structures. ", + ""); + I_Method1(void, update, IN, osg::NodeVisitor &, nv, + Properties::VIRTUAL, + __void__update__osg_NodeVisitor_R1, + "Run the update traversal of the ShadowedScene and update any loca chached data structures. ", + ""); + I_Method1(void, cull, IN, osgUtil::CullVisitor &, cv, + Properties::VIRTUAL, + __void__cull__osgUtil_CullVisitor_R1, + "Run the cull traversal of the ShadowedScene and set up the rendering for this ShadowTechnique. ", + ""); + I_Method0(void, cleanSceneGraph, + Properties::VIRTUAL, + __void__cleanSceneGraph, + "Clean scene graph from any shadow technique specific nodes, state and drawables. ", + ""); + I_Method0(void, setDebugColorOn, + Properties::NON_VIRTUAL, + __void__setDebugColorOn, + "Switch on the debug coloring in GLSL (only the first 3 texture/splits showed for visualisation. ", + ""); + I_Method1(void, setPolygonOffset, IN, const osg::Vec2f &, p, + Properties::NON_VIRTUAL, + __void__setPolygonOffset__C5_osg_Vec2f_R1, + "Set the polygon offset osg::Vec2f(factor,unit). ", + ""); + I_Method0(const osg::Vec2f &, getPolygonOffset, + Properties::NON_VIRTUAL, + __C5_osg_Vec2f_R1__getPolygonOffset, + "Get the polygon offset osg::Vec2f(factor,unit). ", + ""); + I_Method1(void, setTextureResolution, IN, unsigned int, resolution, + Properties::NON_VIRTUAL, + __void__setTextureResolution__unsigned_int, + "Set the texture resolution. ", + ""); + I_Method1(void, setMaxFarDistance, IN, double, farDist, + Properties::NON_VIRTUAL, + __void__setMaxFarDistance__double, + "Set the max far distance. ", + ""); + I_Method1(void, setMoveVCamBehindRCamFactor, IN, double, distFactor, + Properties::NON_VIRTUAL, + __void__setMoveVCamBehindRCamFactor__double, + "Set the factor for moving the virtual camera behind the real camera. ", + ""); + I_Method0(void, forceFrontCullFace, + Properties::NON_VIRTUAL, + __void__forceFrontCullFace, + "Force to add a cull face front. ", + ""); + I_Method1(void, setMinNearDistanceForSplits, IN, double, nd, + Properties::NON_VIRTUAL, + __void__setMinNearDistanceForSplits__double, + "Set min near distance for splits. ", + ""); + I_Method1(void, useLinearSplit, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__useLinearSplit__bool, + "use linear split (default: linear) ", + ""); + I_ProtectedMethod2(std::string, generateGLSL_FragmentShader_BaseTex, IN, bool, debug, IN, unsigned int, splitCount, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __std_string__generateGLSL_FragmentShader_BaseTex__bool__unsigned_int, + "", + ""); + I_SimpleProperty(double, MaxFarDistance, + 0, + __void__setMaxFarDistance__double); + I_SimpleProperty(double, MinNearDistanceForSplits, + 0, + __void__setMinNearDistanceForSplits__double); + I_SimpleProperty(double, MoveVCamBehindRCamFactor, + 0, + __void__setMoveVCamBehindRCamFactor__double); + I_SimpleProperty(const osg::Vec2f &, PolygonOffset, + __C5_osg_Vec2f_R1__getPolygonOffset, + __void__setPolygonOffset__C5_osg_Vec2f_R1); + I_SimpleProperty(unsigned int, TextureResolution, + 0, + __void__setTextureResolution__unsigned_int); +END_REFLECTOR + diff --git a/src/osgWrappers/osgUtil/PolytopeIntersector.cpp b/src/osgWrappers/osgUtil/PolytopeIntersector.cpp index 2e21eb894..b29084314 100644 --- a/src/osgWrappers/osgUtil/PolytopeIntersector.cpp +++ b/src/osgWrappers/osgUtil/PolytopeIntersector.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -32,15 +33,15 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PolytopeIntersector) I_Constructor1(IN, const osg::Polytope &, polytope, Properties::NON_EXPLICIT, ____PolytopeIntersector__C5_osg_Polytope_R1, - "Construct a PolytopeIntersector using speified polytope in MODEL coordinates. ", + "Construct a PolytopeIntersector using specified polytope in MODEL coordinates. ", ""); I_Constructor2(IN, osgUtil::Intersector::CoordinateFrame, cf, IN, const osg::Polytope &, polytope, ____PolytopeIntersector__CoordinateFrame__C5_osg_Polytope_R1, - "Construct a PolytopeIntersector using speified polytope in specified coordinate frame. ", + "Construct a PolytopeIntersector using specified polytope in specified coordinate frame. ", ""); I_Constructor5(IN, osgUtil::Intersector::CoordinateFrame, cf, IN, double, xMin, IN, double, yMin, IN, double, xMax, IN, double, yMax, ____PolytopeIntersector__CoordinateFrame__double__double__double__double, - "Convinience constructor for supporting picking in WINDOW, or PROJECTION coorindates In WINDOW coordinates (clip space cube) creates a five sided polytope box that has a front face at 0.0 and sides around box xMin, yMin, xMax, yMax. ", + "Convenience constructor for supporting picking in WINDOW, or PROJECTION coordinates In WINDOW coordinates (clip space cube) creates a five sided polytope box that has a front face at 0.0 and sides around box xMin, yMin, xMax, yMax. ", "In PROJECTION coordinates (clip space cube) creates a five sided polytope box that has a front face at -1 and sides around box xMin, yMin, xMax, yMax. In VIEW and MODEL coordinates (clip space cube) creates a five sided polytope box that has a front face at 0.0 and sides around box xMin, yMin, xMax, yMax. "); I_Method1(void, insertIntersection, IN, const osgUtil::PolytopeIntersector::Intersection &, intersection, Properties::NON_VIRTUAL, @@ -57,6 +58,26 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PolytopeIntersector) __Intersection__getFirstIntersection, "", ""); + I_Method0(unsigned int, getDimensionMask, + Properties::NON_VIRTUAL, + __unsigned_int__getDimensionMask, + "", + ""); + I_Method1(void, setDimensionMask, IN, unsigned int, dimensionMask, + Properties::NON_VIRTUAL, + __void__setDimensionMask__unsigned_int, + "set the dimension mask. ", + "As polytope-triangle and polytope-quad intersections are expensive to compute it is possible to turn them off by calling setDimensionMask( DimZero | DimOne ) "); + I_Method0(const osg::Plane &, getReferencePlane, + Properties::NON_VIRTUAL, + __C5_osg_Plane_R1__getReferencePlane, + "", + ""); + I_Method1(void, setReferencePlane, IN, const osg::Plane &, plane, + Properties::NON_VIRTUAL, + __void__setReferencePlane__C5_osg_Plane_R1, + "set the plane used to sort the intersections. ", + "The intersections are sorted by the distance of the localIntersectionPoint and the reference plane. The default for the reference plane is the last plane of the polytope. "); I_Method1(osgUtil::Intersector *, clone, IN, osgUtil::IntersectionVisitor &, iv, Properties::VIRTUAL, __Intersector_P1__clone__osgUtil_IntersectionVisitor_R1, @@ -87,12 +108,18 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::PolytopeIntersector) __bool__containsIntersections, "", ""); + I_SimpleProperty(unsigned int, DimensionMask, + __unsigned_int__getDimensionMask, + __void__setDimensionMask__unsigned_int); I_SimpleProperty(osgUtil::PolytopeIntersector::Intersection, FirstIntersection, __Intersection__getFirstIntersection, 0); I_SimpleProperty(osgUtil::PolytopeIntersector::Intersections &, Intersections, __Intersections_R1__getIntersections, 0); + I_SimpleProperty(const osg::Plane &, ReferencePlane, + __C5_osg_Plane_R1__getReferencePlane, + __void__setReferencePlane__C5_osg_Plane_R1); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osgUtil::PolytopeIntersector::Intersection) @@ -100,8 +127,14 @@ BEGIN_VALUE_REFLECTOR(osgUtil::PolytopeIntersector::Intersection) I_Constructor0(____Intersection, "", ""); + I_PublicMemberProperty(double, distance); + I_PublicMemberProperty(double, maxDistance); I_PublicMemberProperty(osg::NodePath, nodePath); I_PublicMemberProperty(osg::ref_ptr< osg::Drawable >, drawable); + I_PublicMemberProperty(osg::ref_ptr< osg::RefMatrix >, matrix); + I_PublicMemberProperty(osg::Vec3, localIntersectionPoint); + I_PublicMemberProperty(unsigned int, numIntersectionPoints); + I_PublicMemberProperty(unsigned int, primitiveIndex); END_REFLECTOR STD_SET_REFLECTOR(std::set< osgUtil::PolytopeIntersector::Intersection >) diff --git a/src/osgWrappers/osgUtil/Statistics.cpp b/src/osgWrappers/osgUtil/Statistics.cpp index 876a27cc8..7c19bfed8 100644 --- a/src/osgWrappers/osgUtil/Statistics.cpp +++ b/src/osgWrappers/osgUtil/Statistics.cpp @@ -18,8 +18,11 @@ #include #include #include +#include #include +#include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -79,6 +82,21 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Statistics) __void__setVertexArray__unsigned_int__C5_osg_Vec4_P1, "Sets the array of vertices used to describe the primitives. ", "Somehow mimics the OpenGL glVertexPointer() function. "); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec3d *, x, + Properties::VIRTUAL, + __void__setVertexArray__unsigned_int__C5_osg_Vec3d_P1, + "Sets the array of vertices used to describe the primitives. ", + "Somehow mimics the OpenGL glVertexPointer() function. "); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec2d *, x, + Properties::VIRTUAL, + __void__setVertexArray__unsigned_int__C5_osg_Vec2d_P1, + "Sets the array of vertices used to describe the primitives. ", + "Somehow mimics the OpenGL glVertexPointer() function. "); + I_Method2(void, setVertexArray, IN, unsigned int, count, IN, const osg::Vec4d *, x, + Properties::VIRTUAL, + __void__setVertexArray__unsigned_int__C5_osg_Vec4d_P1, + "Sets the array of vertices used to describe the primitives. ", + "Somehow mimics the OpenGL glVertexPointer() function. "); I_Method3(void, drawArrays, IN, GLenum, mode, IN, GLint, x, IN, GLsizei, count, Properties::VIRTUAL, __void__drawArrays__GLenum__GLint__GLsizei,