diff --git a/src/osgWrappers/osg/LineSegment.cpp b/src/osgWrappers/osg/LineSegment.cpp index 70c27a5f2..fe1ca6353 100644 --- a/src/osgWrappers/osg/LineSegment.cpp +++ b/src/osgWrappers/osg/LineSegment.cpp @@ -24,6 +24,10 @@ #undef OUT #endif +TYPE_NAME_ALIAS(osg::Vec3d, osg::LineSegment::vec_type) + +TYPE_NAME_ALIAS(osg::LineSegment::vec_type::value_type, osg::LineSegment::value_type) + BEGIN_OBJECT_REFLECTOR(osg::LineSegment) I_DeclaringFile("osg/LineSegment"); I_BaseType(osg::Referenced); @@ -35,33 +39,33 @@ BEGIN_OBJECT_REFLECTOR(osg::LineSegment) ____LineSegment__C5_LineSegment_R1, "", ""); - I_Constructor2(IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e, - ____LineSegment__C5_Vec3_R1__C5_Vec3_R1, + I_Constructor2(IN, const osg::LineSegment::vec_type &, s, IN, const osg::LineSegment::vec_type &, e, + ____LineSegment__C5_vec_type_R1__C5_vec_type_R1, "", ""); - I_Method2(void, set, IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e, + I_Method2(void, set, IN, const osg::LineSegment::vec_type &, s, IN, const osg::LineSegment::vec_type &, e, Properties::NON_VIRTUAL, - __void__set__C5_Vec3_R1__C5_Vec3_R1, + __void__set__C5_vec_type_R1__C5_vec_type_R1, "", ""); - I_Method0(osg::Vec3 &, start, + I_Method0(osg::LineSegment::vec_type &, start, Properties::NON_VIRTUAL, - __Vec3_R1__start, + __vec_type_R1__start, "", ""); - I_Method0(const osg::Vec3 &, start, + I_Method0(const osg::LineSegment::vec_type &, start, Properties::NON_VIRTUAL, - __C5_Vec3_R1__start, + __C5_vec_type_R1__start, "", ""); - I_Method0(osg::Vec3 &, end, + I_Method0(osg::LineSegment::vec_type &, end, Properties::NON_VIRTUAL, - __Vec3_R1__end, + __vec_type_R1__end, "", ""); - I_Method0(const osg::Vec3 &, end, + I_Method0(const osg::LineSegment::vec_type &, end, Properties::NON_VIRTUAL, - __C5_Vec3_R1__end, + __C5_vec_type_R1__end, "", ""); I_Method0(bool, valid, diff --git a/src/osgWrappers/osgManipulator/Command.cpp b/src/osgWrappers/osgManipulator/Command.cpp index 6e801150b..e847d7a6b 100644 --- a/src/osgWrappers/osgManipulator/Command.cpp +++ b/src/osgWrappers/osgManipulator/Command.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -385,8 +386,8 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) I_Constructor0(____TranslateInLineCommand, "", ""); - I_Constructor2(IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e, - ____TranslateInLineCommand__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + I_Constructor2(IN, const osg::LineSegment::vec_type &, s, IN, const osg::LineSegment::vec_type &, e, + ____TranslateInLineCommand__C5_osg_LineSegment_vec_type_R1__C5_osg_LineSegment_vec_type_R1, "", ""); I_Method0(bool, execute, @@ -404,19 +405,19 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) __void__applyConstraint__C5_Constraint_P1, "Apply a constraint to the command. ", ""); - I_Method2(void, setLine, IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e, + I_Method2(void, setLine, IN, const osg::LineSegment::vec_type &, s, IN, const osg::LineSegment::vec_type &, e, Properties::NON_VIRTUAL, - __void__setLine__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + __void__setLine__C5_osg_LineSegment_vec_type_R1__C5_osg_LineSegment_vec_type_R1, "", ""); - I_Method0(const osg::Vec3 &, getLineStart, + I_Method0(const osg::LineSegment::vec_type &, getLineStart, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getLineStart, + __C5_osg_LineSegment_vec_type_R1__getLineStart, "", ""); - I_Method0(const osg::Vec3 &, getLineEnd, + I_Method0(const osg::LineSegment::vec_type &, getLineEnd, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getLineEnd, + __C5_osg_LineSegment_vec_type_R1__getLineEnd, "", ""); I_Method1(void, setTranslation, IN, const osg::Vec3 &, t, @@ -434,11 +435,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::TranslateInLineCommand) __osg_Matrix__getMotionMatrix, "Gets the matrix for transforming the Selection. ", "This matrix is in the command's coordinate systems. "); - I_SimpleProperty(const osg::Vec3 &, LineEnd, - __C5_osg_Vec3_R1__getLineEnd, + I_SimpleProperty(const osg::LineSegment::vec_type &, LineEnd, + __C5_osg_LineSegment_vec_type_R1__getLineEnd, 0); - I_SimpleProperty(const osg::Vec3 &, LineStart, - __C5_osg_Vec3_R1__getLineStart, + I_SimpleProperty(const osg::LineSegment::vec_type &, LineStart, + __C5_osg_LineSegment_vec_type_R1__getLineStart, 0); I_SimpleProperty(osg::Matrix, MotionMatrix, __osg_Matrix__getMotionMatrix, diff --git a/src/osgWrappers/osgManipulator/Projector.cpp b/src/osgWrappers/osgManipulator/Projector.cpp index 0aa52dcb1..391ba64b8 100644 --- a/src/osgWrappers/osgManipulator/Projector.cpp +++ b/src/osgWrappers/osgManipulator/Projector.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -104,33 +105,33 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::LineProjector) I_Constructor0(____LineProjector, "", ""); - I_Constructor2(IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e, - ____LineProjector__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + I_Constructor2(IN, const osg::LineSegment::vec_type &, s, IN, const osg::LineSegment::vec_type &, e, + ____LineProjector__C5_osg_LineSegment_vec_type_R1__C5_osg_LineSegment_vec_type_R1, "", ""); - I_Method2(void, setLine, IN, const osg::Vec3 &, s, IN, const osg::Vec3 &, e, + I_Method2(void, setLine, IN, const osg::LineSegment::vec_type &, s, IN, const osg::LineSegment::vec_type &, e, Properties::NON_VIRTUAL, - __void__setLine__C5_osg_Vec3_R1__C5_osg_Vec3_R1, + __void__setLine__C5_osg_LineSegment_vec_type_R1__C5_osg_LineSegment_vec_type_R1, "", ""); - I_Method0(const osg::Vec3 &, getLineStart, + I_Method0(const osg::LineSegment::vec_type &, getLineStart, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getLineStart, + __C5_osg_LineSegment_vec_type_R1__getLineStart, "", ""); - I_Method0(osg::Vec3 &, getLineStart, + I_Method0(osg::LineSegment::vec_type &, getLineStart, Properties::NON_VIRTUAL, - __osg_Vec3_R1__getLineStart, + __osg_LineSegment_vec_type_R1__getLineStart, "", ""); - I_Method0(const osg::Vec3 &, getLineEnd, + I_Method0(const osg::LineSegment::vec_type &, getLineEnd, Properties::NON_VIRTUAL, - __C5_osg_Vec3_R1__getLineEnd, + __C5_osg_LineSegment_vec_type_R1__getLineEnd, "", ""); - I_Method0(osg::Vec3 &, getLineEnd, + I_Method0(osg::LineSegment::vec_type &, getLineEnd, Properties::NON_VIRTUAL, - __osg_Vec3_R1__getLineEnd, + __osg_LineSegment_vec_type_R1__getLineEnd, "", ""); I_Method2(bool, project, IN, const osgManipulator::PointerInfo &, pi, IN, osg::Vec3 &, projectedPoint, @@ -138,11 +139,11 @@ BEGIN_OBJECT_REFLECTOR(osgManipulator::LineProjector) __bool__project__C5_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, - __osg_Vec3_R1__getLineEnd, + I_SimpleProperty(osg::LineSegment::vec_type &, LineEnd, + __osg_LineSegment_vec_type_R1__getLineEnd, 0); - I_SimpleProperty(osg::Vec3 &, LineStart, - __osg_Vec3_R1__getLineStart, + I_SimpleProperty(osg::LineSegment::vec_type &, LineStart, + __osg_LineSegment_vec_type_R1__getLineStart, 0); END_REFLECTOR