X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=ecb86bbad33ad02e20699a05ef7655eb3d2d30a0;hb=2922bc5d2ba68979d186fd09df8b4ec6ba98402b;hp=e4d7badfb9f9e053d2dc7fa7650b039bf890cf90;hpb=b88d3630a0e3fdd763db018bbe5dbfe3180a95f2;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index e4d7bad..ecb86bb 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -26,7 +26,7 @@ Track::Track(Layout &l, const TrackType &t):
 	if(type.is_turnout())
 		turnout_id = layout.allocate_turnout_id();
 
-	layout.add_track(*this);
+	layout.add(*this);
 
 	if(layout.has_driver())
 		layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
@@ -37,7 +37,7 @@ Track::Track(Layout &l, const TrackType &t):
 Track::~Track()
 {
 	break_links();
-	layout.remove_track(*this);
+	layout.remove(*this);
 }
 
 Track *Track::clone(Layout *to_layout) const
@@ -69,15 +69,14 @@ Block &Track::get_block() const
 void Track::set_position(const Vector &p)
 {
 	position = p;
+	for(vector<Track *>::const_iterator i=links.begin(); i!=links.end(); ++i)
+		if(*i)
+			(*i)->check_slope();
 }
 
-void Track::set_rotation(float r)
+void Track::set_rotation(const Angle &r)
 {
-	rotation = r;
-	while(rotation<0)
-		rotation += M_PI*2;
-	while(rotation>M_PI*2)
-		rotation -= M_PI*2;
+	rotation = wrap_positive(r);
 }
 
 void Track::set_slope(float s)
@@ -100,23 +99,22 @@ void Track::check_slope()
 
 	if(links[0] && links[1])
 	{
-		Vector epp0 = links[0]->get_snap_node(links[0]->get_endpoint_by_link(*this)).position;
-		Vector epp1 = links[1]->get_snap_node(links[1]->get_endpoint_by_link(*this)).position;
+		Vector epp0 = links[0]->get_snap_node(links[0]->get_link_slot(*this)).position;
+		Vector epp1 = links[1]->get_snap_node(links[1]->get_link_slot(*this)).position;
 		position.z = epp0.z;
 		slope = epp1.z-position.z;
 	}
 	else
 	{
-		slope = 0;
 		if(links[0])
 		{
-			Vector epp = links[0]->get_snap_node(links[0]->get_endpoint_by_link(*this)).position;
+			Vector epp = links[0]->get_snap_node(links[0]->get_link_slot(*this)).position;
 			position.z = epp.z;
 		}
 		else if(links[1])
 		{
-			Vector epp = links[1]->get_snap_node(links[1]->get_endpoint_by_link(*this)).position;
-			position.z = epp.z;
+			Vector epp = links[1]->get_snap_node(links[1]->get_link_slot(*this)).position;
+			position.z = epp.z-slope;
 		}
 	}
 }
@@ -125,6 +123,8 @@ void Track::set_turnout_id(unsigned i)
 {
 	if(!type.is_turnout())
 		throw logic_error("not a turnout");
+	if(!i)
+		throw invalid_argument("Track::set_turnout_id");
 
 	turnout_id = i;
 	layout.create_blocks(*this);
@@ -155,113 +155,11 @@ void Track::set_active_path(unsigned p)
 	layout.get_driver().set_turnout(turnout_id, p);
 }
 
