From f9c69fa7bdb9d3f1e23785a98d2a1b10f33fe986 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 22 Oct 2009 09:08:42 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/ArrayDispatchers.cpp | 197 +++++++++++++++ src/osgWrappers/osg/GLBeginEndAdapter.cpp | 284 ++++++++++++++++++++++ src/osgWrappers/osgParticle/Particle.cpp | 13 +- 3 files changed, 488 insertions(+), 6 deletions(-) create mode 100644 src/osgWrappers/osg/ArrayDispatchers.cpp create mode 100644 src/osgWrappers/osg/GLBeginEndAdapter.cpp diff --git a/src/osgWrappers/osg/ArrayDispatchers.cpp b/src/osgWrappers/osg/ArrayDispatchers.cpp new file mode 100644 index 000000000..d0845d7d9 --- /dev/null +++ b/src/osgWrappers/osg/ArrayDispatchers.cpp @@ -0,0 +1,197 @@ +// *************************************************************************** +// +// 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(osg::ArrayDispatchers) + I_DeclaringFile("osg/ArrayDispatchers"); + I_BaseType(osg::Referenced); + I_Constructor0(____ArrayDispatchers, + "", + ""); + I_Method1(void, setState, IN, osg::State *, state, + Properties::NON_VIRTUAL, + __void__setState__osg_State_P1, + "", + ""); + I_Method2(osg::AttributeDispatch *, vertexDispatcher, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __AttributeDispatch_P1__vertexDispatcher__Array_P1__IndexArray_P1, + "", + ""); + I_Method2(osg::AttributeDispatch *, normalDispatcher, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __AttributeDispatch_P1__normalDispatcher__Array_P1__IndexArray_P1, + "", + ""); + I_Method2(osg::AttributeDispatch *, colorDispatcher, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __AttributeDispatch_P1__colorDispatcher__Array_P1__IndexArray_P1, + "", + ""); + I_Method2(osg::AttributeDispatch *, secondaryColorDispatcher, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __AttributeDispatch_P1__secondaryColorDispatcher__Array_P1__IndexArray_P1, + "", + ""); + I_Method2(osg::AttributeDispatch *, fogCoordDispatcher, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __AttributeDispatch_P1__fogCoordDispatcher__Array_P1__IndexArray_P1, + "", + ""); + I_Method3(osg::AttributeDispatch *, texCoordDispatcher, IN, unsigned int, unit, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __AttributeDispatch_P1__texCoordDispatcher__unsigned_int__Array_P1__IndexArray_P1, + "", + ""); + I_Method3(osg::AttributeDispatch *, vertexAttribDispatcher, IN, unsigned int, unit, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __AttributeDispatch_P1__vertexAttribDispatcher__unsigned_int__Array_P1__IndexArray_P1, + "", + ""); + I_Method0(void, reset, + Properties::NON_VIRTUAL, + __void__reset, + "", + ""); + I_Method1(void, setUseGLBeginEndAdapter, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setUseGLBeginEndAdapter__bool, + "", + ""); + I_Method0(bool, getUseGLBeginEndAdapter, + Properties::NON_VIRTUAL, + __bool__getUseGLBeginEndAdapter, + "", + ""); + I_Method1(void, setUseVertexAttribAlias, IN, bool, flag, + Properties::NON_VIRTUAL, + __void__setUseVertexAttribAlias__bool, + "", + ""); + I_Method0(bool, getUseVertexAttribAlias, + Properties::NON_VIRTUAL, + __bool__getUseVertexAttribAlias, + "", + ""); + I_Method2(void, activate, IN, unsigned int, binding, IN, osg::AttributeDispatch *, at, + Properties::NON_VIRTUAL, + __void__activate__unsigned_int__AttributeDispatch_P1, + "", + ""); + I_Method3(void, activateVertexArray, IN, unsigned int, binding, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __void__activateVertexArray__unsigned_int__osg_Array_P1__osg_IndexArray_P1, + "", + ""); + I_Method3(void, activateColorArray, IN, unsigned int, binding, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __void__activateColorArray__unsigned_int__osg_Array_P1__osg_IndexArray_P1, + "", + ""); + I_Method3(void, activateNormalArray, IN, unsigned int, binding, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __void__activateNormalArray__unsigned_int__osg_Array_P1__osg_IndexArray_P1, + "", + ""); + I_Method3(void, activateSecondaryColorArray, IN, unsigned int, binding, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __void__activateSecondaryColorArray__unsigned_int__osg_Array_P1__osg_IndexArray_P1, + "", + ""); + I_Method3(void, activateFogCoordArray, IN, unsigned int, binding, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __void__activateFogCoordArray__unsigned_int__osg_Array_P1__osg_IndexArray_P1, + "", + ""); + I_Method4(void, activateTexCoordArray, IN, unsigned int, binding, IN, unsigned int, unit, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __void__activateTexCoordArray__unsigned_int__unsigned_int__osg_Array_P1__osg_IndexArray_P1, + "", + ""); + I_Method4(void, activateVertexAttribArray, IN, unsigned int, binding, IN, unsigned int, unit, IN, osg::Array *, array, IN, osg::IndexArray *, indices, + Properties::NON_VIRTUAL, + __void__activateVertexAttribArray__unsigned_int__unsigned_int__osg_Array_P1__osg_IndexArray_P1, + "", + ""); + I_Method2(void, dispatch, IN, unsigned int, binding, IN, unsigned int, index, + Properties::NON_VIRTUAL, + __void__dispatch__unsigned_int__unsigned_int, + "", + ""); + I_Method1(bool, active, IN, unsigned int, binding, + Properties::NON_VIRTUAL, + __bool__active__unsigned_int, + "", + ""); + I_Method1(void, Begin, IN, GLenum, mode, + Properties::NON_VIRTUAL, + __void__Begin__GLenum, + "", + ""); + I_Method0(void, End, + Properties::NON_VIRTUAL, + __void__End, + "", + ""); + I_ProtectedMethod0(void, init, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__init, + "", + ""); + I_ProtectedMethod1(void, assignTexCoordDispatchers, IN, unsigned int, unit, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__assignTexCoordDispatchers__unsigned_int, + "", + ""); + I_ProtectedMethod1(void, assignVertexAttribDispatchers, IN, unsigned int, unit, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __void__assignVertexAttribDispatchers__unsigned_int, + "", + ""); + I_SimpleProperty(osg::State *, State, + 0, + __void__setState__osg_State_P1); + I_SimpleProperty(bool, UseGLBeginEndAdapter, + __bool__getUseGLBeginEndAdapter, + __void__setUseGLBeginEndAdapter__bool); + I_SimpleProperty(bool, UseVertexAttribAlias, + __bool__getUseVertexAttribAlias, + __void__setUseVertexAttribAlias__bool); +END_REFLECTOR + +BEGIN_OBJECT_REFLECTOR(osg::AttributeDispatch) + I_DeclaringFile("osg/ArrayDispatchers"); + I_BaseType(osg::Referenced); + I_Constructor0(____AttributeDispatch, + "", + ""); + I_Method2(void, assign, IN, const GLvoid *, x, IN, const osg::IndexArray *, x, + Properties::VIRTUAL, + __void__assign__C5_GLvoid_P1__C5_IndexArray_P1, + "", + ""); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/GLBeginEndAdapter.cpp b/src/osgWrappers/osg/GLBeginEndAdapter.cpp new file mode 100644 index 000000000..a496e5a3b --- /dev/null +++ b/src/osgWrappers/osg/GLBeginEndAdapter.cpp @@ -0,0 +1,284 @@ +// *************************************************************************** +// +// Generated automatically by genwrapper. +// Please DO NOT EDIT this file! +// +// *************************************************************************** + +#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_ENUM_REFLECTOR(osg::GLBeginEndAdapter::MatrixMode) + I_DeclaringFile("osg/GLBeginEndAdapter"); + I_EnumLabel(osg::GLBeginEndAdapter::APPLY_LOCAL_MATRICES_TO_VERTICES); + I_EnumLabel(osg::GLBeginEndAdapter::APPLY_LOCAL_MATRICES_TO_MODELVIEW); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::GLBeginEndAdapter) + I_DeclaringFile("osg/GLBeginEndAdapter"); + I_ConstructorWithDefaults1(IN, osg::State *, state, 0, + Properties::NON_EXPLICIT, + ____GLBeginEndAdapter__State_P1, + "", + ""); + I_Method1(void, setState, IN, osg::State *, state, + Properties::NON_VIRTUAL, + __void__setState__State_P1, + "", + ""); + I_Method0(osg::State *, setState, + Properties::NON_VIRTUAL, + __State_P1__setState, + "", + ""); + I_Method0(const osg::State *, setState, + Properties::NON_VIRTUAL, + __C5_State_P1__setState, + "", + ""); + I_Method1(void, setMatrixMode, IN, osg::GLBeginEndAdapter::MatrixMode, mode, + Properties::NON_VIRTUAL, + __void__setMatrixMode__MatrixMode, + "", + ""); + I_Method0(osg::GLBeginEndAdapter::MatrixMode, setMatrixMode, + Properties::NON_VIRTUAL, + __MatrixMode__setMatrixMode, + "", + ""); + I_Method0(void, PushMatrix, + Properties::NON_VIRTUAL, + __void__PushMatrix, + "", + ""); + I_Method0(void, PopMatrix, + Properties::NON_VIRTUAL, + __void__PopMatrix, + "", + ""); + I_Method0(void, LoadIdentity, + Properties::NON_VIRTUAL, + __void__LoadIdentity, + "", + ""); + I_Method1(void, LoadMatrixd, IN, const GLdouble *, m, + Properties::NON_VIRTUAL, + __void__LoadMatrixd__C5_GLdouble_P1, + "", + ""); + I_Method1(void, MultMatrixd, IN, const GLdouble *, m, + Properties::NON_VIRTUAL, + __void__MultMatrixd__C5_GLdouble_P1, + "", + ""); + I_Method3(void, Translatef, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__Translatef__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method3(void, Scalef, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__Scalef__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method4(void, Rotatef, IN, GLfloat, angle, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__Rotatef__GLfloat__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method3(void, Translated, IN, GLdouble, x, IN, GLdouble, y, IN, GLdouble, z, + Properties::NON_VIRTUAL, + __void__Translated__GLdouble__GLdouble__GLdouble, + "", + ""); + I_Method3(void, Scaled, IN, GLdouble, x, IN, GLdouble, y, IN, GLdouble, z, + Properties::NON_VIRTUAL, + __void__Scaled__GLdouble__GLdouble__GLdouble, + "", + ""); + I_Method4(void, Rotated, IN, GLdouble, angle, IN, GLdouble, x, IN, GLdouble, y, IN, GLdouble, z, + Properties::NON_VIRTUAL, + __void__Rotated__GLdouble__GLdouble__GLdouble__GLdouble, + "", + ""); + I_Method3(void, Vertex3f, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__Vertex3f__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method1(void, Vertex3fv, IN, const GLfloat *, v, + Properties::NON_VIRTUAL, + __void__Vertex3fv__C5_GLfloat_P1, + "", + ""); + I_Method4(void, Color4f, IN, GLfloat, red, IN, GLfloat, green, IN, GLfloat, blue, IN, GLfloat, alpha, + Properties::NON_VIRTUAL, + __void__Color4f__GLfloat__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method1(void, Color4fv, IN, const GLfloat *, c, + Properties::NON_VIRTUAL, + __void__Color4fv__C5_GLfloat_P1, + "", + ""); + I_Method3(void, Normal3f, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__Normal3f__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method1(void, Normal3fv, IN, const GLfloat *, n, + Properties::NON_VIRTUAL, + __void__Normal3fv__C5_GLfloat_P1, + "", + ""); + I_Method1(void, TexCoord1f, IN, GLfloat, x, + Properties::NON_VIRTUAL, + __void__TexCoord1f__GLfloat, + "", + ""); + I_Method1(void, TexCoord1fv, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__TexCoord1fv__C5_GLfloat_P1, + "", + ""); + I_Method2(void, TexCoord2f, IN, GLfloat, x, IN, GLfloat, y, + Properties::NON_VIRTUAL, + __void__TexCoord2f__GLfloat__GLfloat, + "", + ""); + I_Method1(void, TexCoord2fv, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__TexCoord2fv__C5_GLfloat_P1, + "", + ""); + I_Method3(void, TexCoord3f, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__TexCoord3f__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method1(void, TexCoord3fv, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__TexCoord3fv__C5_GLfloat_P1, + "", + ""); + I_Method4(void, TexCoord4f, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, IN, GLfloat, w, + Properties::NON_VIRTUAL, + __void__TexCoord4f__GLfloat__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method1(void, TexCoord4fv, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__TexCoord4fv__C5_GLfloat_P1, + "", + ""); + I_Method2(void, MultiTexCoord1f, IN, GLenum, target, IN, GLfloat, x, + Properties::NON_VIRTUAL, + __void__MultiTexCoord1f__GLenum__GLfloat, + "", + ""); + I_Method2(void, MultiTexCoord1fv, IN, GLenum, target, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__MultiTexCoord1fv__GLenum__C5_GLfloat_P1, + "", + ""); + I_Method3(void, MultiTexCoord2f, IN, GLenum, target, IN, GLfloat, x, IN, GLfloat, y, + Properties::NON_VIRTUAL, + __void__MultiTexCoord2f__GLenum__GLfloat__GLfloat, + "", + ""); + I_Method2(void, MultiTexCoord2fv, IN, GLenum, target, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__MultiTexCoord2fv__GLenum__C5_GLfloat_P1, + "", + ""); + I_Method4(void, MultiTexCoord3f, IN, GLenum, target, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__MultiTexCoord3f__GLenum__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method2(void, MultiTexCoord3fv, IN, GLenum, target, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__MultiTexCoord3fv__GLenum__C5_GLfloat_P1, + "", + ""); + I_Method5(void, MultiTexCoord4f, IN, GLenum, target, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, IN, GLfloat, w, + Properties::NON_VIRTUAL, + __void__MultiTexCoord4f__GLenum__GLfloat__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method2(void, MultiTexCoord4fv, IN, GLenum, target, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__MultiTexCoord4fv__GLenum__C5_GLfloat_P1, + "", + ""); + I_Method2(void, VertexAttrib1f, IN, GLuint, unit, IN, GLfloat, x, + Properties::NON_VIRTUAL, + __void__VertexAttrib1f__GLuint__GLfloat, + "", + ""); + I_Method2(void, VertexAttrib1fv, IN, GLuint, unit, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__VertexAttrib1fv__GLuint__C5_GLfloat_P1, + "", + ""); + I_Method3(void, VertexAttrib2f, IN, GLuint, unit, IN, GLfloat, x, IN, GLfloat, y, + Properties::NON_VIRTUAL, + __void__VertexAttrib2f__GLuint__GLfloat__GLfloat, + "", + ""); + I_Method2(void, VertexAttrib2fv, IN, GLuint, unit, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__VertexAttrib2fv__GLuint__C5_GLfloat_P1, + "", + ""); + I_Method4(void, VertexAttrib3f, IN, GLuint, unit, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, + Properties::NON_VIRTUAL, + __void__VertexAttrib3f__GLuint__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method2(void, VertexAttrib3fv, IN, GLuint, unit, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__VertexAttrib3fv__GLuint__C5_GLfloat_P1, + "", + ""); + I_Method5(void, VertexAttrib4f, IN, GLuint, unit, IN, GLfloat, x, IN, GLfloat, y, IN, GLfloat, z, IN, GLfloat, w, + Properties::NON_VIRTUAL, + __void__VertexAttrib4f__GLuint__GLfloat__GLfloat__GLfloat__GLfloat, + "", + ""); + I_Method2(void, VertexAttrib4fv, IN, GLuint, unit, IN, const GLfloat *, tc, + Properties::NON_VIRTUAL, + __void__VertexAttrib4fv__GLuint__C5_GLfloat_P1, + "", + ""); + I_Method1(void, Begin, IN, GLenum, mode, + Properties::NON_VIRTUAL, + __void__Begin__GLenum, + "", + ""); + I_Method0(void, End, + Properties::NON_VIRTUAL, + __void__End, + "", + ""); + I_SimpleProperty(osg::GLBeginEndAdapter::MatrixMode, MatrixMode, + 0, + __void__setMatrixMode__MatrixMode); + I_SimpleProperty(osg::State *, State, + 0, + __void__setState__State_P1); +END_REFLECTOR + diff --git a/src/osgWrappers/osgParticle/Particle.cpp b/src/osgWrappers/osgParticle/Particle.cpp index db6522864..f0f77d138 100644 --- a/src/osgWrappers/osgParticle/Particle.cpp +++ b/src/osgWrappers/osgParticle/Particle.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -275,19 +276,19 @@ BEGIN_VALUE_REFLECTOR(osgParticle::Particle) __bool__update__double, "Update the particle (don't call this method manually). ", "This method is called automatically by ParticleSystem::update(); it updates the graphical properties of the particle for the current time, checks whether the particle is still alive, and then updates its position by computing P = P + V * dt (where P is the position and V is the velocity). "); - I_Method0(void, beginRender, + I_Method1(void, beginRender, IN, osg::GLBeginEndAdapter *, gl, Properties::NON_VIRTUAL, - __void__beginRender, + __void__beginRender__osg_GLBeginEndAdapter_P1, "Perform some pre-rendering tasks. Called automatically by particle systems. ", ""); - I_MethodWithDefaults4(void, render, IN, const osg::Vec3 &, xpos, , IN, const osg::Vec3 &, px, , IN, const osg::Vec3 &, py, , IN, float, scale, 1.0f, + I_MethodWithDefaults5(void, render, IN, osg::GLBeginEndAdapter *, gl, , IN, const osg::Vec3 &, xpos, , IN, const osg::Vec3 &, px, , IN, const osg::Vec3 &, py, , IN, float, scale, 1.0f, Properties::NON_VIRTUAL, - __void__render__C5_osg_Vec3_R1__C5_osg_Vec3_R1__C5_osg_Vec3_R1__float, + __void__render__osg_GLBeginEndAdapter_P1__C5_osg_Vec3_R1__C5_osg_Vec3_R1__C5_osg_Vec3_R1__float, "Render the particle. Called automatically by particle systems. ", ""); - I_Method0(void, endRender, + I_Method1(void, endRender, IN, osg::GLBeginEndAdapter *, gl, Properties::NON_VIRTUAL, - __void__endRender, + __void__endRender__osg_GLBeginEndAdapter_P1, "Perform some post-rendering tasks. Called automatically by particle systems. ", ""); I_Method0(float, getCurrentSize,