FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated osgWrappers.

Browse Source
This commit is contained in:
Robert Osfield 2005-05-08 18:37:13 +00:00
parent 7d6c90aaa4
commit cf6e081b93
8 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osgWrappers/osg/Geode.cpp
View File

@ -41,6 +41,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Geode)
Method1(unsigned int, getDrawableIndex, IN, const osg::Drawable *, drawable); Method1(unsigned int, getDrawableIndex, IN, const osg::Drawable *, drawable);
Method1(void, compileDrawables, IN, osg::State &, state); Method1(void, compileDrawables, IN, osg::State &, state);
Method0(const osg::BoundingBox &, getBoundingBox); Method0(const osg::BoundingBox &, getBoundingBox);
MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
ReadOnlyProperty(const osg::BoundingBox &, BoundingBox); ReadOnlyProperty(const osg::BoundingBox &, BoundingBox);
ArrayProperty_GSA(osg::Drawable *, Drawable, Drawables, unsigned int, bool); ArrayProperty_GSA(osg::Drawable *, Drawable, Drawables, unsigned int, bool);
END_REFLECTOR END_REFLECTOR

2
src/osgWrappers/osg/Group.cpp
View File

@ -14,6 +14,7 @@
#include <osg/Node> #include <osg/Node>
#include <osg/NodeVisitor> #include <osg/NodeVisitor>
#include <osg/Object> #include <osg/Object>
#include <osg/State>
BEGIN_OBJECT_REFLECTOR(osg::Group) BEGIN_OBJECT_REFLECTOR(osg::Group)
BaseType(osg::Node); BaseType(osg::Node);
@ -39,6 +40,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Group)
Method1(const osg::Node *, getChild, IN, unsigned int, i); Method1(const osg::Node *, getChild, IN, unsigned int, i);
Method1(bool, containsNode, IN, const osg::Node *, node); Method1(bool, containsNode, IN, const osg::Node *, node);
Method1(unsigned int, getChildIndex, IN, const osg::Node *, node); Method1(unsigned int, getChildIndex, IN, const osg::Node *, node);
MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
ArrayProperty_GSA(osg::Node *, Child, Children, unsigned int, bool); ArrayProperty_GSA(osg::Node *, Child, Children, unsigned int, bool);
END_REFLECTOR END_REFLECTOR

2
src/osgWrappers/osg/Node.cpp
View File

@ -16,6 +16,7 @@
#include <osg/NodeCallback> #include <osg/NodeCallback>
#include <osg/NodeVisitor> #include <osg/NodeVisitor>
#include <osg/Object> #include <osg/Object>
#include <osg/State>
#include <osg/StateSet> #include <osg/StateSet>
#include <osg/Transform> #include <osg/Transform>
@ -81,6 +82,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Node)
Method0(const osg::StateSet *, getStateSet); Method0(const osg::StateSet *, getStateSet);
Method0(const osg::BoundingSphere &, getBound); Method0(const osg::BoundingSphere &, getBound);
Method0(void, dirtyBound); Method0(void, dirtyBound);
MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
ReadOnlyProperty(const osg::BoundingSphere &, Bound); ReadOnlyProperty(const osg::BoundingSphere &, Bound);
Property(osg::NodeCallback *, CullCallback); Property(osg::NodeCallback *, CullCallback);
Property(bool, CullingActive); Property(bool, CullingActive);

2
src/osgWrappers/osg/Object.cpp
View File

@ -12,6 +12,7 @@
#include <osg/CopyOp> #include <osg/CopyOp>
#include <osg/Object> #include <osg/Object>
#include <osg/Referenced> #include <osg/Referenced>
#include <osg/State>
BEGIN_ENUM_REFLECTOR(osg::Object::DataVariance) BEGIN_ENUM_REFLECTOR(osg::Object::DataVariance)
EnumLabel(osg::Object::DYNAMIC); EnumLabel(osg::Object::DYNAMIC);
@ -32,6 +33,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object)
Method1(void, setUserData, IN, osg::Referenced *, obj); Method1(void, setUserData, IN, osg::Referenced *, obj);
Method0(osg::Referenced *, getUserData); Method0(osg::Referenced *, getUserData);
Method0(const osg::Referenced *, getUserData); Method0(const osg::Referenced *, getUserData);
MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
Property(osg::Object::DataVariance, DataVariance); Property(osg::Object::DataVariance, DataVariance);
Property(osg::Referenced *, UserData); Property(osg::Referenced *, UserData);
END_REFLECTOR END_REFLECTOR

