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

Updated osgunittests with a matrix invert unit test, and added a conditional

Browse Source 
calling of invert_4x4 or invert_4x3 depending on the the right hand column of the matrix.

Updated wrappers
This commit is contained in:
Robert Osfield
2006-07-28 13:48:08 +00:00
parent f5b5f7f527
commit f977d7c606
8 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,8 +75,8 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixd)
I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3f &, eye, , IN, osg::Vec3f &, center, , IN, osg::Vec3f &, up, , IN, osg::Matrixd::value_type, lookDistance, 1.0f);
I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3d &, eye, , IN, osg::Vec3d &, center, , IN, osg::Vec3d &, up, , IN, osg::Matrixd::value_type, lookDistance, 1.0f);
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(bool, invert_4x3, IN, const osg::Matrixd &, rhs);
I_Method1(bool, invert_4x4, IN, const osg::Matrixd &, rhs);
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);

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

@@ -75,8 +75,8 @@ BEGIN_VALUE_REFLECTOR(osg::Matrixf)
I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3f &, eye, , IN, osg::Vec3f &, center, , IN, osg::Vec3f &, up, , IN, osg::Matrixf::value_type, lookDistance, 1.0f);
I_MethodWithDefaults4(void, getLookAt, IN, osg::Vec3d &, eye, , IN, osg::Vec3d &, center, , IN, osg::Vec3d &, up, , IN, osg::Matrixf::value_type, lookDistance, 1.0f);
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(bool, invert_4x3, IN, const osg::Matrixf &, rhs);
I_Method1(bool, invert_4x4, IN, const osg::Matrixf &, rhs);
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);

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

@@ -28,7 +28,7 @@
TYPE_NAME_ALIAS(std::list< osg::ref_ptr< osg::Texture::TextureObject > >, osg::Texture::TextureObjectList);
TYPE_NAME_ALIAS(std::map< unsigned int COMMA osg::Texture::TextureObjectList >, osg::Texture::TextureObjectListMap);
TYPE_NAME_ALIAS(osg::buffered_object< osg::Texture::TextureObjectList >, osg::Texture::TextureObjectListMap);
BEGIN_ENUM_REFLECTOR(osg::Texture::WrapParameter)
I_EnumLabel(osg::Texture::WRAP_S);
@@ -235,6 +235,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObject)
I_WriteOnlyProperty(bool, Allocated);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::buffered_object< osg::Texture::TextureObjectList >)
I_Constructor0();
I_Constructor1(IN, unsigned int, size);
I_Method1(void, setAllElementsTo, IN, const osg::Texture::TextureObjectList &, t);
I_Method0(void, clear);
I_Method0(bool, empty);
I_Method0(unsigned int, size);
I_WriteOnlyProperty(const osg::Texture::TextureObjectList &, AllElementsTo);
END_REFLECTOR
BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::Texture::TextureObject >)
I_Constructor0();
I_Constructor1(IN, osg::Texture::TextureObject *, ptr);
@@ -248,5 +258,3 @@ END_REFLECTOR
STD_LIST_REFLECTOR(std::list< osg::ref_ptr< osg::Texture::TextureObject > >);
STD_MAP_REFLECTOR(std::map< unsigned int COMMA osg::Texture::TextureObjectList >);

1
src/osgWrappers/osgGA/EventQueue.cpp
View File

@@ -39,6 +39,7 @@ BEGIN_OBJECT_REFLECTOR(osgGA::EventQueue)
I_Method2(void, mouseWarp, IN, float, x, IN, float, y);
I_Method2(void, mouseMotion, IN, float, x, IN, float, y);
I_Method3(void, mouseButtonPress, IN, float, x, IN, float, y, IN, unsigned int, button);
I_Method3(void, mouseDoubleButtonPress, IN, float, x, IN, float, y, IN, unsigned int, button);
I_Method3(void, mouseButtonRelease, IN, float, x, IN, float, y, IN, unsigned int, button);
I_Method1(void, keyPress, IN, osgGA::GUIEventAdapter::KeySymbol, key);
I_Method1(void, keyRelease, IN, osgGA::GUIEventAdapter::KeySymbol, key);