Return null from Route::find if a route can't be found

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index c2c26da8332e3cc9d016a5af2eb3a48d731f6e12..92c2f25564b177918a80129fdd1a9b6a26778f88 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -137,9 +137,9 @@ Designer::Designer(int argc, char **argv):
 
        overlay = new Overlay3D(window, camera, ui_res.get_default_font());
 
-       const list<Track3D *> &tracks = layout_3d->get_tracks();
-       for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               update_track_icon(**i);
+       const Layout3D::TrackMap &tracks = layout_3d->get_tracks();
+       for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               update_track_icon(*i->second);
 }
 
 Designer::~Designer()
@@ -261,14 +261,14 @@ void Designer::tick()
        float dt = (t-last_tick)/Msp::Time::sec;
        last_tick = t;
 
-       for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
-               layout_3d->get_track(**i).get_path().set_mask(0);
-       new_tracks.clear();
-
        window.get_display().tick();
        root->tick();
        camera_ctl.tick(dt);
 
+       for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
+               layout_3d->get_track(**i).get_path().set_mask(0);
+       new_tracks.clear();
+
        render();
 
        window.swap_buffers();
@@ -362,6 +362,8 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t)
                set_sensor_id();
        else if(key==Msp::Input::KEY_A)
                add_selection_to_route();
+       else if(key==Msp::Input::KEY_C)
+               manipulator.connect();
 }
 
 void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
@@ -587,12 +589,12 @@ void Designer::view_all()
        Point minp;
        Point maxp;
 
-       const list<Track3D *> &tracks = layout_3d->get_tracks();
-       for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       const Layout3D::TrackMap &tracks = layout_3d->get_tracks();
+       for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
                Point tmin;
                Point tmax;
-               (*i)->get_bounds(0, tmin, tmax);
+               i->second->get_bounds(0, tmin, tmax);
                minp.x = min(minp.x, tmin.x);
                minp.y = min(minp.y, tmin.y);
                maxp.x = max(maxp.x, tmax.x);