X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Flibr2c2%2Ftrack.cpp;h=5da34f692b370c9f5711536e2d0838da78e9f8cb;hb=26a8dbeae14c685c6aef1aad3aa75c6f1a75e458;hp=455cc88055c6301a8b7d53d29998a5d98cea8eb1;hpb=cb4dfc37dd2cd9e02de7f022fd7f8a1fc8e5ee3c;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 455cc88..5da34f6 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -53,6 +53,8 @@ Track::Track(Layout &l, const TrackType &t):
 Track::~Track()
 {
 	break_links();
+	if(layout.has_driver() && turnout_id)
+		layout.get_driver().remove_turnout(turnout_id);
 	layout.remove(*this);
 }
 
@@ -155,11 +157,15 @@ void Track::set_turnout_id(unsigned i)
 	if(!i)
 		throw invalid_argument("Track::set_turnout_id");
 
+	Driver *driver = (layout.has_driver() ? &layout.get_driver() : 0);
+
+	if(driver && turnout_id)
+		driver->remove_turnout(turnout_id);
 	turnout_id = i;
 	layout.create_blocks(*this);
 	layout.update_routes();
-	if(layout.has_driver() && turnout_id)
-		layout.get_driver().add_turnout(turnout_id, type);
+	if(driver && turnout_id)
+		driver->add_turnout(turnout_id, type);
 }
 
 void Track::set_sensor_id(unsigned i)
@@ -169,8 +175,6 @@ void Track::set_sensor_id(unsigned i)
 
 	sensor_id = i;
 	layout.create_blocks(*this);
-	if(layout.has_driver() && sensor_id)
-		layout.get_driver().add_sensor(sensor_id);
 }
 
 void Track::set_active_path(unsigned p)
@@ -185,31 +189,38 @@ void Track::set_active_path(unsigned p)
 	layout.get_driver().set_turnout(turnout_id, p);
 }
 
-TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
+float Track::get_path_length(int p) const
+{
+	if(p<0)
+		p = active_path;
+	return type.get_path_length(p);
+}
+
+OrientedPoint Track::get_point(unsigned epi, unsigned path, float d) const
 {
-	TrackPoint p = type.get_point(epi, path, d);
+	OrientedPoint p = type.get_point(epi, path, d);
 
-	p.pos = position+rotated_vector(p.pos, rotation);
-	p.dir += rotation;
+	p.position = position+rotated_vector(p.position, rotation);
+	p.rotation += rotation;
 	if(type.get_endpoints().size()==2)
 	{
-		float grade = tan(tilt);
+		float dz = tan(tilt)*d;
 		if(epi==0)
 		{
-			p.pos.z += grade*d;
-			p.grade = grade;
+			p.position.z += dz;
+			p.tilt = tilt;
 		}
 		else
 		{
-			p.pos.z += slope-grade*d;
-			p.grade = -grade;
+			p.position.z += slope-dz;
+			p.tilt = -tilt;
 		}
 	}
 
 	return p;
 }
 
-TrackPoint Track::get_point(unsigned epi, float d) const
+OrientedPoint Track::get_point(unsigned epi, float d) const
 {
 	return get_point(epi, active_path, d);
 }
@@ -246,12 +257,12 @@ bool Track::snap(Snap &sn, float limit, SnapType what) const
 	{
 		Vector local = rotated_vector(sn.position-position, -rotation);
 
-		TrackPoint tp = type.get_nearest_point(local);
-		Vector span = local-tp.pos;
+		OrientedPoint np = type.get_nearest_point(local);
+		Vector span = local-np.position;
 		if(dot(span, span)<=limit*limit)
 		{
-			sn.position = position+rotated_vector(tp.pos, rotation);
-			sn.rotation = tp.dir+rotation;
+			sn.position = position+rotated_vector(np.position, rotation);
+			sn.rotation = np.rotation+rotation;
 			return true;
 		}
 	}
@@ -339,9 +350,14 @@ bool Track::break_link(unsigned i)
 		return false;
 
 	links[i] = 0;
-	other->break_link(*this);
-	// XXX Creates the blocks twice, because the other track calls this too
-	layout.create_blocks(*this);
+	if(!other->break_link(*this))
+	{
+		/* If the call doesn't succeed, it means that the other track already
+		broke the link and is calling us right now.  Recreate blocks in the inner
+		call so it occurs before any signals are emitted. */
+		layout.create_blocks(*this);
+	}
+
 	signal_link_changed.emit(i, 0);
 
 	return true;