Add helper class for processing driver options

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

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 0025ec3b5b3adcd305ebd08ec8b8a9c44b8622ac..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;
+               {
+                       float d = -1;
+                       if(t->collide_ray(ray, &d))
+                               if(!closest || d<distance)
+                               {
+                                       closest = t;
+                                       distance = d;
+                               }
+               }
 
-       return 0;
+       return closest;
 }
 
 template Object *Layout::pick<Object>(const Ray &);
@@ -463,6 +472,12 @@ void Layout::save_dynamic(const string &fn) const
        IO::BufferedFile out(fn, IO::M_WRITE);
        DataFile::Writer writer(out);
 
+       {
+               DataFile::Statement st("clock");
+               clock.save(st.sub);
+               writer.write(st);
+       }
+
        const set<Track *> &tracks = objects.get<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                if(unsigned taddr = (*i)->get_turnout_address())
@@ -548,6 +563,7 @@ Layout::Loader::Loader(Layout &l):
 {
        add("base",  &Layout::base);
        add("beamgate", &Loader::beamgate);
+       add("clock", &Loader::clock);
        add("route", &Loader::route);
        add("signal", &Loader::signal);
        add("terrain", &Loader::terrain);
@@ -563,6 +579,11 @@ void Layout::Loader::beamgate()
        load_sub(*gate);
 }
 
+void Layout::Loader::clock()
+{
+       load_sub(obj.clock);
+}
+
 void Layout::Loader::route()
 {
        Route *rte = new Route(obj);