X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=d243374de5f7df4eed4a66931711b43dd201041c;hb=0db89b665527609582df98854c9e3255d1017811;hp=266c921cfdf55f9e09414061c96322fa7b724189;hpb=d15ac13f2e170f155b4bbd124df48400c339b644;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 266c921..d243374 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -1,4 +1,5 @@
 #include "layout.h"
+#include "signal.h"
 #include "track.h"
 #include "vehicle.h"
 
@@ -19,14 +20,21 @@ Layout3D::Layout3D(Layout &l):
 	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())
@@ -35,26 +43,18 @@ 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(0, 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)
 {
-	if(tracks.count(&t.get_track()))
-		throw KeyError("Duplicate track");
-
-	tracks[&t.get_track()] = &t;
+	insert_unique(tracks, &t.get_track(), &t);
 }
 
 void Layout3D::remove_track(Track3D &t)
@@ -64,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)
@@ -86,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)
@@ -117,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