manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added some std:: here and there

This commit is contained in:
Paolo Cignoni 2007-06-25 10:21:38 +00:00
parent 5e81eca026
commit f11076bbcd
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wrap/gui/trackmode.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.12 2007/06/13 17:15:09 benedetti
Added one-level undo system and sticky trackmodes.
Revision 1.11 2007/05/15 14:59:10 benedetti Revision 1.11 2007/05/15 14:59:10 benedetti
Main restructuring. added many new modes Main restructuring. added many new modes
@ -255,7 +258,7 @@ private:
// the vector passed to build the path is copied locally. // the vector passed to build the path is copied locally.
class PathMode:public TrackMode { class PathMode:public TrackMode {
public: public:
PathMode ( const vector < Point3f > &pts, bool w = false) PathMode ( const std::vector < Point3f > &pts, bool w = false)
: points(), wrap(w), current_state(0), initial_state(0), old_hitpoint() : points(), wrap(w), current_state(0), initial_state(0), old_hitpoint()
{ {
Init(pts); Init(pts);
@ -282,13 +285,13 @@ public:
bool isSticky(); bool isSticky();
void Undo(); void Undo();
private: private:
void Init(const vector < Point3f > &points); void Init(const std::vector < Point3f > &points);
void GetPoints(float state, Point3f & point, Point3f & prev_point, Point3f & next_point); void GetPoints(float state, Point3f & point, Point3f & prev_point, Point3f & next_point);
float Normalize(float state); float Normalize(float state);
float HitPoint(float state, Ray3fN ray, Point3f &hit_point); float HitPoint(float state, Ray3fN ray, Point3f &hit_point);
int Verse(Point3f reference_point,Point3f current_point,Point3f prev_point,Point3f next_point); int Verse(Point3f reference_point,Point3f current_point,Point3f prev_point,Point3f next_point);
vector < Point3f > points; std::vector < Point3f > points;
bool wrap; bool wrap;
float current_state; float current_state;
float initial_state; float initial_state;
@ -316,7 +319,7 @@ private:
class AreaMode:public TrackMode { class AreaMode:public TrackMode {
public: public:
AreaMode (const vector < Point3f > &pts) AreaMode (const std::vector < Point3f > &pts)
{ {
Init(pts); Init(pts);
assert(min_side_length > 0.0f); assert(min_side_length > 0.0f);
@ -332,11 +335,11 @@ public:
bool isSticky(); bool isSticky();
void Undo(); void Undo();
private: private:
void Init(const vector < Point3f > &pts); void Init(const std::vector < Point3f > &pts);
bool Inside(Point3f point); bool Inside(Point3f point);
Point3f Move(Point3f start,Point3f end); Point3f Move(Point3f start,Point3f end);
vector < Point3f > points; std::vector < Point3f > points;
bool begin_action; bool begin_action;
int first_coord_kept; int first_coord_kept;
int second_coord_kept; int second_coord_kept;
@ -348,7 +351,7 @@ private:
Plane3f plane; Plane3f plane;
Point3f rubberband_handle ; Point3f rubberband_handle ;
vector < Point3f > path; std::vector < Point3f > path;
bool undo_begin_action; bool undo_begin_action;
Point3f undo_status; Point3f undo_status;