Prevent segfault during layout destruction

[r2c2.git] / source / 3d / layout.cpp

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index d97dfe507472824aa5fdb91f7fa947a0d4b76063..2927e446741df4e1ad2ae194949831f449cc2afc 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -16,20 +16,18 @@ Layout3D::Layout3D(Layout &l):
        sun.set_position(0, -0.259, 0.966, 0);
        lighting.attach(0, sun);
 
-       layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
-       layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
-       layout.signal_vehicle_added.connect(sigc::mem_fun(this, &Layout3D::vehicle_added));
-       layout.signal_vehicle_removed.connect(sigc::mem_fun(this, &Layout3D::vehicle_removed));
-       layout.signal_signal_added.connect(sigc::mem_fun(this, &Layout3D::signal_added));
-       layout.signal_signal_removed.connect(sigc::mem_fun(this, &Layout3D::signal_removed));
-
-       const set<Track *> &ltracks = layout.get_tracks();
-       for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-               track_added(**i);
+       layout.signal_object_added.connect(sigc::mem_fun(this, &Layout3D::object_added));
+       layout.signal_object_removed.connect(sigc::mem_fun(this, &Layout3D::object_removed));
+
+       const set<Object *> &lobjs = layout.get_all<Object>();
+       for(set<Object *>::iterator i=lobjs.begin(); i!=lobjs.end(); ++i)
+               object_added(**i);
 }
 
 Layout3D::~Layout3D()
 {
+       while(!signals.empty())
+               delete signals.begin()->second;
        while(!tracks.empty())
                delete tracks.begin()->second;
        while(!vehicles.empty())
@@ -38,18 +36,13 @@ Layout3D::~Layout3D()
 
 void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
 {
-       minp = maxp = Vector();
+       Geometry::BoundingBox<float, 3> bbox;
 
        for(TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-       {
-               Vector tmin;
-               Vector tmax;
-               i->second->get_bounds(Angle::zero(), tmin, tmax);
-               minp.x = min(minp.x, tmin.x);
-               minp.y = min(minp.y, tmin.y);
-               maxp.x = max(maxp.x, tmax.x);
-               maxp.y = max(maxp.y, tmax.y);
-       }
+               bbox = bbox|i->second->get_track().get_type().get_shape()->get_axis_aligned_bounding_box();
+
+       minp = bbox.get_minimum_point();
+       maxp = bbox.get_maximum_point();
 }
 
 void Layout3D::add_track(Track3D &t)
@@ -97,40 +90,36 @@ Signal3D &Layout3D::get_signal(Signal &s) const
        return *get_item(signals, &s);
 }
 
-void Layout3D::track_added(Track &t)
-{
-       new Track3D(*this, t);
-}
-
-void Layout3D::track_removed(Track &t)
-{
-       TrackMap::iterator i = tracks.find(&t);
-       if(i!=tracks.end())
-               delete i->second;
-}
-
-void Layout3D::vehicle_added(Vehicle &v)
-{
-       new Vehicle3D(*this, v);
-}
-
-void Layout3D::vehicle_removed(Vehicle &v)
-{
-       VehicleMap::iterator i = vehicles.find(&v);
-       if(i!=vehicles.end())
-               delete i->second;
-}
-
-void Layout3D::signal_added(Signal &s)
+void Layout3D::object_added(Object &o)
 {
-       new Signal3D(*this, s);
+       if(Track *t = dynamic_cast<Track *>(&o))
+               new Track3D(*this, *t);
+       else if(Signal *s = dynamic_cast<Signal *>(&o))
+               new Signal3D(*this, *s);
+       else if(Vehicle *v = dynamic_cast<Vehicle *>(&o))
+               new Vehicle3D(*this, *v);
 }
 
-void Layout3D::signal_removed(Signal &s)
+void Layout3D::object_removed(Object &o)
 {
-       SignalMap::iterator i = signals.find(&s);
-       if(i!=signals.end())
-               delete i->second;
+       if(Track *t = dynamic_cast<Track *>(&o))
+       {
+               TrackMap::iterator i = tracks.find(t);
+               if(i!=tracks.end())
+                       delete i->second;
+       }
+       else if(Signal *s = dynamic_cast<Signal *>(&o))
+       {
+               SignalMap::iterator i = signals.find(s);
+               if(i!=signals.end())
+                       delete i->second;
+       }
+       else if(Vehicle *v = dynamic_cast<Vehicle *>(&o))
+       {
+               VehicleMap::iterator i = vehicles.find(v);
+               if(i!=vehicles.end())
+                       delete i->second;
+       }
 }
 
 } // namespace R2C2