diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index 0e2a247b9..7926df27d 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -208,8 +208,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) __void__draw__RenderInfo_R1, "Draw OpenGL primitives. ", "If the Drawable has _useDisplayList set to true, then use an OpenGL display list, automatically compiling one if required. Otherwise, call drawImplementation(). This method should not be overridden in subclasses, as it manages the optional display list (notice this is not even virtual). Subclasses should override drawImplementation() instead. "); - I_Method1(void, compileGLObjects, IN, osg::State &, state, - __void__compileGLObjects__State_R1, + I_Method1(void, compileGLObjects, IN, osg::RenderInfo &, renderInfo, + __void__compileGLObjects__RenderInfo_R1, "Immediately compile this Drawable into an OpenGL Display List. ", "Operation is ignored if _useDisplayList is false. "); I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0, diff --git a/src/osgWrappers/osg/Geode.cpp b/src/osgWrappers/osg/Geode.cpp index 5c1a5f99f..5569c1743 100644 --- a/src/osgWrappers/osg/Geode.cpp +++ b/src/osgWrappers/osg/Geode.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -106,8 +107,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Geode) __C5_DrawableList_R1__getDrawableList, "Get the list of drawables. ", ""); - I_Method1(void, compileDrawables, IN, osg::State &, state, - __void__compileDrawables__State_R1, + I_Method1(void, compileDrawables, IN, osg::RenderInfo &, renderInfo, + __void__compileDrawables__RenderInfo_R1, "Compile OpenGL Display List for each drawable. ", ""); I_Method0(const osg::BoundingBox &, getBoundingBox, diff --git a/src/osgWrappers/osg/Material.cpp b/src/osgWrappers/osg/Material.cpp index a2c2dcf77..83209d89e 100644 --- a/src/osgWrappers/osg/Material.cpp +++ b/src/osgWrappers/osg/Material.cpp @@ -77,7 +77,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Material) __int__compare__C5_StateAttribute_R1, "return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. ", ""); - I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, usage, + I_Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x, __bool__getModeUsage__ModeUsage_R1, "", ""); diff --git a/src/osgWrappers/osg/Point.cpp b/src/osgWrappers/osg/Point.cpp index 542a1eb12..0c5ad3a3c 100644 --- a/src/osgWrappers/osg/Point.cpp +++ b/src/osgWrappers/osg/Point.cpp @@ -164,6 +164,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Point::Extensions) __bool__isPointParametersSupported, "", ""); + I_Method2(void, glPointParameteri, IN, GLenum, pname, IN, GLint, param, + __void__glPointParameteri__GLenum__GLint, + "", + ""); I_Method2(void, glPointParameterf, IN, GLenum, pname, IN, GLfloat, param, __void__glPointParameterf__GLenum__GLfloat, "", diff --git a/src/osgWrappers/osg/PointSprite.cpp b/src/osgWrappers/osg/PointSprite.cpp index ac2efbe3f..1250b3361 100644 --- a/src/osgWrappers/osg/PointSprite.cpp +++ b/src/osgWrappers/osg/PointSprite.cpp @@ -24,12 +24,17 @@ #undef OUT #endif +BEGIN_ENUM_REFLECTOR(osg::PointSprite::CoordOriginMode) + I_EnumLabel(osg::PointSprite::UPPER_LEFT); + I_EnumLabel(osg::PointSprite::LOWER_LEFT); +END_REFLECTOR + BEGIN_OBJECT_REFLECTOR(osg::PointSprite) I_BaseType(osg::StateAttribute); I_Constructor0(____PointSprite, "", ""); - I_ConstructorWithDefaults2(IN, const osg::PointSprite &, texenv, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + I_ConstructorWithDefaults2(IN, const osg::PointSprite &, ps, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, ____PointSprite__C5_PointSprite_R1__C5_osg_CopyOp_R1, "Copy constructor using CopyOp to manage deep vs shallow copy. ", ""); @@ -77,10 +82,21 @@ BEGIN_OBJECT_REFLECTOR(osg::PointSprite) __void__apply__osg_State_R1, "apply the OpenGL state attributes. ", "The render info for the current OpenGL context is passed in to allow the StateAttribute to obtain details on the the current context and state."); + I_Method1(void, setCoordOriginMode, IN, osg::PointSprite::CoordOriginMode, mode, + __void__setCoordOriginMode__CoordOriginMode, + "", + ""); + I_Method0(osg::PointSprite::CoordOriginMode, getCoordOriginMode, + __CoordOriginMode__getCoordOriginMode, + "", + ""); I_StaticMethod1(bool, isPointSpriteSupported, IN, unsigned int, context, __bool__isPointSpriteSupported__unsigned_int_S, "", ""); + I_SimpleProperty(osg::PointSprite::CoordOriginMode, CoordOriginMode, + __CoordOriginMode__getCoordOriginMode, + __void__setCoordOriginMode__CoordOriginMode); I_SimpleProperty(osg::StateAttribute::Type, Type, __Type__getType, 0); diff --git a/src/osgWrappers/osg/Sequence.cpp b/src/osgWrappers/osg/Sequence.cpp index 54df1ce34..902e25ff3 100644 --- a/src/osgWrappers/osg/Sequence.cpp +++ b/src/osgWrappers/osg/Sequence.cpp @@ -88,6 +88,14 @@ BEGIN_OBJECT_REFLECTOR(osg::Sequence) __float__getTime__int, "Get time for child. ", ""); + I_Method1(void, setDefaultTime, IN, float, t, + __void__setDefaultTime__float, + "Set default time in seconds for new child. ", + ""); + I_Method0(float, getDefaultTime, + __float__getDefaultTime, + "Get default time in seconds for new child. ", + ""); I_Method0(unsigned int, getNumFrames, __unsigned_int__getNumFrames, "Get number of frames. ", @@ -116,6 +124,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Sequence) __SequenceMode__getMode, "Get sequence mode. ", ""); + I_SimpleProperty(float, DefaultTime, + __float__getDefaultTime, + __void__setDefaultTime__float); I_SimpleProperty(osg::Sequence::SequenceMode, Mode, __SequenceMode__getMode, __void__setMode__SequenceMode); diff --git a/src/osgWrappers/osgShadow/Export.cpp b/src/osgWrappers/osgShadow/Export.cpp new file mode 100644 index 000000000..d03ab10bf --- /dev/null +++ b/src/osgWrappers/osgShadow/Export.cpp @@ -0,0 +1,22 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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 + diff --git a/src/osgWrappers/osgShadow/OccluderGeometry.cpp b/src/osgWrappers/osgShadow/OccluderGeometry.cpp new file mode 100644 index 000000000..a936c587d --- /dev/null +++ b/src/osgWrappers/osgShadow/OccluderGeometry.cpp @@ -0,0 +1,100 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#include +#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 + +TYPE_NAME_ALIAS(std::vector< osg::Vec3 >, osgShadow::OccluderGeometry::Vec3List); + +TYPE_NAME_ALIAS(std::vector< GLuint >, osgShadow::OccluderGeometry::UIntList); + +TYPE_NAME_ALIAS(std::vector< osgShadow::OccluderGeometry::Edge >, osgShadow::OccluderGeometry::EdgeList); + +BEGIN_OBJECT_REFLECTOR(osgShadow::OccluderGeometry) + I_BaseType(osg::Drawable); + I_Constructor0(____OccluderGeometry, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgShadow::OccluderGeometry &, oc, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____OccluderGeometry__C5_OccluderGeometry_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + __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, + __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, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + __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, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); + I_MethodWithDefaults3(void, computeOccluderGeometry, IN, osg::Node *, subgraph, , IN, osg::Matrix *, matrix, 0, IN, float, sampleRatio, 1.0f, + __void__computeOccluderGeometry__osg_Node_P1__osg_Matrix_P1__float, + "Compute an occluder geometry containing all the geometry in specified subgraph. ", + ""); + I_MethodWithDefaults3(void, computeOccluderGeometry, IN, osg::Drawable *, drawable, , IN, osg::Matrix *, matrix, 0, IN, float, sampleRatio, 1.0f, + __void__computeOccluderGeometry__osg_Drawable_P1__osg_Matrix_P1__float, + "Compute an occluder geometry containing the geometry in specified drawable. ", + ""); + I_Method1(void, drawImplementation, IN, osg::RenderInfo &, renderInfo, + __void__drawImplementation__osg_RenderInfo_R1, + "Render the occluder geometry. ", + ""); + I_Method0(osg::BoundingBox, computeBound, + __osg_BoundingBox__computeBound, + "Compute the bounding box around occluder geometry. ", + ""); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osgShadow::OccluderGeometry::Edge) + I_Constructor0(____Edge, + "", + ""); + I_Constructor4(IN, unsigned int, p1, IN, unsigned int, p2, IN, unsigned int, t1, IN, unsigned int, t2, + ____Edge__unsigned_int__unsigned_int__unsigned_int__unsigned_int, + "", + ""); + I_PublicMemberProperty(unsigned int, _p1); + I_PublicMemberProperty(unsigned int, _p2); + I_PublicMemberProperty(unsigned int, _t1); + I_PublicMemberProperty(unsigned int, _t2); +END_REFLECTOR + +STD_VECTOR_REFLECTOR(std::vector< GLuint >); + +STD_VECTOR_REFLECTOR(std::vector< osgShadow::OccluderGeometry::Edge >); + diff --git a/src/osgWrappers/osgShadow/ShadowMap.cpp b/src/osgWrappers/osgShadow/ShadowMap.cpp new file mode 100644 index 000000000..edb423679 --- /dev/null +++ b/src/osgWrappers/osgShadow/ShadowMap.cpp @@ -0,0 +1,55 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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::ShadowMap) + I_BaseType(osgShadow::ShadowTechnique); + I_Constructor0(____ShadowMap, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgShadow::ShadowMap &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____ShadowMap__C5_ShadowMap_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + __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, + __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, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + __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, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); +END_REFLECTOR + diff --git a/src/osgWrappers/osgShadow/ShadowTexture.cpp b/src/osgWrappers/osgShadow/ShadowTexture.cpp new file mode 100644 index 000000000..f3e99b90b --- /dev/null +++ b/src/osgWrappers/osgShadow/ShadowTexture.cpp @@ -0,0 +1,55 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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::ShadowTexture) + I_BaseType(osgShadow::ShadowTechnique); + I_Constructor0(____ShadowTexture, + "", + ""); + I_ConstructorWithDefaults2(IN, const osgShadow::ShadowTexture &, es, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, + ____ShadowTexture__C5_ShadowTexture_R1__C5_osg_CopyOp_R1, + "", + ""); + I_Method0(osg::Object *, cloneType, + __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, + __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, + __bool__isSameKindAs__C5_osg_Object_P1, + "", + ""); + I_Method0(const char *, libraryName, + __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, + __C5_char_P1__className, + "return the name of the object's class type. ", + "Must be defined by derived classes. "); +END_REFLECTOR + diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index d4f8fba64..63f41f35f 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,14 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) __osg_State_P1__getState, "", ""); + I_Method1(void, setRenderInfo, IN, osg::RenderInfo &, renderInfo, + __void__setRenderInfo__osg_RenderInfo_R1, + "", + ""); + I_Method0(osg::RenderInfo &, getRenderInfo, + __osg_RenderInfo_R1__getRenderInfo, + "", + ""); I_Method1(void, apply, IN, osg::Node &, node, __void__apply__osg_Node_R1, "Simply traverse using standard NodeVisitor traverse method. ", @@ -84,6 +93,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::GLObjectsVisitor) I_SimpleProperty(osgUtil::GLObjectsVisitor::Mode, Mode, __Mode__getMode, __void__setMode__Mode); + I_SimpleProperty(osg::RenderInfo &, RenderInfo, + __osg_RenderInfo_R1__getRenderInfo, + __void__setRenderInfo__osg_RenderInfo_R1); I_SimpleProperty(osg::State *, State, __osg_State_P1__getState, __void__setState__osg_State_P1);