From edf142222b7271f500d91a2184835d678cb76bf3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 25 Apr 2005 20:46:46 +0000 Subject: [PATCH] Updated wrappers using Marco Jez's genwrapper utility. --- src/osgWrappers/osg/CopyOp.cpp | 2 ++ src/osgWrappers/osg/Drawable.cpp | 2 +- src/osgWrappers/osg/Image.cpp | 1 + src/osgWrappers/osg/Node.cpp | 2 +- src/osgWrappers/osg/Point.cpp | 13 +++++++++ src/osgWrappers/osg/Shader.cpp | 10 +++---- src/osgWrappers/osg/StateAttribute.cpp | 31 +++++++++++++++++++++ src/osgWrappers/osg/StateSet.cpp | 37 ++++++++++++++++++++++++++ src/osgWrappers/osg/Uniform.cpp | 30 +++++++++++++++++++++ 9 files changed, 121 insertions(+), 7 deletions(-) diff --git a/src/osgWrappers/osg/CopyOp.cpp b/src/osgWrappers/osg/CopyOp.cpp index 98442ea8f..d0d6be236 100644 --- a/src/osgWrappers/osg/CopyOp.cpp +++ b/src/osgWrappers/osg/CopyOp.cpp @@ -21,6 +21,7 @@ #include #include #include +#include TYPE_NAME_ALIAS(unsigned int, osg::CopyOp::CopyFlags); @@ -36,6 +37,7 @@ BEGIN_ENUM_REFLECTOR(osg::CopyOp::Options) EnumLabel(osg::CopyOp::DEEP_COPY_ARRAYS); EnumLabel(osg::CopyOp::DEEP_COPY_PRIMITIVES); EnumLabel(osg::CopyOp::DEEP_COPY_SHAPES); + EnumLabel(osg::CopyOp::DEEP_COPY_UNIFORMS); EnumLabel(osg::CopyOp::DEEP_COPY_ALL); END_REFLECTOR diff --git a/src/osgWrappers/osg/Drawable.cpp b/src/osgWrappers/osg/Drawable.cpp index 633589da2..0bf0bff25 100644 --- a/src/osgWrappers/osg/Drawable.cpp +++ b/src/osgWrappers/osg/Drawable.cpp @@ -63,7 +63,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Drawable) Method1(osg::Node *, getParent, IN, unsigned int, i); Method1(const osg::Node *, getParent, IN, unsigned int, i); Method0(unsigned int, getNumParents); - Method1(void, setStateSet, IN, osg::StateSet *, state); + Method1(void, setStateSet, IN, osg::StateSet *, stateset); Method0(osg::StateSet *, getStateSet); Method0(const osg::StateSet *, getStateSet); Method0(osg::StateSet *, getOrCreateStateSet); diff --git a/src/osgWrappers/osg/Image.cpp b/src/osgWrappers/osg/Image.cpp index 08d88db6e..4cebb33e4 100644 --- a/src/osgWrappers/osg/Image.cpp +++ b/src/osgWrappers/osg/Image.cpp @@ -57,6 +57,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Image) Method0(unsigned int, getImageSizeInBytes); Method0(unsigned int, getTotalSizeInBytes); Method0(unsigned int, getTotalSizeInBytesIncludingMipmaps); + Method0(bool, valid); Method0(unsigned char *, data); Method0(const unsigned char *, data); MethodWithDefaults3(unsigned char *, data, IN, int, column, , IN, int, row, 0, IN, int, image, 0); diff --git a/src/osgWrappers/osg/Node.cpp b/src/osgWrappers/osg/Node.cpp index 421a7575e..7d2952c70 100644 --- a/src/osgWrappers/osg/Node.cpp +++ b/src/osgWrappers/osg/Node.cpp @@ -75,7 +75,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Node) Method1(std::string &, getDescription, IN, unsigned int, i); Method0(unsigned int, getNumDescriptions); Method1(void, addDescription, IN, const std::string &, desc); - Method1(void, setStateSet, IN, osg::StateSet *, dstate); + Method1(void, setStateSet, IN, osg::StateSet *, stateset); Method0(osg::StateSet *, getOrCreateStateSet); Method0(osg::StateSet *, getStateSet); Method0(const osg::StateSet *, getStateSet); diff --git a/src/osgWrappers/osg/Point.cpp b/src/osgWrappers/osg/Point.cpp index 15b2efe7b..4b38ffffa 100644 --- a/src/osgWrappers/osg/Point.cpp +++ b/src/osgWrappers/osg/Point.cpp @@ -47,3 +47,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Point) ReadOnlyProperty(osg::StateAttribute::Type, Type); END_REFLECTOR +BEGIN_OBJECT_REFLECTOR(osg::Point::Extensions) + BaseType(osg::Referenced); + Constructor0(); + Constructor1(IN, const osg::Point::Extensions &, rhs); + Method1(void, lowestCommonDenominator, IN, const osg::Point::Extensions &, rhs); + Method0(void, setupGLExtenions); + Method1(void, setPointParametersSupported, IN, bool, flag); + Method0(bool, isPointParametersSupported); + Method2(void, glPointParameterf, IN, GLenum, pname, IN, GLfloat, param); + Method2(void, glPointParameterfv, IN, GLenum, pname, IN, const GLfloat *, params); + WriteOnlyProperty(bool, PointParametersSupported); +END_REFLECTOR + diff --git a/src/osgWrappers/osg/Shader.cpp b/src/osgWrappers/osg/Shader.cpp index 3b0ce52c5..daf956c76 100644 --- a/src/osgWrappers/osg/Shader.cpp +++ b/src/osgWrappers/osg/Shader.cpp @@ -21,8 +21,8 @@ END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osg::Shader) BaseType(osg::Object); - Constructor0(); - ConstructorWithDefaults2(IN, osg::Shader::Type, type, , IN, const char *, sourceText, 0); + ConstructorWithDefaults1(IN, osg::Shader::Type, type, osg::Shader::UNDEFINED); + Constructor2(IN, osg::Shader::Type, type, IN, const std::string &, source); ConstructorWithDefaults2(IN, const osg::Shader &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); Method0(osg::Object *, cloneType); Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); @@ -31,8 +31,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader) Method0(const char *, className); Method1(int, compare, IN, const osg::Shader &, rhs); Method1(bool, setType, IN, osg::Shader::Type, t); - Method1(void, setShaderSource, IN, const char *, sourceText); - Method1(bool, loadShaderSourceFromFile, IN, const char *, fileName); + Method1(void, setShaderSource, IN, const std::string &, sourceText); + Method1(bool, loadShaderSourceFromFile, IN, const std::string &, fileName); Method0(const std::string &, getShaderSource); Method0(osg::Shader::Type, getType); Method0(const char *, getTypename); @@ -44,7 +44,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader) Method1(void, setName, IN, const char *, name); Method0(const std::string &, getName); Property(const std::string &, Name); - ReadOnlyProperty(const std::string &, ShaderSource); + Property(const std::string &, ShaderSource); PropertyWithReturnType(osg::Shader::Type, Type, bool); ReadOnlyProperty(const char *, Typename); END_REFLECTOR diff --git a/src/osgWrappers/osg/StateAttribute.cpp b/src/osgWrappers/osg/StateAttribute.cpp index 3137b40da..fdd8fe97f 100644 --- a/src/osgWrappers/osg/StateAttribute.cpp +++ b/src/osgWrappers/osg/StateAttribute.cpp @@ -10,9 +10,11 @@ #include #include +#include #include #include #include +#include TYPE_NAME_ALIAS(GLenum, osg::StateAttribute::GLMode); @@ -22,6 +24,8 @@ TYPE_NAME_ALIAS(unsigned int, osg::StateAttribute::OverrideValue); TYPE_NAME_ALIAS(std::pair< osg::StateAttribute::Type COMMA unsigned int >, osg::StateAttribute::TypeMemberPair); +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::StateAttribute::ParentList); + BEGIN_ENUM_REFLECTOR(osg::StateAttribute::Values) EnumLabel(osg::StateAttribute::OFF); EnumLabel(osg::StateAttribute::ON); @@ -92,13 +96,38 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute) Method0(osg::StateAttribute::TypeMemberPair, getTypeMemberPair); Method0(bool, isTextureAttribute); Method1(int, compare, IN, const osg::StateAttribute &, sa); + Method0(const osg::StateAttribute::ParentList &, getParents); + Method1(osg::StateSet *, getParent, IN, unsigned int, i); + Method1(const osg::StateSet *, getParent, IN, unsigned int, i); + Method0(unsigned int, getNumParents); Method1(bool, getModeUsage, IN, osg::StateAttribute::ModeUsage &, x); + Method1(void, setUpdateCallback, IN, osg::StateAttribute::Callback *, uc); + Method0(osg::StateAttribute::Callback *, getUpdateCallback); + Method0(const osg::StateAttribute::Callback *, getUpdateCallback); + Method1(void, setEventCallback, IN, osg::StateAttribute::Callback *, ec); + Method0(osg::StateAttribute::Callback *, getEventCallback); + Method0(const osg::StateAttribute::Callback *, getEventCallback); Method1(void, apply, IN, osg::State &, x); Method1(void, compileGLObjects, IN, osg::State &, x); MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0); + Property(osg::StateAttribute::Callback *, EventCallback); ReadOnlyProperty(unsigned int, Member); + ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void); + ReadOnlyProperty(const osg::StateAttribute::ParentList &, Parents); ReadOnlyProperty(osg::StateAttribute::Type, Type); ReadOnlyProperty(osg::StateAttribute::TypeMemberPair, TypeMemberPair); + Property(osg::StateAttribute::Callback *, UpdateCallback); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::StateAttribute::Callback) + VirtualBaseType(osg::Object); + Constructor0(); + Constructor2(IN, const osg::StateAttribute::Callback &, x, IN, const osg::CopyOp &, x); + Method0(osg::Object *, cloneType); + Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + Method0(const char *, libraryName); + Method0(const char *, className); END_REFLECTOR BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::StateAttribute::ModeUsage) @@ -109,3 +138,5 @@ END_REFLECTOR STD_PAIR_REFLECTOR(std::pair< osg::StateAttribute::Type COMMA unsigned int >); +STD_VECTOR_REFLECTOR(std::vector< osg::StateSet * >); + diff --git a/src/osgWrappers/osg/StateSet.cpp b/src/osgWrappers/osg/StateSet.cpp index 5b78343f5..6e329217d 100644 --- a/src/osgWrappers/osg/StateSet.cpp +++ b/src/osgWrappers/osg/StateSet.cpp @@ -10,12 +10,15 @@ #include #include +#include #include #include #include #include #include +TYPE_NAME_ALIAS(std::vector< osg::Object * >, osg::StateSet::ParentList); + TYPE_NAME_ALIAS(std::map< osg::StateAttribute::GLMode COMMA osg::StateAttribute::GLModeValue >, osg::StateSet::ModeList); TYPE_NAME_ALIAS(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::StateAttribute::OverrideValue >, osg::StateSet::RefAttributePair); @@ -53,6 +56,11 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet) Method0(const char *, libraryName); Method0(const char *, className); MethodWithDefaults2(int, compare, IN, const osg::StateSet &, rhs, , IN, bool, compareAttributeContents, false); + Method0(const osg::StateSet::ParentList &, getParents); + Method0(osg::StateSet::ParentList, getParents); + Method1(osg::Object *, getParent, IN, unsigned int, i); + Method1(const osg::Object *, getParent, IN, unsigned int, i); + Method0(unsigned int, getNumParents); Method0(void, setGlobalDefaults); Method0(void, clear); Method1(void, merge, IN, const osg::StateSet &, rhs); @@ -110,19 +118,46 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet) Method0(int, getBinNumber); Method1(void, setBinName, IN, const std::string &, name); Method0(const std::string &, getBinName); + Method1(void, setUpdateCallback, IN, osg::StateSet::Callback *, ac); + Method0(osg::StateSet::Callback *, getUpdateCallback); + Method0(const osg::StateSet::Callback *, getUpdateCallback); + Method0(bool, requiresUpdateTraversal); + Method0(unsigned int, getNumChildrenRequiringUpdateTraversal); + Method1(void, runUpdateCallbacks, IN, osg::NodeVisitor *, nv); + Method1(void, setEventCallback, IN, osg::StateSet::Callback *, ac); + Method0(osg::StateSet::Callback *, getEventCallback); + Method0(const osg::StateSet::Callback *, getEventCallback); + Method0(bool, requiresEventTraversal); + Method0(unsigned int, getNumChildrenRequiringEventTraversal); + Method1(void, runEventCallbacks, IN, osg::NodeVisitor *, nv); Method1(void, compileGLObjects, IN, osg::State &, state); MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, state, 0); Property(osg::StateSet::AttributeList &, AttributeList); Property(const std::string &, BinName); Property(int, BinNumber); + Property(osg::StateSet::Callback *, EventCallback); Property(osg::StateSet::ModeList &, ModeList); + ArrayProperty_G(osg::Object *, Parent, Parents, unsigned int, void); + ReadOnlyProperty(osg::StateSet::ParentList, Parents); Property(osg::StateSet::RenderBinMode, RenderBinMode); Property(int, RenderingHint); Property(osg::StateSet::TextureAttributeList &, TextureAttributeList); IndexedProperty2(osg::StateAttribute::GLModeValue, TextureMode, unsigned int, unit, osg::StateAttribute::GLMode, mode); Property(osg::StateSet::TextureModeList &, TextureModeList); Property(osg::StateSet::UniformList &, UniformList); + Property(osg::StateSet::Callback *, UpdateCallback); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::StateSet::Callback) + VirtualBaseType(osg::Object); + Constructor0(); + Constructor2(IN, const osg::StateSet::Callback &, x, IN, const osg::CopyOp &, x); + Method0(osg::Object *, cloneType); + Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + Method0(const char *, libraryName); + Method0(const char *, className); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::StateAttribute >) @@ -158,6 +193,8 @@ STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::StateAttribute > COMMA osg::St STD_PAIR_REFLECTOR(std::pair< osg::ref_ptr< osg::Uniform > COMMA osg::StateAttribute::OverrideValue >); +STD_VECTOR_REFLECTOR(std::vector< osg::Object * >); + STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::AttributeList >); STD_VECTOR_REFLECTOR(std::vector< osg::StateSet::ModeList >); diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp index 08697a0a7..d98c0602a 100644 --- a/src/osgWrappers/osg/Uniform.cpp +++ b/src/osgWrappers/osg/Uniform.cpp @@ -11,13 +11,17 @@ #include #include +#include #include #include +#include #include #include #include #include +TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList); + BEGIN_ENUM_REFLECTOR(osg::Uniform::Type) EnumLabel(osg::Uniform::FLOAT); EnumLabel(osg::Uniform::FLOAT_VEC2); @@ -73,6 +77,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform) Method1(int, compare, IN, const osg::Uniform &, rhs); Method1(int, compareData, IN, const osg::Uniform &, rhs); Method1(void, copyData, IN, const osg::Uniform &, rhs); + Method0(const osg::Uniform::ParentList &, getParents); + Method0(osg::Uniform::ParentList, getParents); + Method1(osg::StateSet *, getParent, IN, unsigned int, i); + Method1(const osg::StateSet *, getParent, IN, unsigned int, i); + Method0(unsigned int, getNumParents); Method1(bool, set, IN, float, f); Method1(bool, set, IN, int, i); Method1(bool, set, IN, bool, b); @@ -99,9 +108,30 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform) Method2(bool, get, IN, bool &, b0, IN, bool &, b1); Method3(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2); Method4(bool, get, IN, bool &, b0, IN, bool &, b1, IN, bool &, b2, IN, bool &, b3); + Method1(void, setUpdateCallback, IN, osg::Uniform::Callback *, uc); + Method0(osg::Uniform::Callback *, getUpdateCallback); + Method0(const osg::Uniform::Callback *, getUpdateCallback); + Method1(void, setEventCallback, IN, osg::Uniform::Callback *, ec); + Method0(osg::Uniform::Callback *, getEventCallback); + Method0(const osg::Uniform::Callback *, getEventCallback); Method2(void, apply, IN, const osg::GL2Extensions *, ext, IN, GLint, location); WriteOnlyPropertyWithReturnType(bool, , bool); + Property(osg::Uniform::Callback *, EventCallback); PropertyWithReturnType(const std::string &, Name, bool); + ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void); + ReadOnlyProperty(osg::Uniform::ParentList, Parents); WriteOnlyPropertyWithReturnType(osg::Uniform::Type, Type, bool); + Property(osg::Uniform::Callback *, UpdateCallback); +END_REFLECTOR + +BEGIN_VALUE_REFLECTOR(osg::Uniform::Callback) + VirtualBaseType(osg::Object); + Constructor0(); + Constructor2(IN, const osg::Uniform::Callback &, x, IN, const osg::CopyOp &, x); + Method0(osg::Object *, cloneType); + Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); + Method1(bool, isSameKindAs, IN, const osg::Object *, obj); + Method0(const char *, libraryName); + Method0(const char *, className); END_REFLECTOR