From 68c459ea30c291e5f07a2d3976a314c47aaa59b0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 24 Jul 2009 14:45:09 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/ApplicationUsage.cpp | 4 ++-- src/osgWrappers/osg/Camera.cpp | 6 ++--- src/osgWrappers/osg/CoordinateSystemNode.cpp | 9 +++++-- src/osgWrappers/osg/Shape.cpp | 2 +- .../osgAnimation/AnimationManagerBase.cpp | 14 +++++++++++ src/osgWrappers/osgAnimation/LinkVisitor.cpp | 24 +++++++++++-------- .../osgAnimation/MorphGeometry.cpp | 2 +- src/osgWrappers/osgTerrain/Locator.cpp | 4 ++-- src/osgWrappers/osgTerrain/TerrainTile.cpp | 2 +- 9 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/osgWrappers/osg/ApplicationUsage.cpp b/src/osgWrappers/osg/ApplicationUsage.cpp index acf3c22f2..fc5d1ed09 100644 --- a/src/osgWrappers/osg/ApplicationUsage.cpp +++ b/src/osgWrappers/osg/ApplicationUsage.cpp @@ -49,7 +49,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage) I_Method1(void, setApplicationName, IN, const std::string &, name, Properties::NON_VIRTUAL, __void__setApplicationName__C5_std_string_R1, - "", + "The ApplicationName is often displayed when logging errors, and frequently incorporated into the Description (below). ", ""); I_Method0(const std::string &, getApplicationName, Properties::NON_VIRTUAL, @@ -59,7 +59,7 @@ BEGIN_OBJECT_REFLECTOR(osg::ApplicationUsage) I_Method1(void, setDescription, IN, const std::string &, desc, Properties::NON_VIRTUAL, __void__setDescription__C5_std_string_R1, - "", + "If non-empty, the Description is typically shown by the Help Handler as text on the Help display (which also lists keyboard abbreviations. ", ""); I_Method0(const std::string &, getDescription, Properties::NON_VIRTUAL, diff --git a/src/osgWrappers/osg/Camera.cpp b/src/osgWrappers/osg/Camera.cpp index 1c05cec2e..0c2509b51 100644 --- a/src/osgWrappers/osg/Camera.cpp +++ b/src/osgWrappers/osg/Camera.cpp @@ -182,17 +182,17 @@ BEGIN_OBJECT_REFLECTOR(osg::Camera) I_Method1(void, setDisplaySettings, IN, osg::DisplaySettings *, ds, Properties::NON_VIRTUAL, __void__setDisplaySettings__osg_DisplaySettings_P1, - "Set the DsplaySettings object associated with this view. ", + "Set the DisplaySettings object associated with this view. ", ""); I_Method0(osg::DisplaySettings *, getDisplaySettings, Properties::NON_VIRTUAL, __osg_DisplaySettings_P1__getDisplaySettings, - "Set the DsplaySettings object associated with this view. ", + "Get the DisplaySettings object associated with this view. ", ""); I_Method0(const osg::DisplaySettings *, getDisplaySettings, Properties::NON_VIRTUAL, __C5_osg_DisplaySettings_P1__getDisplaySettings, - "Set the DsplaySettings object associated with this view. ", + "Get the const DisplaySettings object associated with this view. ", ""); I_Method1(void, setClearMask, IN, GLbitfield, mask, Properties::NON_VIRTUAL, diff --git a/src/osgWrappers/osg/CoordinateSystemNode.cpp b/src/osgWrappers/osg/CoordinateSystemNode.cpp index a15e498b1..0fbe89812 100644 --- a/src/osgWrappers/osg/CoordinateSystemNode.cpp +++ b/src/osgWrappers/osg/CoordinateSystemNode.cpp @@ -72,7 +72,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CoordinateSystemNode) I_Method1(void, set, IN, const osg::CoordinateSystemNode &, csn, Properties::NON_VIRTUAL, __void__set__C5_CoordinateSystemNode_R1, - "Set the coordinate system node up by copy the format, coordinate system string, and ellipsoid model of another coordinate system node. ", + "Set the coordinate system node up by copying the format, coordinate system string, and ellipsoid model of another coordinate system node. ", ""); I_Method1(void, setFormat, IN, const std::string &, format, Properties::NON_VIRTUAL, @@ -117,7 +117,7 @@ BEGIN_OBJECT_REFLECTOR(osg::CoordinateSystemNode) I_Method1(osg::Vec3d, computeLocalUpVector, IN, const osg::Vec3d &, position, Properties::NON_VIRTUAL, __osg_Vec3d__computeLocalUpVector__C5_Vec3d_R1, - "Compute the local coordinate frame for specified point. ", + "Compute the local up-vector for specified point. ", ""); I_SimpleProperty(const std::string &, CoordinateSystem, __C5_std_string_R1__getCoordinateSystem, @@ -211,6 +211,11 @@ BEGIN_OBJECT_REFLECTOR(osg::EllipsoidModel) __osg_Vec3d__computeLocalUpVector__double__double__double, "", ""); + I_Method0(bool, isWGS84, + Properties::NON_VIRTUAL, + __bool__isWGS84, + "", + ""); I_ProtectedMethod0(void, computeCoefficients, Properties::NON_VIRTUAL, Properties::NON_CONST, diff --git a/src/osgWrappers/osg/Shape.cpp b/src/osgWrappers/osg/Shape.cpp index 9719303df..e4e48390b 100644 --- a/src/osgWrappers/osg/Shape.cpp +++ b/src/osgWrappers/osg/Shape.cpp @@ -839,7 +839,7 @@ BEGIN_OBJECT_REFLECTOR(osg::HeightField) I_Method0(const osg::FloatArray *, getFloatArray, Properties::NON_VIRTUAL, __C5_osg_FloatArray_P1__getFloatArray, - "Get the const sFloatArray height data. ", + "Get the const FloatArray height data. ", ""); I_Method0(osg::HeightField::HeightList &, getHeightList, Properties::NON_VIRTUAL, diff --git a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp index 10ee9923d..73ca711e5 100644 --- a/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp +++ b/src/osgWrappers/osgAnimation/AnimationManagerBase.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -77,9 +78,22 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgAnimation::AnimationManagerBase) __void__normalizeTargets, "", ""); + I_Method0(osgAnimation::LinkVisitor *, getOrCreateLinkVisitor, + Properties::NON_VIRTUAL, + __LinkVisitor_P1__getOrCreateLinkVisitor, + "", + ""); + I_Method1(void, setLinkVisitor, IN, osgAnimation::LinkVisitor *, x, + Properties::NON_VIRTUAL, + __void__setLinkVisitor__LinkVisitor_P1, + "", + ""); I_SimpleProperty(const osgAnimation::AnimationList &, AnimationList, __C5_AnimationList_R1__getAnimationList, 0); + I_SimpleProperty(osgAnimation::LinkVisitor *, LinkVisitor, + 0, + __void__setLinkVisitor__LinkVisitor_P1); END_REFLECTOR BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgAnimation::Target >) diff --git a/src/osgWrappers/osgAnimation/LinkVisitor.cpp b/src/osgWrappers/osgAnimation/LinkVisitor.cpp index dc6d91602..44ba190aa 100644 --- a/src/osgWrappers/osgAnimation/LinkVisitor.cpp +++ b/src/osgWrappers/osgAnimation/LinkVisitor.cpp @@ -25,14 +25,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::LinkVisitor) I_DeclaringFile("osgAnimation/LinkVisitor"); I_BaseType(osg::NodeVisitor); - I_Constructor1(IN, osgAnimation::Animation *, animation, - Properties::NON_EXPLICIT, - ____LinkVisitor__Animation_P1, - "", - ""); - I_Constructor1(IN, const osgAnimation::AnimationList &, animations, - Properties::NON_EXPLICIT, - ____LinkVisitor__C5_AnimationList_R1, + I_Constructor0(____LinkVisitor, "", ""); I_Method0(const char *, libraryName, @@ -50,7 +43,18 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::LinkVisitor) __void__apply__osg_Node_R1, "", ""); - I_PublicMemberProperty(osgAnimation::AnimationList, _animations); - I_PublicMemberProperty(unsigned int, _nbLinkedTarget); + I_Method0(osgAnimation::AnimationList &, getAnimationList, + Properties::NON_VIRTUAL, + __AnimationList_R1__getAnimationList, + "", + ""); + I_Method0(void, reset, + Properties::VIRTUAL, + __void__reset, + "Method to call to reset visitor. ", + "Useful if your visitor accumulates state during a traversal, and you plan to reuse the visitor. To flush that state for the next traversal: call reset() prior to each traversal. "); + I_SimpleProperty(osgAnimation::AnimationList &, AnimationList, + __AnimationList_R1__getAnimationList, + 0); END_REFLECTOR diff --git a/src/osgWrappers/osgAnimation/MorphGeometry.cpp b/src/osgWrappers/osgAnimation/MorphGeometry.cpp index dc0d3a96a..e4b1e4f8b 100644 --- a/src/osgWrappers/osgAnimation/MorphGeometry.cpp +++ b/src/osgWrappers/osgAnimation/MorphGeometry.cpp @@ -104,7 +104,7 @@ BEGIN_OBJECT_REFLECTOR(osgAnimation::MorphGeometry) Properties::VIRTUAL, __void__addMorphTarget__osg_Geometry_P1__float, "Add a MorphTarget to the MorphGeometry. ", - " param morphTarget The MorphTarget to be added to the MorphGeometry. return true for success; false otherwise. "); + " param morphTarget The MorphTarget to be added to the MorphGeometry. weight The weight to be added to the MorphGeometry. return true for success; false otherwise. "); I_Method2(void, setWeight, IN, unsigned int, index, IN, float, morphWeight, Properties::NON_VIRTUAL, __void__setWeight__unsigned_int__float, diff --git a/src/osgWrappers/osgTerrain/Locator.cpp b/src/osgWrappers/osgTerrain/Locator.cpp index f11c02a8d..ef2f1696d 100644 --- a/src/osgWrappers/osgTerrain/Locator.cpp +++ b/src/osgWrappers/osgTerrain/Locator.cpp @@ -132,12 +132,12 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::Locator) __bool__orientationOpenGL, "", ""); - I_Method2(bool, convertLocalToModel, IN, const osg::Vec3d &, x, IN, osg::Vec3d &, x, + I_Method2(bool, convertLocalToModel, IN, const osg::Vec3d &, local, IN, osg::Vec3d &, world, Properties::VIRTUAL, __bool__convertLocalToModel__C5_osg_Vec3d_R1__osg_Vec3d_R1, "", ""); - I_Method2(bool, convertModelToLocal, IN, const osg::Vec3d &, x, IN, osg::Vec3d &, x, + I_Method2(bool, convertModelToLocal, IN, const osg::Vec3d &, world, IN, osg::Vec3d &, local, Properties::VIRTUAL, __bool__convertModelToLocal__C5_osg_Vec3d_R1__osg_Vec3d_R1, "", diff --git a/src/osgWrappers/osgTerrain/TerrainTile.cpp b/src/osgWrappers/osgTerrain/TerrainTile.cpp index 178734b58..c5bc0395a 100644 --- a/src/osgWrappers/osgTerrain/TerrainTile.cpp +++ b/src/osgWrappers/osgTerrain/TerrainTile.cpp @@ -132,7 +132,7 @@ BEGIN_OBJECT_REFLECTOR(osgTerrain::TerrainTile) I_Method0(const osgTerrain::Locator *, getLocator, Properties::NON_VIRTUAL, __C5_Locator_P1__getLocator, - "Get the coordinate frame locator of the terrain node. ", + "Get the const coordinate frame locator of the terrain node. ", ""); I_Method1(void, setElevationLayer, IN, osgTerrain::Layer *, layer, Properties::NON_VIRTUAL,