From f1faa4aa90923ca3a1682b028435da0a5e03853c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 21 Nov 2008 11:27:11 +0000 Subject: [PATCH] Updated wrappers --- src/osgWrappers/osg/DisplaySettings.cpp | 13 ++ src/osgWrappers/osgManipulator/AntiSquish.cpp | 38 ++-- src/osgWrappers/osgManipulator/Command.cpp | 181 +++++++++--------- src/osgWrappers/osgManipulator/Dragger.cpp | 38 ++-- src/osgWrappers/osgManipulator/Projector.cpp | 38 ++-- .../osgManipulator/Scale1DDragger.cpp | 42 ++-- .../osgManipulator/Scale2DDragger.cpp | 72 +++---- .../osgManipulator/Translate1DDragger.cpp | 6 +- 8 files changed, 221 insertions(+), 207 deletions(-) diff --git a/src/osgWrappers/osg/DisplaySettings.cpp b/src/osgWrappers/osg/DisplaySettings.cpp index e07d086d1..9df0ab268 100644 --- a/src/osgWrappers/osg/DisplaySettings.cpp +++ b/src/osgWrappers/osg/DisplaySettings.cpp @@ -370,6 +370,16 @@ BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) __unsigned_int__getNumOfHttpDatabaseThreadsHint, "Get the hint for number of threads in the DatbasePager dedicated to reading http requests. ", ""); + I_Method1(void, setApplication, IN, const std::string &, application, + Properties::NON_VIRTUAL, + __void__setApplication__C5_std_string_R1, + "", + ""); + I_Method0(const std::string &, getApplication, + Properties::NON_VIRTUAL, + __C5_std_string_R1__getApplication, + "", + ""); I_StaticMethod0(osg::DisplaySettings *, instance, __DisplaySettings_P1__instance_S, "Maintain a DisplaySettings singleton for objects to query at runtime. ", @@ -380,6 +390,9 @@ BEGIN_OBJECT_REFLECTOR(osg::DisplaySettings) I_SimpleProperty(bool, AlphaBuffer, __bool__getAlphaBuffer, 0); + I_SimpleProperty(const std::string &, Application, + __C5_std_string_R1__getApplication, + __void__setApplication__C5_std_string_R1); I_SimpleProperty(bool, CompileContextsHint, __bool__getCompileContextsHint, __void__setCompileContextsHint__bool); diff --git a/src/osgWrappers/osgManipulator/AntiSquish.cpp b/src/osgWrappers/osgManipulator/AntiSquish.cpp index 43fe44739..1608311cb 100644 --- a/src/osgWrappers/osgManipulator/AntiSquish.cpp +++ b/src/osgWrappers/osgManipulator/AntiSquish.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include // Must undefine IN and OUT macros defined in Windows headers @@ -30,13 +30,13 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::AntiSquish) I_Constructor0(____AntiSquish, "", ""); - I_Constructor1(IN, const osg::Vec3 &, pivot, + I_Constructor1(IN, const osg::Vec3d &, pivot, Properties::NON_EXPLICIT, - ____AntiSquish__C5_osg_Vec3_R1, + ____AntiSquish__C5_osg_Vec3d_R1, "", ""); - I_Constructor2(IN, const osg::Vec3 &, pivot, IN, const osg::Vec3 &, position, - ____AntiSquish__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + I_Constructor2(IN, const osg::Vec3d &, pivot, IN, const osg::Vec3d &, position, + ____AntiSquish__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, "", ""); I_ConstructorWithDefaults2(IN, const osgManipulator::AntiSquish &, pat, , IN, const osg::CopyOp &, copyop, osg::CopyOp::SHALLOW_COPY, @@ -58,24 +58,24 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::AntiSquish) __bool__isSameKindAs__C5_osg_Object_P1, "return true if this and obj are of the same kind of object. ", ""); - I_Method1(void, setPivot, IN, const osg::Vec3 &, pvt, + I_Method1(void, setPivot, IN, const osg::Vec3d &, pvt, Properties::NON_VIRTUAL, - __void__setPivot__C5_osg_Vec3_R1, + __void__setPivot__C5_osg_Vec3d_R1, "", ""); - I_Method0(const osg::Vec3 &, getPivot, + I_Method0(const osg::Vec3d &, getPivot, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getPivot, + __C5_osg_Vec3d_R1__getPivot, "", ""); - I_Method1(void, setPosition, IN, const osg::Vec3 &, pos, + I_Method1(void, setPosition, IN, const osg::Vec3d &, pos, Properties::NON_VIRTUAL, - __void__setPosition__C5_osg_Vec3_R1, + __void__setPosition__C5_osg_Vec3d_R1, "", ""); - I_Method0(const osg::Vec3 &, getPosition, + I_Method0(const osg::Vec3d &, getPosition, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getPosition, + __C5_osg_Vec3d_R1__getPosition, "", ""); I_Method2(osg::Matrix, computeUnSquishedMatrix, IN, const osg::Matrix &, x, IN, bool &, flag, @@ -83,11 +83,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::AntiSquish) __osg_Matrix__computeUnSquishedMatrix__C5_osg_Matrix_R1__bool_R1, "", ""); - I_SimpleProperty(const osg::Vec3 &, Pivot, - __C5_osg_Vec3_R1__getPivot, - __void__setPivot__C5_osg_Vec3_R1); - I_SimpleProperty(const osg::Vec3 &, Position, - __C5_osg_Vec3_R1__getPosition, - __void__setPosition__C5_osg_Vec3_R1); + I_SimpleProperty(const osg::Vec3d &, Pivot, + __C5_osg_Vec3d_R1__getPivot, + __void__setPivot__C5_osg_Vec3d_R1); + I_SimpleProperty(const osg::Vec3d &, Position, + __C5_osg_Vec3d_R1__getPosition, + __void__setPosition__C5_osg_Vec3d_R1); END_REFLECTOR diff --git a/src/osgWrappers/osgManipulator/Command.cpp b/src/osgWrappers/osgManipulator/Command.cpp index e847d7a6b..8cc336c89 100644 --- a/src/osgWrappers/osgManipulator/Command.cpp +++ b/src/osgWrappers/osgManipulator/Command.cpp @@ -14,8 +14,9 @@ #include #include #include -#include +#include #include +#include #include #include #include @@ -178,44 +179,44 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DCommand) __void__applyConstraint__C5_Constraint_P1, "Apply a constraint to the command. ", ""); - I_Method1(void, setScale, IN, float, s, + I_Method1(void, setScale, IN, double, s, Properties::NON_VIRTUAL, - __void__setScale__float, + __void__setScale__double, "", ""); - I_Method0(float, getScale, + I_Method0(double, getScale, Properties::NON_VIRTUAL, - __float__getScale, + __double__getScale, "", ""); - I_Method1(void, setScaleCenter, IN, float, center, + I_Method1(void, setScaleCenter, IN, double, center, Properties::NON_VIRTUAL, - __void__setScaleCenter__float, + __void__setScaleCenter__double, "", ""); - I_Method0(float, getScaleCenter, + I_Method0(double, getScaleCenter, Properties::NON_VIRTUAL, - __float__getScaleCenter, + __double__getScaleCenter, "", ""); - I_Method1(void, setReferencePoint, IN, float, rp, + I_Method1(void, setReferencePoint, IN, double, rp, Properties::NON_VIRTUAL, - __void__setReferencePoint__float, + __void__setReferencePoint__double, "ReferencePoint is used only for snapping. ", ""); - I_Method0(float, getReferencePoint, + I_Method0(double, getReferencePoint, Properties::NON_VIRTUAL, - __float__getReferencePoint, + __double__getReferencePoint, "", ""); - I_Method1(void, setMinScale, IN, float, min, + I_Method1(void, setMinScale, IN, double, min, Properties::NON_VIRTUAL, - __void__setMinScale__float, + __void__setMinScale__double, "", ""); - I_Method0(float, getMinScale, + I_Method0(double, getMinScale, Properties::NON_VIRTUAL, - __float__getMinScale, + __double__getMinScale, "", ""); I_Method0(osg::Matrix, getMotionMatrix, @@ -223,21 +224,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DCommand) __osg_Matrix__getMotionMatrix, "Gets the matrix for transforming the Selection. ", "This matrix is in the command's coordinate systems. "); - I_SimpleProperty(float, MinScale, - __float__getMinScale, - __void__setMinScale__float); + I_SimpleProperty(double, MinScale, + __double__getMinScale, + __void__setMinScale__double); I_SimpleProperty(osg::Matrix, MotionMatrix, __osg_Matrix__getMotionMatrix, 0); - I_SimpleProperty(float, ReferencePoint, - __float__getReferencePoint, - __void__setReferencePoint__float); - I_SimpleProperty(float, Scale, - __float__getScale, - __void__setScale__float); - I_SimpleProperty(float, ScaleCenter, - __float__getScaleCenter, - __void__setScaleCenter__float); + I_SimpleProperty(double, ReferencePoint, + __double__getReferencePoint, + __void__setReferencePoint__double); + I_SimpleProperty(double, Scale, + __double__getScale, + __void__setScale__double); + I_SimpleProperty(double, ScaleCenter, + __double__getScaleCenter, + __void__setScaleCenter__double); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DCommand) @@ -261,44 +262,44 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DCommand) __void__applyConstraint__C5_Constraint_P1, "Apply a constraint to the command. ", ""); - I_Method1(void, setScale, IN, const osg::Vec2 &, s, + I_Method1(void, setScale, IN, const osg::Vec2d &, s, Properties::NON_VIRTUAL, - __void__setScale__C5_osg_Vec2_R1, + __void__setScale__C5_osg_Vec2d_R1, "", ""); - I_Method0(const osg::Vec2 &, getScale, + I_Method0(const osg::Vec2d &, getScale, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getScale, + __C5_osg_Vec2d_R1__getScale, "", ""); - I_Method1(void, setScaleCenter, IN, const osg::Vec2 &, center, + I_Method1(void, setScaleCenter, IN, const osg::Vec2d &, center, Properties::NON_VIRTUAL, - __void__setScaleCenter__C5_osg_Vec2_R1, + __void__setScaleCenter__C5_osg_Vec2d_R1, "", ""); - I_Method0(const osg::Vec2 &, getScaleCenter, + I_Method0(const osg::Vec2d &, getScaleCenter, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getScaleCenter, + __C5_osg_Vec2d_R1__getScaleCenter, "", ""); - I_Method1(void, setReferencePoint, IN, const osg::Vec2 &, rp, + I_Method1(void, setReferencePoint, IN, const osg::Vec2d &, rp, Properties::NON_VIRTUAL, - __void__setReferencePoint__C5_osg_Vec2_R1, + __void__setReferencePoint__C5_osg_Vec2d_R1, "ReferencePoint is used only for snapping. ", ""); - I_Method0(const osg::Vec2 &, getReferencePoint, + I_Method0(const osg::Vec2d &, getReferencePoint, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getReferencePoint, + __C5_osg_Vec2d_R1__getReferencePoint, "", ""); - I_Method1(void, setMinScale, IN, const osg::Vec2 &, min, + I_Method1(void, setMinScale, IN, const osg::Vec2d &, min, Properties::NON_VIRTUAL, - __void__setMinScale__C5_osg_Vec2_R1, + __void__setMinScale__C5_osg_Vec2d_R1, "", ""); - I_Method0(const osg::Vec2 &, getMinScale, + I_Method0(const osg::Vec2d &, getMinScale, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getMinScale, + __C5_osg_Vec2d_R1__getMinScale, "", ""); I_Method0(osg::Matrix, getMotionMatrix, @@ -306,21 +307,21 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DCommand) __osg_Matrix__getMotionMatrix, "Gets the matrix for transforming the Selection. ", "This matrix is in the command's coordinate systems. "); - I_SimpleProperty(const osg::Vec2 &, MinScale, - __C5_osg_Vec2_R1__getMinScale, - __void__setMinScale__C5_osg_Vec2_R1); + I_SimpleProperty(const osg::Vec2d &, MinScale, + __C5_osg_Vec2d_R1__getMinScale, + __void__setMinScale__C5_osg_Vec2d_R1); I_SimpleProperty(osg::Matrix, MotionMatrix, __osg_Matrix__getMotionMatrix, 0); - I_SimpleProperty(const osg::Vec2 &, ReferencePoint, - __C5_osg_Vec2_R1__getReferencePoint, - __void__setReferencePoint__C5_osg_Vec2_R1); - I_SimpleProperty(const osg::Vec2 &, Scale, - __C5_osg_Vec2_R1__getScale, - __void__setScale__C5_osg_Vec2_R1); - I_SimpleProperty(const osg::Vec2 &, ScaleCenter, - __C5_osg_Vec2_R1__getScaleCenter, - __void__setScaleCenter__C5_osg_Vec2_R1); + I_SimpleProperty(const osg::Vec2d &, ReferencePoint, + __C5_osg_Vec2d_R1__getReferencePoint, + __void__setReferencePoint__C5_osg_Vec2d_R1); + I_SimpleProperty(const osg::Vec2d &, Scale, + __C5_osg_Vec2d_R1__getScale, + __void__setScale__C5_osg_Vec2d_R1); + I_SimpleProperty(const osg::Vec2d &, ScaleCenter, + __C5_osg_Vec2d_R1__getScaleCenter, + __void__setScaleCenter__C5_osg_Vec2d_R1); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleUniformCommand) @@ -344,24 +345,24 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleUniformCommand) __void__applyConstraint__C5_Constraint_P1, "Apply a constraint to the command. ", ""); - I_Method1(void, setScale, IN, float, s, + I_Method1(void, setScale, IN, double, s, Properties::NON_VIRTUAL, - __void__setScale__float, + __void__setScale__double, "", ""); - I_Method0(float, getScale, + I_Method0(double, getScale, Properties::NON_VIRTUAL, - __float__getScale, + __double__getScale, "", ""); - I_Method1(void, setScaleCenter, IN, const osg::Vec3 &, center, + I_Method1(void, setScaleCenter, IN, const osg::Vec3d &, center, Properties::NON_VIRTUAL, - __void__setScaleCenter__C5_osg_Vec3_R1, + __void__setScaleCenter__C5_osg_Vec3d_R1, "", ""); - I_Method0(const osg::Vec3 &, getScaleCenter, + I_Method0(const osg::Vec3d &, getScaleCenter, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getScaleCenter, + __C5_osg_Vec3d_R1__getScaleCenter, "", ""); I_Method0(osg::Matrix, getMotionMatrix, @@ -372,12 +373,12 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::ScaleUniformCommand) I_SimpleProperty(osg::Matrix, MotionMatrix, __osg_Matrix__getMotionMatrix, 0); - I_SimpleProperty(float, Scale, - __float__getScale, - __void__setScale__float); - I_SimpleProperty(const osg::Vec3 &, ScaleCenter, - __C5_osg_Vec3_R1__getScaleCenter, - __void__setScaleCenter__C5_osg_Vec3_R1); + I_SimpleProperty(double, Scale, + __double__getScale, + __void__setScale__double); + I_SimpleProperty(const osg::Vec3d &, ScaleCenter, + __C5_osg_Vec3d_R1__getScaleCenter, + __void__setScaleCenter__C5_osg_Vec3d_R1); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) @@ -425,9 +426,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) __void__setTranslation__C5_osg_Vec3_R1, "", ""); - I_Method0(const osg::Vec3 &, getTranslation, + I_Method0(const osg::Vec3d &, getTranslation, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getTranslation, + __C5_osg_Vec3d_R1__getTranslation, "", ""); I_Method0(osg::Matrix, getMotionMatrix, @@ -444,9 +445,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) I_SimpleProperty(osg::Matrix, MotionMatrix, __osg_Matrix__getMotionMatrix, 0); - I_SimpleProperty(const osg::Vec3 &, Translation, - __C5_osg_Vec3_R1__getTranslation, - __void__setTranslation__C5_osg_Vec3_R1); + I_SimpleProperty(const osg::Vec3d &, Translation, + __C5_osg_Vec3d_R1__getTranslation, + 0); END_REFLECTOR BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInPlaneCommand) @@ -485,24 +486,24 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInPlaneCommand) __C5_osg_Plane_R1__getPlane, "", ""); - I_Method1(void, setTranslation, IN, const osg::Vec3 &, t, + I_Method1(void, setTranslation, IN, const osg::Vec3d &, t, Properties::NON_VIRTUAL, - __void__setTranslation__C5_osg_Vec3_R1, + __void__setTranslation__C5_osg_Vec3d_R1, "", ""); - I_Method0(const osg::Vec3 &, getTranslation, + I_Method0(const osg::Vec3d &, getTranslation, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getTranslation, + __C5_osg_Vec3d_R1__getTranslation, "", ""); - I_Method1(void, setReferencePoint, IN, const osg::Vec3 &, rp, + I_Method1(void, setReferencePoint, IN, const osg::Vec3d &, rp, Properties::NON_VIRTUAL, - __void__setReferencePoint__C5_osg_Vec3_R1, + __void__setReferencePoint__C5_osg_Vec3d_R1, "ReferencePoint is used only for snapping. ", ""); - I_Method0(const osg::Vec3 &, getReferencePoint, + I_Method0(const osg::Vec3d &, getReferencePoint, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getReferencePoint, + __C5_osg_Vec3d_R1__getReferencePoint, "", ""); I_Method0(osg::Matrix, getMotionMatrix, @@ -516,11 +517,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInPlaneCommand) I_SimpleProperty(const osg::Plane &, Plane, __C5_osg_Plane_R1__getPlane, __void__setPlane__C5_osg_Plane_R1); - I_SimpleProperty(const osg::Vec3 &, ReferencePoint, - __C5_osg_Vec3_R1__getReferencePoint, - __void__setReferencePoint__C5_osg_Vec3_R1); - I_SimpleProperty(const osg::Vec3 &, Translation, - __C5_osg_Vec3_R1__getTranslation, - __void__setTranslation__C5_osg_Vec3_R1); + I_SimpleProperty(const osg::Vec3d &, ReferencePoint, + __C5_osg_Vec3d_R1__getReferencePoint, + __void__setReferencePoint__C5_osg_Vec3d_R1); + I_SimpleProperty(const osg::Vec3d &, Translation, + __C5_osg_Vec3d_R1__getTranslation, + __void__setTranslation__C5_osg_Vec3d_R1); END_REFLECTOR diff --git a/src/osgWrappers/osgManipulator/Dragger.cpp b/src/osgWrappers/osgManipulator/Dragger.cpp index 32e058841..f5d69ef2f 100644 --- a/src/osgWrappers/osgManipulator/Dragger.cpp +++ b/src/osgWrappers/osgManipulator/Dragger.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include @@ -174,7 +174,7 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Dragger) __void__setParentDragger__Dragger_P1); END_REFLECTOR -TYPE_NAME_ALIAS(std::pair< osg::NodePath COMMA osg::Vec3 >, osgManipulator::PointerInfo::NodePathIntersectionPair) +TYPE_NAME_ALIAS(std::pair< osg::NodePath COMMA osg::Vec3d >, osgManipulator::PointerInfo::NodePathIntersectionPair) TYPE_NAME_ALIAS(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >, osgManipulator::PointerInfo::IntersectionList) @@ -203,24 +203,24 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) __void__next, "", ""); - I_Method0(osg::Vec3, getLocalIntersectPoint, + I_Method0(osg::Vec3d, getLocalIntersectPoint, Properties::NON_VIRTUAL, - __osg_Vec3__getLocalIntersectPoint, + __osg_Vec3d__getLocalIntersectPoint, "", ""); - I_Method2(void, setNearFarPoints, IN, osg::Vec3, nearPoint, IN, osg::Vec3, farPoint, + I_Method2(void, setNearFarPoints, IN, osg::Vec3d, nearPoint, IN, osg::Vec3d, farPoint, Properties::NON_VIRTUAL, - __void__setNearFarPoints__osg_Vec3__osg_Vec3, + __void__setNearFarPoints__osg_Vec3d__osg_Vec3d, "", ""); - I_Method0(const osg::Vec3 &, getEyeDir, + I_Method0(const osg::Vec3d &, getEyeDir, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getEyeDir, + __C5_osg_Vec3d_R1__getEyeDir, "", ""); - I_Method2(void, getNearFarPoints, IN, osg::Vec3 &, nearPoint, IN, osg::Vec3 &, farPoint, + I_Method2(void, getNearFarPoints, IN, osg::Vec3d &, nearPoint, IN, osg::Vec3d &, farPoint, Properties::NON_VIRTUAL, - __void__getNearFarPoints__osg_Vec3_R1__osg_Vec3_R1, + __void__getNearFarPoints__osg_Vec3d_R1__osg_Vec3d_R1, "", ""); I_Method1(bool, contains, IN, const osg::Node *, node, @@ -233,9 +233,9 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) __void__setCamera__osg_Camera_P1, "", ""); - I_Method2(void, addIntersection, IN, const osg::NodePath &, nodePath, IN, const osg::Vec3 &, intersectionPoint, + I_Method2(void, addIntersection, IN, const osg::NodePath &, nodePath, IN, const osg::Vec3d &, intersectionPoint, Properties::NON_VIRTUAL, - __void__addIntersection__C5_osg_NodePath_R1__C5_osg_Vec3_R1, + __void__addIntersection__C5_osg_NodePath_R1__C5_osg_Vec3d_R1, "", ""); I_Method2(void, setMousePosition, IN, float, pixel_x, IN, float, pixel_y, @@ -243,20 +243,20 @@ BEGIN_VALUE_REFLECTOR(osgManipulator::PointerInfo) __void__setMousePosition__float__float, "", ""); - I_ProtectedMethod3(bool, projectWindowXYIntoObject, IN, const osg::Vec2 &, windowCoord, IN, osg::Vec3 &, nearPoint, IN, osg::Vec3 &, farPoint, + I_ProtectedMethod3(bool, projectWindowXYIntoObject, IN, const osg::Vec2d &, windowCoord, IN, osg::Vec3d &, nearPoint, IN, osg::Vec3d &, farPoint, Properties::NON_VIRTUAL, Properties::CONST, - __bool__projectWindowXYIntoObject__C5_osg_Vec2_R1__osg_Vec3_R1__osg_Vec3_R1, + __bool__projectWindowXYIntoObject__C5_osg_Vec2d_R1__osg_Vec3d_R1__osg_Vec3d_R1, "", ""); I_SimpleProperty(osg::Camera *, Camera, 0, __void__setCamera__osg_Camera_P1); - I_SimpleProperty(const osg::Vec3 &, EyeDir, - __C5_osg_Vec3_R1__getEyeDir, + I_SimpleProperty(const osg::Vec3d &, EyeDir, + __C5_osg_Vec3d_R1__getEyeDir, 0); - I_SimpleProperty(osg::Vec3, LocalIntersectPoint, - __osg_Vec3__getLocalIntersectPoint, + I_SimpleProperty(osg::Vec3d, LocalIntersectPoint, + __osg_Vec3d__getLocalIntersectPoint, 0); I_PublicMemberProperty(osgManipulator::PointerInfo::IntersectionList, _hitList); END_REFLECTOR @@ -303,7 +303,7 @@ END_REFLECTOR STD_LIST_REFLECTOR(std::list< osgManipulator::PointerInfo::NodePathIntersectionPair >) -STD_PAIR_REFLECTOR(std::pair< osg::NodePath COMMA osg::Vec3 >) +STD_PAIR_REFLECTOR(std::pair< osg::NodePath COMMA osg::Vec3d >) STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osgManipulator::Dragger > >) diff --git a/src/osgWrappers/osgManipulator/Projector.cpp b/src/osgWrappers/osgManipulator/Projector.cpp index 391ba64b8..a9c3e102f 100644 --- a/src/osgWrappers/osgManipulator/Projector.cpp +++ b/src/osgWrappers/osgManipulator/Projector.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -38,9 +38,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) ____CylinderPlaneProjector__osg_Cylinder_P1, "", ""); - I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3d &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3d_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, @@ -48,9 +48,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderPlaneProjector) __bool__isProjectionOnCylinder, "Returns true if the previous projection was on the cylinder and false if the projection was on the plane. ", ""); - I_Method4(osg::Quat, getRotation, IN, const osg::Vec3 &, p1, IN, bool, p1OnCyl, IN, const osg::Vec3 &, p2, IN, bool, p2OnCyl, + I_Method4(osg::Quat, getRotation, IN, const osg::Vec3d &, p1, IN, bool, p1OnCyl, IN, const osg::Vec3d &, p2, IN, bool, p2OnCyl, Properties::NON_VIRTUAL, - __osg_Quat__getRotation__C5_osg_Vec3_R1__bool__C5_osg_Vec3_R1__bool, + __osg_Quat__getRotation__C5_osg_Vec3d_R1__bool__C5_osg_Vec3d_R1__bool, "", ""); END_REFLECTOR @@ -76,9 +76,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::CylinderProjector) __C5_osg_Cylinder_P1__getCylinder, "", ""); - I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3d &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3d_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given plane. ", "Returns true on successful projection. "); I_Method2(bool, isPointInFront, IN, const osgManipulator::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, @@ -134,9 +134,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::LineProjector) __osg_LineSegment_vec_type_R1__getLineEnd, "", ""); - I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3d &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3d_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::LineSegment::vec_type &, LineEnd, @@ -168,9 +168,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::PlaneProjector) __C5_osg_Plane_R1__getPlane, "", ""); - I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3d &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3d_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, @@ -184,9 +184,9 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgManipulator::Projector) I_Constructor0(____Projector, "", ""); - I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3d &, projectedPoint, Properties::PURE_VIRTUAL, - __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3d_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, @@ -223,9 +223,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::SpherePlaneProjector) ____SpherePlaneProjector__osg_Sphere_P1, "", ""); - I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3d &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3d_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, @@ -233,9 +233,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::SpherePlaneProjector) __bool__isProjectionOnSphere, "Returns true if the previous projection was on the sphere and false if the projection was on the plane. ", ""); - I_MethodWithDefaults5(osg::Quat, getRotation, IN, const osg::Vec3 &, p1, , IN, bool, p1OnSphere, , IN, const osg::Vec3 &, p2, , IN, bool, p2OnSphere, , IN, float, radialFactor, 0.0f, + I_MethodWithDefaults5(osg::Quat, getRotation, IN, const osg::Vec3d &, p1, , IN, bool, p1OnSphere, , IN, const osg::Vec3d &, p2, , IN, bool, p2OnSphere, , IN, float, radialFactor, 0.0f, Properties::NON_VIRTUAL, - __osg_Quat__getRotation__C5_osg_Vec3_R1__bool__C5_osg_Vec3_R1__bool__float, + __osg_Quat__getRotation__C5_osg_Vec3d_R1__bool__C5_osg_Vec3d_R1__bool__float, "", ""); END_REFLECTOR @@ -261,9 +261,9 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::SphereProjector) __C5_osg_Sphere_P1__getSphere, "", ""); - I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, + I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3d &, projectedPoint, Properties::VIRTUAL, - __bool__project__C5_PointerInfo_R1__osg_Vec3_R1, + __bool__project__C5_PointerInfo_R1__osg_Vec3d_R1, "Calculates the object coordinates (projectedPoint) of a window coordinate (pointToProject) when projected onto the given sphere. ", "Returns true on successful projection. "); I_Method2(bool, isPointInFront, IN, const osgManipulator::PointerInfo &, pi, IN, const osg::Matrix &, localToWorld, diff --git a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp index 291a3e3cd..d4994c45d 100644 --- a/src/osgWrappers/osgManipulator/Scale1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale1DDragger.cpp @@ -49,14 +49,14 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) __void__setupDefaultGeometry, "Setup default geometry for dragger. ", ""); - I_Method1(void, setMinScale, IN, float, min, + I_Method1(void, setMinScale, IN, double, min, Properties::NON_VIRTUAL, - __void__setMinScale__float, + __void__setMinScale__double, "Set/Get min scale for dragger. ", ""); - I_Method0(float, getMinScale, + I_Method0(double, getMinScale, Properties::NON_VIRTUAL, - __float__getMinScale, + __double__getMinScale, "", ""); I_Method1(void, setColor, IN, const osg::Vec4 &, color, @@ -99,24 +99,24 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) __osg_Node_P1__getRightHandleNode, "", ""); - I_Method1(void, setLeftHandlePosition, IN, float, pos, + I_Method1(void, setLeftHandlePosition, IN, double, pos, Properties::NON_VIRTUAL, - __void__setLeftHandlePosition__float, + __void__setLeftHandlePosition__double, "Set left/right handle position. ", ""); - I_Method0(float, getLeftHandlePosition, + I_Method0(double, getLeftHandlePosition, Properties::NON_VIRTUAL, - __float__getLeftHandlePosition, + __double__getLeftHandlePosition, "", ""); - I_Method1(void, setRightHandlePosition, IN, float, pos, + I_Method1(void, setRightHandlePosition, IN, double, pos, Properties::NON_VIRTUAL, - __void__setRightHandlePosition__float, + __void__setRightHandlePosition__double, "", ""); - I_Method0(float, getRightHandlePosition, + I_Method0(double, getRightHandlePosition, Properties::NON_VIRTUAL, - __float__getRightHandlePosition, + __double__getRightHandlePosition, "", ""); I_SimpleProperty(const osg::Vec4 &, Color, @@ -125,20 +125,20 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale1DDragger) I_SimpleProperty(osg::Node &, LeftHandleNode, 0, __void__setLeftHandleNode__osg_Node_R1); - I_SimpleProperty(float, LeftHandlePosition, - __float__getLeftHandlePosition, - __void__setLeftHandlePosition__float); - I_SimpleProperty(float, MinScale, - __float__getMinScale, - __void__setMinScale__float); + I_SimpleProperty(double, LeftHandlePosition, + __double__getLeftHandlePosition, + __void__setLeftHandlePosition__double); + I_SimpleProperty(double, MinScale, + __double__getMinScale, + __void__setMinScale__double); I_SimpleProperty(const osg::Vec4 &, PickColor, 0, __void__setPickColor__C5_osg_Vec4_R1); I_SimpleProperty(osg::Node &, RightHandleNode, 0, __void__setRightHandleNode__osg_Node_R1); - I_SimpleProperty(float, RightHandlePosition, - __float__getRightHandlePosition, - __void__setRightHandlePosition__float); + I_SimpleProperty(double, RightHandlePosition, + __double__getRightHandlePosition, + __void__setRightHandlePosition__double); END_REFLECTOR diff --git a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp index 69a3ea7eb..e272185c0 100644 --- a/src/osgWrappers/osgManipulator/Scale2DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Scale2DDragger.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include @@ -50,14 +50,14 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __void__setupDefaultGeometry, "Setup default geometry for dragger. ", ""); - I_Method1(void, setMinScale, IN, const osg::Vec2 &, min, + I_Method1(void, setMinScale, IN, const osg::Vec2d &, min, Properties::NON_VIRTUAL, - __void__setMinScale__C5_osg_Vec2_R1, + __void__setMinScale__C5_osg_Vec2d_R1, "Set/Get min scale for dragger. ", ""); - I_Method0(const osg::Vec2 &, getMinScale, + I_Method0(const osg::Vec2d &, getMinScale, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getMinScale, + __C5_osg_Vec2d_R1__getMinScale, "", ""); I_Method1(void, setColor, IN, const osg::Vec4 &, color, @@ -120,78 +120,78 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Scale2DDragger) __osg_Node_P1__getBottomRightHandleNode, "", ""); - I_Method1(void, setTopLeftHandlePosition, IN, const osg::Vec2 &, pos, + I_Method1(void, setTopLeftHandlePosition, IN, const osg::Vec2d &, pos, Properties::NON_VIRTUAL, - __void__setTopLeftHandlePosition__C5_osg_Vec2_R1, + __void__setTopLeftHandlePosition__C5_osg_Vec2d_R1, "Set/Get the handle nodes postion for dragger. ", ""); - I_Method0(const osg::Vec2 &, getTopLeftHandlePosition, + I_Method0(const osg::Vec2d &, getTopLeftHandlePosition, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getTopLeftHandlePosition, + __C5_osg_Vec2d_R1__getTopLeftHandlePosition, "", ""); - I_Method1(void, setBottomLeftHandlePosition, IN, const osg::Vec2 &, pos, + I_Method1(void, setBottomLeftHandlePosition, IN, const osg::Vec2d &, pos, Properties::NON_VIRTUAL, - __void__setBottomLeftHandlePosition__C5_osg_Vec2_R1, + __void__setBottomLeftHandlePosition__C5_osg_Vec2d_R1, "", ""); - I_Method0(const osg::Vec2 &, getBottomLeftHandlePosition, + I_Method0(const osg::Vec2d &, getBottomLeftHandlePosition, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getBottomLeftHandlePosition, + __C5_osg_Vec2d_R1__getBottomLeftHandlePosition, "", ""); - I_Method1(void, setTopRightHandlePosition, IN, const osg::Vec2 &, pos, + I_Method1(void, setTopRightHandlePosition, IN, const osg::Vec2d &, pos, Properties::NON_VIRTUAL, - __void__setTopRightHandlePosition__C5_osg_Vec2_R1, + __void__setTopRightHandlePosition__C5_osg_Vec2d_R1, "", ""); - I_Method0(const osg::Vec2 &, getTopRightHandlePosition, + I_Method0(const osg::Vec2d &, getTopRightHandlePosition, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getTopRightHandlePosition, + __C5_osg_Vec2d_R1__getTopRightHandlePosition, "", ""); - I_Method1(void, setBottomRightHandlePosition, IN, const osg::Vec2 &, pos, + I_Method1(void, setBottomRightHandlePosition, IN, const osg::Vec2d &, pos, Properties::NON_VIRTUAL, - __void__setBottomRightHandlePosition__C5_osg_Vec2_R1, + __void__setBottomRightHandlePosition__C5_osg_Vec2d_R1, "", ""); - I_Method0(const osg::Vec2 &, getBottomRightHandlePosition, + I_Method0(const osg::Vec2d &, getBottomRightHandlePosition, Properties::NON_VIRTUAL, - __C5_osg_Vec2_R1__getBottomRightHandlePosition, + __C5_osg_Vec2d_R1__getBottomRightHandlePosition, "", ""); I_SimpleProperty(osg::Node &, BottomLeftHandleNode, 0, __void__setBottomLeftHandleNode__osg_Node_R1); - I_SimpleProperty(const osg::Vec2 &, BottomLeftHandlePosition, - __C5_osg_Vec2_R1__getBottomLeftHandlePosition, - __void__setBottomLeftHandlePosition__C5_osg_Vec2_R1); + I_SimpleProperty(const osg::Vec2d &, BottomLeftHandlePosition, + __C5_osg_Vec2d_R1__getBottomLeftHandlePosition, + __void__setBottomLeftHandlePosition__C5_osg_Vec2d_R1); I_SimpleProperty(osg::Node &, BottomRightHandleNode, 0, __void__setBottomRightHandleNode__osg_Node_R1); - I_SimpleProperty(const osg::Vec2 &, BottomRightHandlePosition, - __C5_osg_Vec2_R1__getBottomRightHandlePosition, - __void__setBottomRightHandlePosition__C5_osg_Vec2_R1); + I_SimpleProperty(const osg::Vec2d &, BottomRightHandlePosition, + __C5_osg_Vec2d_R1__getBottomRightHandlePosition, + __void__setBottomRightHandlePosition__C5_osg_Vec2d_R1); I_SimpleProperty(const osg::Vec4 &, Color, 0, __void__setColor__C5_osg_Vec4_R1); - I_SimpleProperty(const osg::Vec2 &, MinScale, - __C5_osg_Vec2_R1__getMinScale, - __void__setMinScale__C5_osg_Vec2_R1); + I_SimpleProperty(const osg::Vec2d &, MinScale, + __C5_osg_Vec2d_R1__getMinScale, + __void__setMinScale__C5_osg_Vec2d_R1); I_SimpleProperty(const osg::Vec4 &, PickColor, 0, __void__setPickColor__C5_osg_Vec4_R1); I_SimpleProperty(osg::Node &, TopLeftHandleNode, 0, __void__setTopLeftHandleNode__osg_Node_R1); - I_SimpleProperty(const osg::Vec2 &, TopLeftHandlePosition, - __C5_osg_Vec2_R1__getTopLeftHandlePosition, - __void__setTopLeftHandlePosition__C5_osg_Vec2_R1); + I_SimpleProperty(const osg::Vec2d &, TopLeftHandlePosition, + __C5_osg_Vec2d_R1__getTopLeftHandlePosition, + __void__setTopLeftHandlePosition__C5_osg_Vec2d_R1); I_SimpleProperty(osg::Node &, TopRightHandleNode, 0, __void__setTopRightHandleNode__osg_Node_R1); - I_SimpleProperty(const osg::Vec2 &, TopRightHandlePosition, - __C5_osg_Vec2_R1__getTopRightHandlePosition, - __void__setTopRightHandlePosition__C5_osg_Vec2_R1); + I_SimpleProperty(const osg::Vec2d &, TopRightHandlePosition, + __C5_osg_Vec2d_R1__getTopRightHandlePosition, + __void__setTopRightHandlePosition__C5_osg_Vec2d_R1); END_REFLECTOR diff --git a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp index 595268ade..61a41b5e8 100644 --- a/src/osgWrappers/osgManipulator/Translate1DDragger.cpp +++ b/src/osgWrappers/osgManipulator/Translate1DDragger.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -31,8 +31,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::Translate1DDragger) I_Constructor0(____Translate1DDragger, "", ""); - I_Constructor2(IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e, - ____Translate1DDragger__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + I_Constructor2(IN, const osg::Vec3d &, s, IN, const osg::Vec3d &, e, + ____Translate1DDragger__C5_osg_Vec3d_R1__C5_osg_Vec3d_R1, "", ""); I_Method3(bool, handle, IN, const osgManipulator::PointerInfo &, pi, IN, const osgGA::GUIEventAdapter &, ea, IN, osgGA::GUIActionAdapter &, us,