added snap to CylinderMode

This commit is contained in:
Paolo Cignoni 2008-02-15 20:57:22 +00:00
parent e69c1d166b
commit 45b9624e73
1 changed files with 15 additions and 6 deletions

View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.15 2007/07/14 12:43:44 benedetti
Added Doxygen documentation.
Revision 1.14 2007/07/09 22:47:18 benedetti Revision 1.14 2007/07/09 22:47:18 benedetti
Removed using namespace std and modified accordingly. Removed using namespace std and modified accordingly.
@ -425,8 +428,8 @@ public:
@param origin a point on the line. @param origin a point on the line.
@param direction the line direction. @param direction the line direction.
*/ */
AxisMode (const Point3f & origin, const Point3f & direction) { AxisMode (const Point3f & origin, const Point3f & direction)
axis = Line3fN (origin, direction); : axis(Line3fN (origin, direction)) {
} }
/*! /*!
@brief Return this manipulator's name. @brief Return this manipulator's name.
@ -561,9 +564,11 @@ public:
The line will be normalized. The line will be normalized.
@param ln the line that represent the axis. @param ln the line that represent the axis.
@param s a rotational snap angle non negative
*/ */
CylinderMode (Line3fN & ln) CylinderMode (Line3fN & ln,float s=0.0f)
: axis (ln){ : axis (ln), snap(s){
assert(snap>=0.0);
} }
/*! /*!
@brief The origin-direction constructor. @brief The origin-direction constructor.
@ -574,9 +579,11 @@ public:
@param origin a point on the axis. @param origin a point on the axis.
@param direction the axis direction. @param direction the axis direction.
@param s a rotational snap angle (non negative)
*/ */
CylinderMode (const Point3f & origin, const Point3f & direction) CylinderMode (const Point3f & origin, const Point3f & direction,float s=0.0f)
: axis (Line3fN(origin,direction)){ : axis (Line3fN(origin,direction)), snap(s){
assert(snap>=0.0);
} }
/*! /*!
@brief Return this manipulator's name. @brief Return this manipulator's name.
@ -616,6 +623,8 @@ public:
private: private:
/// The axis, stored as a normalized line. /// The axis, stored as a normalized line.
Line3fN axis; Line3fN axis;
/// The rotational snap value
float snap;
}; };
// Path mode. // Path mode.