From 3341c4287317e9e0c850963560cd2587373829ba Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 11 Dec 2007 12:35:10 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/Program.cpp | 10 ++++++++++ src/osgWrappers/osg/Shader.cpp | 5 +++++ src/osgWrappers/osg/StateSet.cpp | 10 ++++++++++ src/osgWrappers/osgDB/DatabasePager.cpp | 18 ++++++++++++++++++ src/osgWrappers/osgDB/SharedStateManager.cpp | 6 ++++++ src/osgWrappers/osgParticle/BoxPlacer.cpp | 18 +++++++++--------- 6 files changed, 58 insertions(+), 9 deletions(-) diff --git a/src/osgWrappers/osg/Program.cpp b/src/osgWrappers/osg/Program.cpp index 88aab347b..119a03d90 100644 --- a/src/osgWrappers/osg/Program.cpp +++ b/src/osgWrappers/osg/Program.cpp @@ -307,6 +307,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram) __GLint__getAttribLocation__C5_std_string_R1, "", ""); + I_Method1(void, addShaderToAttach, IN, osg::Shader *, shader, + Properties::NON_VIRTUAL, + __void__addShaderToAttach__Shader_P1, + "", + ""); + I_Method1(void, addShaderToDetach, IN, osg::Shader *, shader, + Properties::NON_VIRTUAL, + __void__addShaderToDetach__Shader_P1, + "", + ""); I_SimpleProperty(const osg::Program::ActiveVarInfoMap &, ActiveAttribs, __C5_ActiveVarInfoMap_R1__getActiveAttribs, 0); diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp index 9617ad3d6..caac4bacd 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -131,6 +131,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader) __void__attachShader__unsigned_int__GLuint, "For a given GL context, attach a glShader to a glProgram. ", ""); + I_Method2(void, detachShader, IN, unsigned int, contextID, IN, GLuint, program, + Properties::NON_VIRTUAL, + __void__detachShader__unsigned_int__GLuint, + "For a given GL context, detach a glShader to a glProgram. ", + ""); I_Method2(bool, getGlShaderInfoLog, IN, unsigned int, contextID, IN, std::string &, log, Properties::NON_VIRTUAL, __bool__getGlShaderInfoLog__unsigned_int__std_string_R1, diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 6b4e6faf6..a9db947ae 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -306,11 +306,21 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet) __void__setAssociatedModes__C5_StateAttribute_P1__StateAttribute_GLModeValue, "", ""); + I_Method1(void, removeAssociatedModes, IN, const osg::StateAttribute *, attribute, + Properties::NON_VIRTUAL, + __void__removeAssociatedModes__C5_StateAttribute_P1, + "", + ""); I_Method3(void, setAssociatedTextureModes, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute, IN, osg::StateAttribute::GLModeValue, value, Properties::NON_VIRTUAL, __void__setAssociatedTextureModes__unsigned_int__C5_StateAttribute_P1__StateAttribute_GLModeValue, "", ""); + I_Method2(void, removeAssociatedTextureModes, IN, unsigned int, unit, IN, const osg::StateAttribute *, attribute, + Properties::NON_VIRTUAL, + __void__removeAssociatedTextureModes__unsigned_int__C5_StateAttribute_P1, + "", + ""); I_MethodWithDefaults2(void, addUniform, IN, osg::Uniform *, uniform, , IN, osg::StateAttribute::OverrideValue, value, osg::StateAttribute::ON, Properties::NON_VIRTUAL, __void__addUniform__Uniform_P1__StateAttribute_OverrideValue, diff --git a/src/osgWrappers/osgDB/DatabasePager.cpp b/src/osgWrappers/osgDB/DatabasePager.cpp index fbc6eb08f..95973dfde 100644 --- a/src/osgWrappers/osgDB/DatabasePager.cpp +++ b/src/osgWrappers/osgDB/DatabasePager.cpp @@ -327,6 +327,24 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager) __void__updateDatabasePagerThreadBlock, "", ""); + I_ProtectedMethod1(bool, isCompiled, IN, osg::Texture *, texture, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__isCompiled__osg_Texture_P1, + "", + ""); + I_ProtectedMethod1(bool, isCompiled, IN, osg::StateSet *, stateSet, + Properties::NON_VIRTUAL, + Properties::NON_CONST, + __bool__isCompiled__osg_StateSet_P1, + "", + ""); + I_ProtectedMethod1(bool, isCompiled, IN, const osg::Drawable *, drawable, + Properties::NON_VIRTUAL, + Properties::CONST, + __bool__isCompiled__C5_osg_Drawable_P1, + "", + ""); I_ProtectedMethod1(void, removeExpiredSubgraphs, IN, double, currentFrameTime, Properties::VIRTUAL, Properties::NON_CONST, diff --git a/src/osgWrappers/osgDB/SharedStateManager.cpp b/src/osgWrappers/osgDB/SharedStateManager.cpp index 4e0554042..0bf4c0dfd 100644 --- a/src/osgWrappers/osgDB/SharedStateManager.cpp +++ b/src/osgWrappers/osgDB/SharedStateManager.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -67,6 +68,11 @@ BEGIN_OBJECT_REFLECTOR(osgDB::SharedStateManager) __void__apply__osg_Geode_R1, "", ""); + I_Method1(bool, isShared, IN, osg::StateSet *, stateSet, + Properties::NON_VIRTUAL, + __bool__isShared__osg_StateSet_P1, + "", + ""); I_ProtectedMethod2(void, process, IN, osg::StateSet *, ss, IN, osg::Object *, parent, Properties::NON_VIRTUAL, Properties::NON_CONST, diff --git a/src/osgWrappers/osgParticle/BoxPlacer.cpp b/src/osgWrappers/osgParticle/BoxPlacer.cpp index fcd4de055..2e0d3700c 100644 --- a/src/osgWrappers/osgParticle/BoxPlacer.cpp +++ b/src/osgWrappers/osgParticle/BoxPlacer.cpp @@ -38,47 +38,47 @@ BEGIN_OBJECT_REFLECTOR(osgParticle::BoxPlacer) I_Method0(const osgParticle::rangef &, getXRange, Properties::NON_VIRTUAL, __C5_rangef_R1__getXRange, - "Get the range of possible values for radius. ", + "Get the range of possible values along the X axis. ", ""); I_Method1(void, setXRange, IN, const osgParticle::rangef &, r, Properties::NON_VIRTUAL, __void__setXRange__C5_rangef_R1, - "Set the range of possible values for radius. ", + "Set the range of possible values along the X axis. ", ""); I_Method2(void, setXRange, IN, float, r1, IN, float, r2, Properties::NON_VIRTUAL, __void__setXRange__float__float, - "Set the range of possible values for radius. ", + "Set the range of possible values along the X axis. ", ""); I_Method0(const osgParticle::rangef &, getYRange, Properties::NON_VIRTUAL, __C5_rangef_R1__getYRange, - "Get the range of possible values for the central angle. ", + "Get the range of possible values along the Y axis. ", ""); I_Method1(void, setYRange, IN, const osgParticle::rangef &, r, Properties::NON_VIRTUAL, __void__setYRange__C5_rangef_R1, - "Set the range of possible values for the central angle. ", + "Set the range of possible values along the Y axis. ", ""); I_Method2(void, setYRange, IN, float, r1, IN, float, r2, Properties::NON_VIRTUAL, __void__setYRange__float__float, - "Set the range of possible values for the central angle. ", + "Set the range of possible values along the Y axis. ", ""); I_Method0(const osgParticle::rangef &, getZRange, Properties::NON_VIRTUAL, __C5_rangef_R1__getZRange, - "Get the range of possible values for the height. ", + "Get the range of possible values along the Z axis. ", ""); I_Method1(void, setZRange, IN, const osgParticle::rangef &, r, Properties::NON_VIRTUAL, __void__setZRange__C5_rangef_R1, - "Set the range of possible values for the height. ", + "Set the range of possible values along the Z axis. ", ""); I_Method2(void, setZRange, IN, float, r1, IN, float, r2, Properties::NON_VIRTUAL, __void__setZRange__float__float, - "Set the range of possible values for the height. ", + "Set the range of possible values along the Z axis. ", ""); I_Method0(osg::Object *, cloneType, Properties::VIRTUAL,