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

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index d243374..2927e44 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -16,19 +16,12 @@ 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);
-	const set<Signal *> &lsignals = layout.get_signals();
-	for(set<Signal *>::iterator i=lsignals.begin(); i!=lsignals.end(); ++i)
-		signal_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()
@@ -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)
-{
-	new Signal3D(*this, s);
-}
-
-void Layout3D::signal_removed(Signal &s)
-{
-	SignalMap::iterator i = signals.find(&s);
-	if(i!=signals.end())
-		delete i->second;
+void Layout3D::object_added(Object &o)
+{
+	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::object_removed(Object &o)
+{
+	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