Plug several memory leaks

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

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 0a9ee2d2b4c5362888c7d9996ef965e91f2da3a5..d243374de5f7df4eed4a66931711b43dd201041c 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,11 +1,5 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include "layout.h"
+#include "signal.h"
 #include "track.h"
 #include "vehicle.h"
 
@@ -18,30 +12,49 @@ Layout3D::Layout3D(Layout &l):
        layout(l),
        catalogue(layout.get_catalogue())
 {
+       // South, 15° from zenith
+       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);
+       const set<Signal *> &lsignals = layout.get_signals();
+       for(set<Signal *>::iterator i=lsignals.begin(); i!=lsignals.end(); ++i)
+               signal_added(**i);
 }
 
 Layout3D::~Layout3D()
 {
+       while(!signals.empty())
+               delete signals.begin()->second;
        while(!tracks.empty())
                delete tracks.begin()->second;
        while(!vehicles.empty())
                delete vehicles.begin()->second;
 }
 
-void Layout3D::add_track(Track3D &t)
+void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
 {
-       if(tracks.count(&t.get_track()))
-               throw KeyError("Duplicate track");
+       Geometry::BoundingBox<float, 3> bbox;
 
-       tracks[&t.get_track()] = &t;
+       for(TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               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)
+{
+       insert_unique(tracks, &t.get_track(), &t);
 }
 
 void Layout3D::remove_track(Track3D &t)
@@ -51,19 +64,12 @@ void Layout3D::remove_track(Track3D &t)
 
 Track3D &Layout3D::get_track(Track &t) const
 {
-       TrackMap::const_iterator i = tracks.find(&t);
-       if(i==tracks.end())
-               throw KeyError("Unknown track");
-
-       return *i->second;
+       return *get_item(tracks, &t);
 }
 
 void Layout3D::add_vehicle(Vehicle3D &v)
 {
-       if(vehicles.count(&v.get_vehicle()))
-               throw KeyError("Duplicate vehicle");
-
-       vehicles[&v.get_vehicle()] = &v;
+       insert_unique(vehicles, &v.get_vehicle(), &v);
 }
 
 void Layout3D::remove_vehicle(Vehicle3D &v)
@@ -73,11 +79,22 @@ void Layout3D::remove_vehicle(Vehicle3D &v)
 
 Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
 {
-       VehicleMap::const_iterator i = vehicles.find(&v);
-       if(i==vehicles.end())
-               throw KeyError("Unknown vehicle");
+       return *get_item(vehicles, &v);
+}
+
+void Layout3D::add_signal(Signal3D &s)
+{
+       insert_unique(signals, &s.get_signal(), &s);
+}
 
-       return *i->second;
+void Layout3D::remove_signal(Signal3D &s)
+{
+       signals.erase(&s.get_signal());
+}
+
+Signal3D &Layout3D::get_signal(Signal &s) const
+{
+       return *get_item(signals, &s);
 }
 
 void Layout3D::track_added(Track &t)
@@ -104,4 +121,16 @@ void Layout3D::vehicle_removed(Vehicle &v)
                delete i->second;
 }
 
+void Layout3D::signal_added(Signal &s)
+{
+       new Signal3D(*this, s);
+}
+
+void Layout3D::signal_removed(Signal &s)
+{
+       SignalMap::iterator i = signals.find(&s);
+       if(i!=signals.end())
+               delete i->second;
+}
+
 } // namespace R2C2