X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmeasure.h;h=84b1c832ea21a646052b05c432e07cdeb0c3da5f;hb=54d520566470a4b21b2a6eac3e2943d6305dcfa1;hp=69442d823984fdcbfe7ee3e21e9ce91a1043cd62;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git diff --git a/source/designer/measure.h b/source/designer/measure.h index 69442d8..84b1c83 100644 --- a/source/designer/measure.h +++ b/source/designer/measure.h @@ -2,10 +2,11 @@ #define MEASURE_H_ #include +#include class Designer; -class Measure +class Measure: public Msp::GL::Renderable { private: enum State @@ -28,6 +29,7 @@ private: float perp_dist; float adiff; State state; + Msp::GL::Mesh mesh; public: Measure(Designer &); @@ -35,10 +37,11 @@ public: float get_perpendicular_distance() const { return perp_dist; } float get_angle_difference() const { return adiff; } void start(); - void button_press(int, int, float, float, unsigned); - void pointer_motion(int, int, float, float); - void render(); + void button_press(float, float, unsigned); + void pointer_motion(float, float); + virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const; private: + void update_mesh(); void snap_to_tracks(R2C2::Vector &, float &); };