14
src/osgWrappers/osg/Program.cpp
View File

@ -143,6 +143,8 @@ END_REFLECTOR
TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindingList); TYPE_NAME_ALIAS(std::map< std::string COMMA GLuint >, osg::Program::AttribBindingList);
TYPE_NAME_ALIAS(std::map< std::string COMMA std::pair< GLint COMMA GLenum > >, osg::Program::NameInfoMap);
BEGIN_OBJECT_REFLECTOR(osg::Program) BEGIN_OBJECT_REFLECTOR(osg::Program)
BaseType(osg::StateAttribute); BaseType(osg::StateAttribute);
Constructor0(); Constructor0();
@ -170,6 +172,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Program)
Method1(void, setName, IN, const std::string &, name); Method1(void, setName, IN, const std::string &, name);
Method1(void, setName, IN, const char *, name); Method1(void, setName, IN, const char *, name);
Method0(const std::string &, getName); Method0(const std::string &, getName);
Method1(const osg::Program::NameInfoMap &, getActiveUniforms, IN, unsigned int, contextID);
Method1(const osg::Program::NameInfoMap &, getActiveAttribs, IN, unsigned int, contextID);
Method1(osg::Program::PerContextProgram *, getPCP, IN, unsigned int, contextID); Method1(osg::Program::PerContextProgram *, getPCP, IN, unsigned int, contextID);
ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList); ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList);
Property(const std::string &, Name); Property(const std::string &, Name);
@ -187,12 +191,20 @@ BEGIN_OBJECT_REFLECTOR(osg::Program::PerContextProgram)
Method0(bool, isLinked); Method0(bool, isLinked);
Method1(bool, getInfoLog, IN, std::string &, infoLog); Method1(bool, getInfoLog, IN, std::string &, infoLog);
Method0(void, useProgram); Method0(void, useProgram);
Method0(void, resetAppliedUnifroms); Method0(void, resetAppliedUniforms);
Method1(void, apply, IN, const osg::Uniform &, uniform); Method1(void, apply, IN, const osg::Uniform &, uniform);
Method0(const osg::Program::NameInfoMap &, getActiveUniforms);
Method0(const osg::Program::NameInfoMap &, getActiveAttribs);
Method1(GLint, getUniformLocation, IN, const std::string &, name); Method1(GLint, getUniformLocation, IN, const std::string &, name);
Method1(GLint, getAttribLocation, IN, const std::string &, name); Method1(GLint, getAttribLocation, IN, const std::string &, name);
ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveAttribs);
ReadOnlyProperty(const osg::Program::NameInfoMap &, ActiveUniforms);
ReadOnlyProperty(GLuint, Handle); ReadOnlyProperty(GLuint, Handle);
END_REFLECTOR END_REFLECTOR
STD_MAP_REFLECTOR(std::map< std::string COMMA GLuint >); STD_MAP_REFLECTOR(std::map< std::string COMMA GLuint >);
STD_MAP_REFLECTOR(std::map< std::string COMMA std::pair< GLint COMMA GLenum > >);
STD_PAIR_REFLECTOR(std::pair< GLint COMMA GLenum >);

1
src/osgWrappers/osg/StateSet.cpp
View File

@ -102,6 +102,7 @@ BEGIN_OBJECT_REFLECTOR(osg::StateSet)
Method1(void, removeUniform, IN, const std::string &, name); Method1(void, removeUniform, IN, const std::string &, name);
Method1(void, removeUniform, IN, osg::Uniform *, uniform); Method1(void, removeUniform, IN, osg::Uniform *, uniform);
Method1(osg::Uniform *, getUniform, IN, const std::string &, name); Method1(osg::Uniform *, getUniform, IN, const std::string &, name);
Method2(osg::Uniform *, getOrCreateUniform, IN, const std::string &, name, IN, osg::Uniform::Type, type);
Method1(const osg::Uniform *, getUniform, IN, const std::string &, name); Method1(const osg::Uniform *, getUniform, IN, const std::string &, name);
Method1(const osg::StateSet::RefUniformPair *, getUniformPair, IN, const std::string &, name); Method1(const osg::StateSet::RefUniformPair *, getUniformPair, IN, const std::string &, name);
Method1(void, setUniformList, IN, osg::StateSet::UniformList &, al); Method1(void, setUniformList, IN, osg::StateSet::UniformList &, al);

