Make use of the mspmath library

[r2c2.git] / source / designer / measure.h

diff --git a/source/designer/measure.h b/source/designer/measure.h
index d7c7b7719ad3c6b079b2a5317bba01f472183a24..c5696984fc32aba12b20ca37cfae8103efddff65 100644 (file)
--- a/source/designer/measure.h
+++ b/source/designer/measure.h
@@ -2,23 +2,13 @@
 #define MEASURE_H_
 
 #include <sigc++/sigc++.h>
+#include <msp/gl/renderable.h>
+#include "libr2c2/geometry.h"
 
 class Designer;
 
-class Measure
+class Measure: public Msp::GL::Renderable
 {
-public:
-       sigc::signal<void> signal_done;
-       sigc::signal<void> signal_changed;
-
-       Measure(Designer &);
-       float get_parallel_distance() const      { return par_dist; }
-       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();
 private:
        enum State
        {
@@ -27,16 +17,32 @@ private:
                ACTIVE
        };
 
+public:
+       sigc::signal<void> signal_done;
+       sigc::signal<void> signal_changed;
+
+private:
        Designer &designer;
-       Marklin::Point pointer;
-       Marklin::Point spoint;
-       float sdir;
+       R2C2::Vector pointer;
+       R2C2::Snap ssnap;
        float par_dist;
        float perp_dist;
-       float adiff;
+       R2C2::Angle adiff;
        State state;
+       Msp::GL::Mesh mesh;
 
-       void snap_to_tracks(Marklin::Point &, float &);
+public:
+       Measure(Designer &);
+       float get_parallel_distance() const { return par_dist; }
+       float get_perpendicular_distance() const { return perp_dist; }
+       const R2C2::Angle &get_angle_difference() const { return adiff; }
+       void start();
+       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::Snap &);
 };
 
 #endif