Make use of the geometry part of libmspmath

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 45b18e322fa6e8db5a065fb616e002b869b206a8..c70ebb7b3879f0d528c5864bb594712093869d72 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -72,9 +72,9 @@ void Layout::add_track(Track &t)
        }
 }
 
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
+Track *Layout::pick_track(const Ray &ray)
 {
-       return pick(tracks, start, ray);
+       return pick(tracks, ray);
 }
 
 void Layout::remove_track(Track &t)
@@ -107,9 +107,9 @@ void Layout::add_signal(Signal &s)
                signal_signal_added.emit(s);
 }
 
-Signal *Layout::pick_signal(const Vector &start, const Vector &ray)
+Signal *Layout::pick_signal(const Ray &ray)
 {
-       return pick(signals, start, ray);
+       return pick(signals, ray);
 }
 
 void Layout::remove_signal(Signal &s)
@@ -118,20 +118,20 @@ void Layout::remove_signal(Signal &s)
                signal_signal_removed.emit(s);
 }
 
-Object *Layout::pick_object(const Vector &start, const Vector &ray)
+Object *Layout::pick_object(const Ray &ray)
 {
-       if(Object *obj = pick_track(start, ray))
+       if(Object *obj = pick_track(ray))
                return obj;
-       else if((obj = pick_signal(start, ray)))
+       else if((obj = pick_signal(ray)))
                return obj;
        return 0;
 }
 
 template<typename T>
-T *Layout::pick(const set<T *> &objs, const Vector &start, const Vector &ray)
+T *Layout::pick(const set<T *> &objs, const Ray &ray)
 {
        for(typename set<T *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               if((*i)->collide_ray(start, ray))
+               if((*i)->collide_ray(ray))
                        return *i;
 
        return 0;