From 4e979016224c2ee832738fbb00372f5c080d09a2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sun, 11 Feb 2007 22:01:57 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osgManipulator/Dragger.cpp | 67 +++++++++++++++++-- src/osgWrappers/osgManipulator/Projector.cpp | 39 ++++++----- .../osgManipulator/RotateCylinderDragger.cpp | 7 +- .../osgManipulator/RotateSphereDragger.cpp | 7 +- .../osgManipulator/Scale1DDragger.cpp | 7 +- .../osgManipulator/Scale2DDragger.cpp | 7 +- .../osgManipulator/TabPlaneDragger.cpp | 7 +- .../osgManipulator/Translate1DDragger.cpp | 7 +- .../osgManipulator/Translate2DDragger.cpp | 7 +- .../osgManipulator/TranslatePlaneDragger.cpp | 7 +- 10 files changed, 104 insertions(+), 58 deletions(-) diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index 1f4bfae5e..7001296b1 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -10,12 +10,14 @@ #include #include +#include +#include +#include +#include #include #include #include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -45,8 +47,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CompositeDragger) __void__setParentDragger__Dragger_P1, "Set/Get parent dragger. ", "For simple draggers parent points to itself. For composite draggers parent points to the parent dragger that uses this dragger."); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hitIter, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, aa, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", ""); I_Method1(bool, addDragger, IN, osgManipulator::Dragger *, dragger, @@ -129,8 +131,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __CompositeDragger_P1__getComposite, "Returns 0 if this Dragger is not a CompositeDragger. ", ""); - I_Method7(bool, handle, IN, int, x, IN, int, x, IN, const osgUtil::SceneView &, x, IN, const osgUtil::IntersectVisitor::HitList &, x, IN, const osgUtil::IntersectVisitor::HitList::iterator &, x, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, x, IN, osgGA::GUIActionAdapter &, x, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", ""); I_SimpleProperty(osgManipulator::CommandManager *, CommandManager, @@ -144,6 +146,59 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __void__setParentDragger__Dragger_P1); END_REFLECTOR +BEGIN_VALUE_REFLECTOR(osgManipulator::Dragger::PointerInfo) + I_Constructor0(____PointerInfo, + "", + ""); + I_Constructor1(IN, const osgManipulator::Dragger::PointerInfo &, rhs, + ____PointerInfo__C5_PointerInfo_R1, + "", + ""); + I_Method0(bool, completed, + __bool__completed, + "", + ""); + I_Method0(void, next, + __void__next, + "", + ""); + I_Method0(osg::Vec2, pointToProject, + __osg_Vec2__pointToProject, + "", + ""); + I_Method0(osg::Vec3, getLocalIntersectPoint, + __osg_Vec3__getLocalIntersectPoint, + "", + ""); + I_Method3(bool, projectWindowXYIntoObject, IN, const osg::Vec2 &, windowCoord, IN, osg::Vec3 &, nearPoint, IN, osg::Vec3 &, farPoint, + __bool__projectWindowXYIntoObject__C5_osg_Vec2_R1__osg_Vec3_R1__osg_Vec3_R1, + "", + ""); + I_Method2(bool, projectWindowXYIntoObject, IN, osg::Vec3 &, nearPoint, IN, osg::Vec3 &, farPoint, + __bool__projectWindowXYIntoObject__osg_Vec3_R1__osg_Vec3_R1, + "", + ""); + I_Method0(const osg::Matrix &, getViewMatrix, + __C5_osg_Matrix_R1__getViewMatrix, + "", + ""); + I_Method1(bool, contains, IN, const osg::Node *, node, + __bool__contains__C5_osg_Node_P1, + "", + ""); + I_SimpleProperty(osg::Vec3, LocalIntersectPoint, + __osg_Vec3__getLocalIntersectPoint, + 0); + I_SimpleProperty(const osg::Matrix &, ViewMatrix, + __C5_osg_Matrix_R1__getViewMatrix, + 0); + I_PublicMemberProperty(int, pixel_x); + I_PublicMemberProperty(int, pixel_y); + I_PublicMemberProperty(osgUtil::SceneView *, sv); + I_PublicMemberProperty(osgUtil::IntersectVisitor::HitList, hitList); + I_PublicMemberProperty(osgUtil::IntersectVisitor::HitList::iterator, hitIter); +END_REFLECTOR + BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osgManipulator::Dragger >) I_Constructor0(____ref_ptr, "", diff --git a/src/osgWrappers/osgManipulator/Projector.cpp b/src/osgWrappers/osgManipulator/Projector.cpp index 265e40f47..f8e35d0bf 100644 --- a/src/osgWrappers/osgManipulator/Projector.cpp +++ b/src/osgWrappers/osgManipulator/Projector.cpp @@ -14,10 +14,9 @@ #include #include #include -#include #include +#include #include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -36,8 +35,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) ____CylinderPlaneProjector__osg_Cylinder_P1, "", ""); - I_Method3(bool, project, IN, const osg::Vec2 &, pointToProject, IN, const osgUtil::SceneView &, sv, IN, osg::Vec3 &, projectedPoint, - __bool__project__C5_osg_Vec2_R1__C5_osgUtil_SceneView_R1__osg_Vec3_R1, + I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given plane. ", "Returns true on successful projection."); I_Method0(bool, isProjectionOnCylinder, @@ -67,12 +66,12 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderProjector) __C5_osg_Cylinder_P1__getCylinder, "", ""); - I_Method3(bool, project, IN, const osg::Vec2 &, pointToProject, IN, const osgUtil::SceneView &, sv, IN, osg::Vec3 &, projectedPoint, - __bool__project__C5_osg_Vec2_R1__C5_osgUtil_SceneView_R1__osg_Vec3_R1, + I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given plane. ", "Returns true on successful projection."); - I_Method3(bool, isPointInFront, IN, const osg::Vec3 &, point, IN, const osgUtil::SceneView &, sv, IN, const osg::Matrix &, localToWorld, - __bool__isPointInFront__C5_osg_Vec3_R1__C5_osgUtil_SceneView_R1__C5_osg_Matrix_R1, + I_Method2(bool, isPointInFront, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, + __bool__isPointInFront__C5_Dragger_PointerInfo_R1__C5_osg_Matrix_R1, "Returns true is the point is in front of the cylinder given the eye direction. ", ""); I_Method1(void, setFront, IN, bool, front, @@ -116,8 +115,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::LineProjector) __osg_Vec3_R1__getLineEnd, "", ""); - I_Method3(bool, project, IN, const osg::Vec2 &, pointToProject, IN, const osgUtil::SceneView &, sv, IN, osg::Vec3 &, projectedPoint, - __bool__project__C5_osg_Vec2_R1__C5_osgUtil_SceneView_R1__osg_Vec3_R1, + I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given line. ", "Returns true on successful projection."); I_SimpleProperty(osg::Vec3 &, LineEnd, @@ -145,8 +144,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::PlaneProjector) __C5_osg_Plane_R1__getPlane, "", ""); - I_Method3(bool, project, IN, const osg::Vec2 &, pointToProject, IN, const osgUtil::SceneView &, sv, IN, osg::Vec3 &, projectedPoint, - __bool__project__C5_osg_Vec2_R1__C5_osgUtil_SceneView_R1__osg_Vec3_R1, + I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given plane. ", "Returns true on successful projection."); I_SimpleProperty(const osg::Plane &, Plane, @@ -159,8 +158,8 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Projector) I_Constructor0(____Projector, "", ""); - I_Method3(bool, project, IN, const osg::Vec2 &, pointToProject, IN, const osgUtil::SceneView &, sv, IN, osg::Vec3 &, projectedPoint, - __bool__project__C5_osg_Vec2_R1__C5_osgUtil_SceneView_R1__osg_Vec3_R1, + I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, "Calculates the object/world coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto some shape or geometry (implemented in derived classes). ", "SceneView in used for i projecting window coordinates into object coordinates and vice versa. Returns true on successful projection."); I_Method1(void, setLocalToWorld, IN, const osg::Matrix &, localToWorld, @@ -192,8 +191,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::SpherePlaneProjector) ____SpherePlaneProjector__osg_Sphere_P1, "", ""); - I_Method3(bool, project, IN, const osg::Vec2 &, pointToProject, IN, const osgUtil::SceneView &, sv, IN, osg::Vec3 &, projectedPoint, - __bool__project__C5_osg_Vec2_R1__C5_osgUtil_SceneView_R1__osg_Vec3_R1, + I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given sphere. ", "Returns true on successful projection."); I_Method0(bool, isProjectionOnSphere, @@ -223,12 +222,12 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::SphereProjector) __C5_osg_Sphere_P1__getSphere, "", ""); - I_Method3(bool, project, IN, const osg::Vec2 &, pointToProject, IN, const osgUtil::SceneView &, sv, IN, osg::Vec3 &, projectedPoint, - __bool__project__C5_osg_Vec2_R1__C5_osgUtil_SceneView_R1__osg_Vec3_R1, + I_Method2(bool, project, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + __bool__project__C5_Dragger_PointerInfo_R1__osg_Vec3_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given sphere. ", "Returns true on successful projection."); - I_Method3(bool, isPointInFront, IN, const osg::Vec3 &, point, IN, const osgUtil::SceneView &, sv, IN, const osg::Matrix &, localToWorld, - __bool__isPointInFront__C5_osg_Vec3_R1__C5_osgUtil_SceneView_R1__C5_osg_Matrix_R1, + I_Method2(bool, isPointInFront, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, + __bool__isPointInFront__C5_Dragger_PointerInfo_R1__C5_osg_Matrix_R1, "Returns true is the point is in front of the cylinder given the eye direction. ", ""); I_Method1(void, setFront, IN, bool, front, diff --git a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp index b4cdb79ef..a312ed3df 100644 --- a/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateCylinderDragger.cpp @@ -13,9 +13,8 @@ #include #include #include +#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -30,8 +29,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateCylinderDragger) I_Constructor0(____RotateCylinderDragger, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hitIter, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", ""); I_Method0(void, setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp index 0f2667afe..a917c454e 100644 --- a/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp +++ b/src/osgWrappers/osgManipulator/RotateSphereDragger.cpp @@ -13,9 +13,8 @@ #include #include #include +#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -30,8 +29,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::RotateSphereDragger) I_Constructor0(____RotateSphereDragger, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hitIter, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, x, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", ""); I_Method0(void, setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp index 4c4798179..9b8f5583a 100644 --- a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp @@ -14,9 +14,8 @@ #include #include #include +#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -37,8 +36,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) ____Scale1DDragger__ScaleMode, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hitIter, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", ""); I_Method0(void, setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp index 127a3c0a5..0f0c4dde7 100644 --- a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp @@ -15,9 +15,8 @@ #include #include #include +#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -38,8 +37,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) ____Scale2DDragger__ScaleMode, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hitIter, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", ""); I_Method0(void, setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp index 1ab8a5af5..c26b2bf20 100644 --- a/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TabPlaneDragger.cpp @@ -13,9 +13,8 @@ #include #include #include +#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -30,8 +29,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TabPlaneDragger) I_Constructor0(____TabPlaneDragger, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hit, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", ""); I_MethodWithDefaults1(void, setupDefaultGeometry, IN, bool, twoSidedHandle, true, diff --git a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp index a8f3abc2b..b051e63d6 100644 --- a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp @@ -14,9 +14,8 @@ #include #include #include +#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -35,8 +34,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) ____Translate1DDragger__C5_osg_Vec3_R1__C5_osg_Vec3_R1, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hit, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", ""); I_Method0(void, setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp index 67fda68f1..b8a3e7bcc 100644 --- a/src/osgWrappers/osgManipulator/Translate2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate2DDragger.cpp @@ -14,9 +14,8 @@ #include #include #include +#include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -35,8 +34,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate2DDragger) ____Translate2DDragger__C5_osg_Plane_R1, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hit, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "Handle pick events on dragger and generate TranslateInLine commands. ", ""); I_Method0(void, setupDefaultGeometry, diff --git a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp index 83b6ecbea..0b7044333 100644 --- a/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp +++ b/src/osgWrappers/osgManipulator/TranslatePlaneDragger.cpp @@ -13,11 +13,10 @@ #include #include #include +#include #include #include #include -#include -#include // Must undefine IN and OUT macros defined in Windows headers #ifdef IN @@ -32,8 +31,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslatePlaneDragger) I_Constructor0(____TranslatePlaneDragger, "", ""); - I_Method7(bool, handle, IN, int, pixel_x, IN, int, pixel_y, IN, const osgUtil::SceneView &, sv, IN, const osgUtil::IntersectVisitor::HitList &, hitList, IN, const osgUtil::IntersectVisitor::HitList::iterator &, hit, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, - __bool__handle__int__int__C5_osgUtil_SceneView_R1__C5_osgUtil_IntersectVisitor_HitList_R1__C5_osgUtil_IntersectVisitor_HitList_iterator_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, + I_Method3(bool, handle, IN, const osgManipulator::Dragger::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us, + __bool__handle__C5_PointerInfo_R1__C5_osgGA_GUIEventAdapter_R1__osgGA_GUIActionAdapter_R1, "", ""); I_Method0(void, setupDefaultGeometry,