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

Updated wrappers.

Browse Source
This commit is contained in:
Robert Osfield
2005-06-08 13:20:09 +00:00
parent 27c4c6a956
commit 38528c4952
9 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,7 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixd)
I_Method1(bool, invert, IN, const osg::Matrixd &, rhs);
I_Method1(bool, invert_4x4_orig, IN, const osg::Matrixd &, x);
I_Method1(bool, invert_4x4_new, IN, const osg::Matrixd &, x);
I_Method1(void, orthoNormalize, IN, const osg::Matrixd &, rhs);
I_Method1(osg::Vec3f, preMult, IN, const osg::Vec3f &, v);
I_Method1(osg::Vec3d, preMult, IN, const osg::Vec3d &, v);
I_Method1(osg::Vec3f, postMult, IN, const osg::Vec3f &, v);

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

@@ -77,6 +77,7 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixf)
I_Method1(bool, invert, IN, const osg::Matrixf &, rhs);
I_Method1(bool, invert_4x4_orig, IN, const osg::Matrixf &, x);
I_Method1(bool, invert_4x4_new, IN, const osg::Matrixf &, x);
I_Method1(void, orthoNormalize, IN, const osg::Matrixf &, rhs);
I_Method1(osg::Vec3f, preMult, IN, const osg::Vec3f &, v);
I_Method1(osg::Vec3d, preMult, IN, const osg::Vec3d &, v);
I_Method1(osg::Vec3f, postMult, IN, const osg::Vec3f &, v);

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

@@ -50,9 +50,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Node)
I_Method1(void, accept, IN, osg::NodeVisitor &, nv);
I_Method1(void, ascend, IN, osg::NodeVisitor &, nv);
I_Method1(void, traverse, IN, osg::NodeVisitor &, x);
I_Method1(void, setName, IN, const std::string &, name);
I_Method1(void, setName, IN, const char *, name);
I_Method0(const std::string &, getName);
I_Method0(const osg::Node::ParentList &, getParents);
I_Method0(osg::Node::ParentList, getParents);
I_Method1(osg::Group *, getParent, IN, unsigned int, i);
@@ -105,7 +102,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Node)
I_Property(const osg::Node::DescriptionList &, Descriptions);
I_Property(osg::NodeCallback *, EventCallback);
I_Property(const osg::BoundingSphere &, InitialBound);
I_Property(const std::string &, Name);
I_Property(osg::Node::NodeMask, NodeMask);
I_ArrayProperty_G(osg::Group *, Parent, Parents, unsigned int, void);
I_ReadOnlyProperty(osg::Node::ParentList, Parents);

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

@@ -36,6 +36,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object)
I_Method1(bool, isSameKindAs, IN, const osg::Object *, x);
I_Method0(const char *, libraryName);
I_Method0(const char *, className);
I_Method1(void, setName, IN, const std::string &, name);
I_Method1(void, setName, IN, const char *, name);
I_Method0(const std::string &, getName);
I_Method1(void, setDataVariance, IN, osg::Object::DataVariance, dv);
I_Method0(osg::Object::DataVariance, getDataVariance);
I_Method1(void, setUserData, IN, osg::Referenced *, obj);
@@ -43,6 +46,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Object)
I_Method0(const osg::Referenced *, getUserData);
I_MethodWithDefaults1(void, releaseGLObjects, IN, osg::State *, x, 0);
I_Property(osg::Object::DataVariance, DataVariance);
I_Property(const std::string &, Name);
I_Property(osg::Referenced *, UserData);
END_REFLECTOR

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

@@ -54,14 +54,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Program)
I_Method0(const osg::Program::AttribBindingList &, getAttribBindingList);
I_Method0(bool, isFixedFunction);
I_Method2(bool, getGlProgramInfoLog, IN, unsigned int, contextID, IN, std::string &, log);
I_Method1(void, setName, IN, const std::string &, name);
I_Method1(void, setName, IN, const char *, name);
I_Method0(const std::string &, getName);
I_Method1(const osg::Program::NameInfoMap &, getActiveUniforms, IN, unsigned int, contextID);
I_Method1(const osg::Program::NameInfoMap &, getActiveAttribs, IN, unsigned int, contextID);
I_Method1(osg::Program::PerContextProgram *, getPCP, IN, unsigned int, contextID);
I_ReadOnlyProperty(const osg::Program::AttribBindingList &, AttribBindingList);
I_Property(const std::string &, Name);
I_ArrayProperty_GA(osg::Shader *, Shader, Shaders, unsigned int, bool);
I_ReadOnlyProperty(osg::StateAttribute::Type, Type);
END_REFLECTOR

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