-int Track::get_endpoint_by_link(Track &other) const
-{
-	for(unsigned i=0; i<links.size(); ++i)
-		if(links[i]==&other)
-			return i;
-
-	return -1;
-}
-
-bool Track::snap_to(Track &other, bool link, float limit)
-{
-	if(!limit || link)
-	{
-		limit = layout.get_catalogue().get_gauge();
-		if(link && !flex && !other.get_flex())
-			limit /= 10;
-	}
-	limit *= limit;
-
-	const vector<TrackType::Endpoint> &eps = type.get_endpoints();
-	const vector<TrackType::Endpoint> &other_eps = other.get_type().get_endpoints();
-
-	for(unsigned i=0; i<eps.size(); ++i)
-	{
-		Vector epp = get_snap_node(i).position;
-
-		for(unsigned j=0; j<other_eps.size(); ++j)
-		{
-			if(other.get_link(j))
-				continue;
-
-			Vector epp2 = other.get_snap_node(j).position;
-			float dx = epp2.x-epp.x;
-			float dy = epp2.y-epp.y;
-			float dz = epp2.z-epp.z;
-			if(dx*dx+dy*dy<limit && dz*dz<limit)
-			{
-				if(!link || (!flex && !other.get_flex()))
-				{
-					set_rotation(other.rotation+other_eps[j].dir-eps[i].dir+M_PI);
-					Vector p(epp2.x-(eps[i].pos.x*cos(rotation)-eps[i].pos.y*sin(rotation)),
-						epp2.y-(eps[i].pos.y*cos(rotation)+eps[i].pos.x*sin(rotation)),
-						epp2.z);
-					if(eps.size()==2 && i==1)
-						p.z -= slope;
-					set_position(p);
-				}
-
-				if(link)
-				{
-					if(links[i])
-						break_link(*links[i]);
-					links[i] = &other;
-					other.links[j] = this;
-					layout.create_blocks(*this);
-
-					signal_link_changed.emit(i, &other);
-					other.signal_link_changed.emit(j, this);
-				}
-
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-void Track::break_link(Track &trk)
-{
-	for(vector<Track *>::iterator i=links.begin(); i!=links.end(); ++i)
-		if(*i==&trk)
-		{
-			*i = 0;
-			trk.break_link(*this);
-			// XXX Creates the blocks twice
-			layout.create_blocks(*this);
-			signal_link_changed.emit(i-links.begin(), 0);
-			return;
-		}
-}
-
-void Track::break_links()
-{
-	for(vector<Track *>::iterator i=links.begin(); i!=links.end(); ++i)
-		if(Track *trk=*i)
-		{
-			*i = 0;
-			trk->break_link(*this);
-		}
-}
-
-Track *Track::get_link(unsigned i) const
-{
-	if(i>=links.size())
-		throw out_of_range("Track::get_link");
-
-	return links[i];
-}
-
 TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 {
 	TrackPoint p = type.get_point(epi, path, d);
-	float c = cos(rotation);
-	float s = sin(rotation);
 
-	p.pos = Vector(position.x+c*p.pos.x-s*p.pos.y, position.y+s*p.pos.x+c*p.pos.y, position.z);
+	p.pos = position+rotated_vector(p.pos, rotation);
 	p.dir += rotation;
 	if(type.get_endpoints().size()==2)
 	{
@@ -301,10 +199,7 @@ Snap Track::get_snap_node(unsigned i) const
 	Snap result;
 	const TrackType::Endpoint &ep = eps[i];
 
-	float c = cos(rotation);
-	float s = sin(rotation);
-
-	result.position = Vector(position.x+c*ep.pos.x-s*ep.pos.y, position.y+s*ep.pos.x+c*ep.pos.y, position.z);
+	result.position = position+rotated_vector(ep.pos, rotation);
 	if(eps.size()==2 && i==1)
 		result.position.z += slope;
 
@@ -320,16 +215,13 @@ bool Track::snap(Snap &sn, float limit, SnapType what) const
 
 	if(what&SNAP_SEGMENT)
 	{
-		Vector local(sn.position.x-position.x, sn.position.y-position.y, sn.position.z-position.z);
-		float c = cos(rotation);
-		float s = sin(rotation);
-		local = Vector(c*local.x+s*local.y, c*local.y-s*local.x, local.z);
+		Vector local = rotated_vector(sn.position-position, -rotation);
 
 		TrackPoint tp = type.get_nearest_point(local);
-		Vector d(local.x-tp.pos.x, local.y-tp.pos.y, local.z-tp.pos.z);
-		if(d.x*d.x+d.y*d.y+d.z*d.z<=limit*limit)
+		Vector span = local-tp.pos;
+		if(dot(span, span)<=limit*limit)
 		{
-			sn.position = Vector(position.x+tp.pos.x*c-tp.pos.y*s, position.y+tp.pos.y*c+tp.pos.x*s, position.z+tp.pos.z);
+			sn.position = position+rotated_vector(tp.pos, rotation);
 			sn.rotation = tp.dir+rotation;
 			return true;
 		}
@@ -346,23 +238,90 @@ SnapType Track::get_default_snap_type_to(const Object &other) const
 	return NO_SNAP;
 }
 
-bool Track::collide_ray(const Vector &start, const Vector &ray) const
+unsigned Track::get_n_link_slots() const
+{
+	return links.size();
+}
+
+Track *Track::get_link(unsigned i) const
+{
+	if(i>=links.size())
+		throw out_of_range("Track::get_link");
+
+	return links[i];
+}
+
+int Track::get_link_slot(const Object &other) const
 {
-	Vector local_start(start.x-position.x, start.y-position.y, start.z-position.z);
-	float c = cos(rotation);
-	float s = sin(rotation);
-	local_start = Vector(c*local_start.x+s*local_start.y, c*local_start.y-s*local_start.x, local_start.z);
-	Vector local_ray(c*ray.x+s*ray.y, c*ray.y-s*ray.x, ray.z);
+	for(unsigned i=0; i<links.size(); ++i)
+		if(links[i]==&other)
+			return i;
+
+	return -1;
+}
 
-	float width = layout.get_catalogue().get_ballast_profile().get_width();
+bool Track::link_to(Object &other)
+{
+	Track *otrack = dynamic_cast<Track *>(&other);
+	if(!otrack)
+		return false;
+
+	float limit = layout.get_catalogue().get_gauge();
+	if(!flex && !otrack->get_flex())
+		limit /= 10;
+	limit *= limit;
+
+	unsigned nsn = get_n_snap_nodes();
+	unsigned other_nsn = other.get_n_snap_nodes();
+	for(unsigned i=0; i<nsn; ++i)
+	{
+		Snap sn = get_snap_node(i);
+		for(unsigned j=0; j<other_nsn; ++j)
+		{
+			Snap osn = other.get_snap_node(j);
+			Vector span = osn.position-sn.position;
+			Angle da = wrap_balanced(osn.rotation-sn.rotation-Angle::half_turn());
+
+			if(dot(span, span)<limit && abs(da).radians()<0.01)
+			{
+				break_link(i);
+				links[i] = otrack;
+				otrack->links[j] = this;
+				check_slope();
+				layout.create_blocks(*this);
+
+				signal_link_changed.emit(i, otrack);
+				otrack->signal_link_changed.emit(j, this);
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+bool Track::break_link(unsigned i)
+{
+	if(i>=links.size())
+		throw out_of_range("Track::break_link");
+
+	Track *other = links[i];
+	if(!other)
+		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);
+	signal_link_changed.emit(i, 0);
 
-	return type.collide_ray(local_start, local_ray, width);
+	return true;
 }
 
 void Track::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("position"), position.x, position.y, position.z));
-	st.push_back((DataFile::Statement("rotation"), rotation));
+	st.push_back((DataFile::Statement("rotation"), rotation.radians()));
 	st.push_back((DataFile::Statement("slope"), slope));
 	if(turnout_id)
 		st.push_back((DataFile::Statement("turnout_id"), turnout_id));
@@ -404,7 +363,7 @@ void Track::Loader::position(float x, float y, float z)
 
 void Track::Loader::rotation(float r)
 {
-	obj.rotation = r;
+	obj.rotation = Angle::from_radians(r);
 }
 
 void Track::Loader::sensor_id(unsigned id)