4
src/osgWrappers/osg/Texture.cpp
View File

@ -96,6 +96,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture)
Method0(bool, getUnRefImageDataAfterApply); Method0(bool, getUnRefImageDataAfterApply);
Method1(void, setClientStorageHint, IN, bool, flag); Method1(void, setClientStorageHint, IN, bool, flag);
Method0(bool, getClientStorageHint); Method0(bool, getClientStorageHint);
Method1(void, setResizeNonPowerOfTwoHint, IN, bool, flag);
Method0(bool, getResizeNonPowerOfTwoHint);
Method1(void, setInternalFormatMode, IN, osg::Texture::InternalFormatMode, mode); Method1(void, setInternalFormatMode, IN, osg::Texture::InternalFormatMode, mode);
Method0(osg::Texture::InternalFormatMode, getInternalFormatMode); Method0(osg::Texture::InternalFormatMode, getInternalFormatMode);
Method1(void, setInternalFormat, IN, GLint, internalFormat); Method1(void, setInternalFormat, IN, GLint, internalFormat);
@ -131,6 +133,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture)
Property(GLint, InternalFormat); Property(GLint, InternalFormat);
Property(osg::Texture::InternalFormatMode, InternalFormatMode); Property(osg::Texture::InternalFormatMode, InternalFormatMode);
Property(float, MaxAnisotropy); Property(float, MaxAnisotropy);
Property(bool, ResizeNonPowerOfTwoHint);
Property(float, ShadowAmbient); Property(float, ShadowAmbient);
Property(osg::Texture::ShadowCompareFunc, ShadowCompareFunc); Property(osg::Texture::ShadowCompareFunc, ShadowCompareFunc);
WriteOnlyProperty(bool, ShadowComparison); WriteOnlyProperty(bool, ShadowComparison);
@ -179,6 +182,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture::Extensions)
Method1(void, setGetCompressedTexImageProc, IN, void *, ptr); Method1(void, setGetCompressedTexImageProc, IN, void *, ptr);
Method3(void, glGetCompressedTexImage, IN, GLenum, target, IN, GLint, level, IN, GLvoid *, data); Method3(void, glGetCompressedTexImage, IN, GLenum, target, IN, GLint, level, IN, GLvoid *, data);
Method0(bool, isClientStorageSupported); Method0(bool, isClientStorageSupported);
Method0(bool, isNonPowerOfTwoTextureSupported);
WriteOnlyProperty(void *, CompressedTexImage2DProc); WriteOnlyProperty(void *, CompressedTexImage2DProc);
WriteOnlyProperty(void *, CompressedTexSubImage2DProc); WriteOnlyProperty(void *, CompressedTexSubImage2DProc);
WriteOnlyProperty(bool, GenerateMipMapSupported); WriteOnlyProperty(bool, GenerateMipMapSupported);

2
src/osgWrappers/osg/Uniform.cpp
View File

@ -50,7 +50,7 @@ END_REFLECTOR
BEGIN_OBJECT_REFLECTOR(osg::Uniform) BEGIN_OBJECT_REFLECTOR(osg::Uniform)
BaseType(osg::Object); BaseType(osg::Object);
Constructor0(); Constructor0();
Constructor2(IN, const char *, name, IN, osg::Uniform::Type, type); Constructor2(IN, osg::Uniform::Type, type, IN, const std::string &, name);
ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY); ConstructorWithDefaults2(IN, const osg::Uniform &, rhs, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY);
Method0(osg::Object *, cloneType); Method0(osg::Object *, cloneType);
Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop); Method1(osg::Object *, clone, IN, const osg::CopyOp &, copyop);