@@ -48,10 +48,6 @@ BEGIN_OBJECT_REFLECTOR(osg::Shader)
I_Method1(void, compileShader, IN, unsigned int, contextID);
I_Method2(void, attachShader, IN, unsigned int, contextID, IN, GLuint, program);
I_Method2(bool, getGlShaderInfoLog, IN, unsigned int, contextID, IN, std::string &, log);
I_Method1(void, setName, IN, const std::string &, name);
I_Method1(void, setName, IN, const char *, name);
I_Method0(const std::string &, getName);
I_Property(const std::string &, Name);
I_Property(const std::string &, ShaderSource);
I_PropertyWithReturnType(osg::Shader::Type, Type, bool);
I_ReadOnlyProperty(const char *, Typename);

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

@@ -29,6 +29,32 @@
#undef OUT
#endif
BEGIN_VALUE_REFLECTOR(osg::Matrix2)
I_Constructor0();
I_Constructor1(IN, const osg::Matrix2 &, mat);
I_Constructor4(IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11);
I_Method1(void, set, IN, const osg::Matrix2 &, rhs);
I_Method1(void, set, IN, float const *const, ptr);
I_Method4(void, set, IN, float, a00, IN, float, a01, IN, float, a10, IN, float, a11);
I_Method0(float *, ptr);
I_Method0(const float *, ptr);
I_Method0(void, makeIdentity);
I_WriteOnlyProperty(float const *const, );
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::Matrix3)
I_Constructor0();
I_Constructor1(IN, const osg::Matrix3 &, mat);
I_Constructor9(IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22);
I_Method1(void, set, IN, const osg::Matrix3 &, rhs);
I_Method1(void, set, IN, float const *const, ptr);
I_Method9(void, set, IN, float, a00, IN, float, a01, IN, float, a02, IN, float, a10, IN, float, a11, IN, float, a12, IN, float, a20, IN, float, a21, IN, float, a22);
I_Method0(float *, ptr);
I_Method0(const float *, ptr);
I_Method0(void, makeIdentity);
I_WriteOnlyProperty(float const *const, );
END_REFLECTOR
TYPE_NAME_ALIAS(std::vector< osg::StateSet * >, osg::Uniform::ParentList);
BEGIN_ENUM_REFLECTOR(osg::Uniform::Type)
@@ -67,15 +93,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
I_Method0(const char *, libraryName);
I_Method0(const char *, className);
I_Method1(bool, setType, IN, osg::Uniform::Type, t);
I_Method1(bool, setName, IN, const std::string &, name);
I_Method0(const std::string &, getName);
I_Method0(const osg::Uniform::Type, getType);
I_Method1(void, setName, IN, const std::string &, name);
I_Constructor2(IN, const char *, name, IN, float, f);
I_Constructor2(IN, const char *, name, IN, int, i);
I_Constructor2(IN, const char *, name, IN, bool, b);
I_Constructor2(IN, const char *, name, IN, const osg::Vec2 &, v2);
I_Constructor2(IN, const char *, name, IN, const osg::Vec3 &, v3);
I_Constructor2(IN, const char *, name, IN, const osg::Vec4 &, v4);
I_Constructor2(IN, const char *, name, IN, const osg::Matrix2 &, m2);
I_Constructor2(IN, const char *, name, IN, const osg::Matrix3 &, m3);
I_Constructor2(IN, const char *, name, IN, const osg::Matrixf &, m4);
I_Constructor2(IN, const char *, name, IN, const osg::Matrixd &, m4);
I_Constructor3(IN, const char *, name, IN, int, i0, IN, int, i1);
@@ -98,6 +125,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
I_Method1(bool, set, IN, const osg::Vec2 &, v2);
I_Method1(bool, set, IN, const osg::Vec3 &, v3);
I_Method1(bool, set, IN, const osg::Vec4 &, v4);
I_Method1(bool, set, IN, const osg::Matrix2 &, m2);
I_Method1(bool, set, IN, const osg::Matrix3 &, m3);
I_Method1(bool, set, IN, const osg::Matrixf &, m4);
I_Method1(bool, set, IN, const osg::Matrixd &, m4);
I_Method2(bool, set, IN, int, i0, IN, int, i1);
@@ -112,6 +141,8 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
I_Method1(bool, get, IN, osg::Vec2 &, v2);
I_Method1(bool, get, IN, osg::Vec3 &, v3);
I_Method1(bool, get, IN, osg::Vec4 &, v4);
I_Method1(bool, get, IN, osg::Matrix2 &, m2);
I_Method1(bool, get, IN, osg::Matrix3 &, m3);
I_Method1(bool, get, IN, osg::Matrixf &, m4);
I_Method1(bool, get, IN, osg::Matrixd &, m4);
I_Method2(bool, get, IN, int &, i0, IN, int &, i1);
@@ -133,7 +164,7 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
I_WriteOnlyPropertyWithReturnType(bool, , bool);
I_Property(osg::Uniform::Callback *, EventCallback);
I_Property(unsigned int, ModifiedCount);
I_PropertyWithReturnType(const std::string &, Name, bool);
I_WriteOnlyProperty(const std::string &, Name);
I_ArrayProperty_G(osg::StateSet *, Parent, Parents, unsigned int, void);
I_ReadOnlyProperty(osg::Uniform::ParentList, Parents);
I_WriteOnlyPropertyWithReturnType(osg::Uniform::Type, Type, bool);

