X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=2927e446741df4e1ad2ae194949831f449cc2afc;hb=cb4e53ba1b8ea41b978190de6668e9862b9cfea8;hp=7fd0d4ddac4b112073374fc25f6d4f96284f29c1;hpb=4236c30c0a7a48854e9634e9ad7d8d6e0fd243a3;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index 7fd0d4d..2927e44 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"
 
@@ -15,18 +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_object_added.connect(sigc::mem_fun(this, &Layout3D::object_added));
+	layout.signal_object_removed.connect(sigc::mem_fun(this, &Layout3D::object_removed));
 
-	const set<Track *> &ltracks = layout.get_tracks();
-	for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-		track_added(**i);
+	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())
@@ -35,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(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)
@@ -79,28 +75,51 @@ Vehicle3D &Layout3D::get_vehicle(Vehicle &v) const
 	return *get_item(vehicles, &v);
 }
 
-void Layout3D::track_added(Track &t)
+void Layout3D::add_signal(Signal3D &s)
+{
+	insert_unique(signals, &s.get_signal(), &s);
+}
+
+void Layout3D::remove_signal(Signal3D &s)
 {
-	new Track3D(*this, t);
+	signals.erase(&s.get_signal());
 }
 
-void Layout3D::track_removed(Track &t)
+Signal3D &Layout3D::get_signal(Signal &s) const
 {
-	TrackMap::iterator i = tracks.find(&t);
-	if(i!=tracks.end())
-		delete i->second;
+	return *get_item(signals, &s);
 }
 
-void Layout3D::vehicle_added(Vehicle &v)
+void Layout3D::object_added(Object &o)
 {
-	new Vehicle3D(*this, v);
+	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::vehicle_removed(Vehicle &v)
+void Layout3D::object_removed(Object &o)
 {
-	VehicleMap::iterator i = vehicles.find(&v);
-	if(i!=vehicles.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