X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=c940e1cd93d15e517f1501506e228172362aba6c;hb=25c26706d400228110e14a4a9a9765cb1298372d;hp=208d40f10cdbbdfe09e81f6457c1a29a3da1a7c8;hpb=9ddcd066e37e4c72685817c042c30897786ece05;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 208d40f..c940e1c 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -22,9 +22,9 @@ Track::Track(Layout &l, const TrackType &t):
 	rot(0),
 	slope(0),
 	flex(false),
-	turnout_id(0),
+	turnout_id(type.is_turnout() ? layout.allocate_turnout_id(type.is_double_address()) : 0),
 	sensor_id(0),
-	links(t.get_endpoints().size()),
+	links(type.get_endpoints().size()),
 	active_path(0)
 {
 	layout.add_track(*this);
@@ -103,6 +103,7 @@ void Track::set_turnout_id(unsigned i)
 
 	turnout_id = i;
 	layout.create_blocks(*this);
+	layout.update_routes();
 	if(layout.has_driver() && turnout_id)
 	{
 		layout.get_driver().add_turnout(turnout_id);
@@ -130,8 +131,10 @@ void Track::set_active_path(unsigned p)
 		throw InvalidParameterValue("Invalid path");
 
 	layout.get_driver().set_turnout(turnout_id, p&1);
-	if(type.get_n_paths()>2)
+	if(type.is_double_address())
 		layout.get_driver().set_turnout(turnout_id+1, p&2);
+	else if(type.get_n_paths()>2)
+		active_path = (active_path&1) | (p&2);
 }
 
 int Track::get_endpoint_by_link(const Track &other) const
@@ -173,7 +176,7 @@ float Track::get_endpoint_direction(unsigned epi) const
 
 bool Track::snap_to(Track &other, bool link)
 {
-	float limit = (link && !flex) ? 1e-6 : 1e-4;
+	float limit = (link && !flex && !other.get_flex()) ? 1e-6 : 1e-4;
 	const vector<Endpoint> &eps = type.get_endpoints();
 	const vector<Endpoint> &other_eps = other.get_type().get_endpoints();
 
@@ -191,13 +194,16 @@ bool Track::snap_to(Track &other, bool link)
 			float dy = epp2.y-epp.y;
 			if(dx*dx+dy*dy<limit)
 			{
-				set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
-				Point p(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)),
-					epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)),
-					epp2.z);
-				if(eps.size()==2 && i==1)
-					p.z -= slope;
-				set_position(p);
+				if(!link || (!flex && !other.get_flex()))
+				{
+					set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
+					Point p(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)),
+						epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)),
+						epp2.z);
+					if(eps.size()==2 && i==1)
+						p.z -= slope;
+					set_position(p);
+				}
 
 				if(link)
 				{
@@ -304,7 +310,7 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 	float c = cos(rot);
 	float s = sin(rot);
 
-	p.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, 0);
+	p.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, pos.z);
 	p.dir += rot;
 	if(type.get_endpoints().size()==2)
 	{
@@ -312,12 +318,12 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 		float grade = slope/len;
 		if(epi==0)
 		{
-			p.pos.z = pos.z+grade*d;
+			p.pos.z += grade*d;
 			p.grade = grade;
 		}
 		else
 		{
-			p.pos.z = pos.z+slope-grade*d;
+			p.pos.z += slope-grade*d;
 			p.grade = -grade;
 		}
 	}