3
src/osgWrappers/osgDB/DatabasePager.cpp
View File

@@ -71,6 +71,8 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
I_Method1(void, signalBeginFrame, IN, const osg::FrameStamp *, framestamp);
I_Method0(void, signalEndFrame);
I_Method1(void, registerPagedLODs, IN, osg::Node *, subgraph);
I_Method1(void, setDoPreCompile, IN, bool, flag);
I_Method0(bool, getDoPreCompile);
I_Method1(void, setTargetFrameRate, IN, double, tfr);
I_Method0(double, getTargetFrameRate);
I_Method1(void, setMinimumTimeAvailableForGLCompileAndDeletePerFrame, IN, double, ta);
@@ -95,6 +97,7 @@ BEGIN_OBJECT_REFLECTOR(osgDB::DatabasePager)
I_IndexedProperty1(bool, CompileGLObjectsForContextID, unsigned int, contextID);
I_Property(bool, DatabasePagerThreadPause);
I_Property(bool, DeleteRemovedSubgraphsInDatabaseThread);
I_Property(bool, DoPreCompile);
I_Property(double, ExpiryDelay);
I_ReadOnlyProperty(osgDB::Block *, FrameBlock);
I_Property(unsigned int, MaximumNumOfObjectsToCompilePerFrame);

11
src/osgWrappers/osgProducer/EventAdapter.cpp
View File

@@ -24,14 +24,18 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::EventAdapter)
I_BaseType(osgGA::GUIEventAdapter);
I_Constructor0();
I_Method0(osgGA::GUIEventAdapter::EventType, getEventType);
I_Method1(void, setKey, IN, int, key);
I_Method0(int, getKey);
I_Method0(int, getButton);
I_Method0(float, getXmin);
I_Method0(float, getXmax);
I_Method0(float, getYmin);
I_Method0(float, getYmax);
I_Method1(void, setX, IN, float, x);
I_Method0(float, getX);
I_Method1(void, setY, IN, float, y);
I_Method0(float, getY);
I_Method1(void, setButtonMak, IN, unsigned int, mask);
I_Method0(unsigned int, getButtonMask);
I_Method0(double, time);
I_Method0(unsigned int, getModKeyMask);
@@ -45,14 +49,15 @@ BEGIN_OBJECT_REFLECTOR(osgProducer::EventAdapter)
I_Method1(void, adaptFrame, IN, double, t);
I_Method0(void, copyStaticVariables);
I_ReadOnlyProperty(int, Button);
I_WriteOnlyProperty(unsigned int, ButtonMak);
I_ReadOnlyProperty(unsigned int, ButtonMask);
I_ReadOnlyProperty(osgGA::GUIEventAdapter::EventType, EventType);
I_ReadOnlyProperty(int, Key);
I_Property(int, Key);
I_ReadOnlyProperty(unsigned int, ModKeyMask);
I_ReadOnlyProperty(float, X);
I_Property(float, X);
I_ReadOnlyProperty(float, Xmax);
I_ReadOnlyProperty(float, Xmin);
I_ReadOnlyProperty(float, Y);
I_Property(float, Y);
I_ReadOnlyProperty(float, Ymax);
I_ReadOnlyProperty(float, Ymin);
END_REFLECTOR