Report the closest object when picking

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index ac7101dfcf4e49708f8571a0f62bc4a9df292db4..c7dc346d61db45c652c3f553fc438c92e9f8576f 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -188,12 +188,21 @@ template<typename T>
 T *Layout::pick(const Ray &ray)
 {
        const set<Object *> &objs = objects.get();
+       T *closest = 0;
+       float distance = -1;
        for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
                if(T *t = dynamic_cast<T *>(*i))
-                       if(t->collide_ray(ray))
-                               return t;
-
-       return 0;
+               {
+                       float d = -1;
+                       if(t->collide_ray(ray, &d))
+                               if(!closest || d<distance)
+                               {
+                                       closest = t;
+                                       distance = d;
+                               }
+               }
+
+       return closest;
 }
 
 template Object *Layout::pick<Object>(const Ray &);