X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrack.cpp;h=73674ee8c39f340cf7665e153ff3908544a33b29;hb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;hp=230b268fc22576bb3fdea0dbcb7c03c94ac1b515;hpb=52cbe8d99669f843f8f75c51128e2748584dd03a;p=r2c2.git

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 230b268..73674ee 100644
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #include <cmath>
 #include "track.h"
 #include "tracktype.h"
@@ -5,8 +12,6 @@
 using namespace std;
 using namespace Msp;
 
-#include <iostream>
-
 namespace Marklin {
 
 Track::Track(const TrackType &t):
@@ -50,6 +55,34 @@ void Track::set_flex(bool f)
 	flex=f;
 }
 
+void Track::check_slope()
+{
+	if(links.size()!=2)
+		return;
+
+	if(links[0] && links[1])
+	{
+		Point epp0=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
+		Point epp1=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
+		pos.z=epp0.z;
+		slope=epp1.z-pos.z;
+	}
+	else
+	{
+		slope=0;
+		if(links[0])
+		{
+			Point epp=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
+			pos.z=epp.z;
+		}
+		else if(links[1])
+		{
+			Point epp=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
+			pos.z=epp.z;
+		}
+	}
+}
+
 void Track::set_turnout_id(unsigned i)
 {
 	turnout_id=i;
@@ -80,7 +113,7 @@ Point Track::get_endpoint_position(unsigned epi) const
 	float c=cos(rot);
 	float s=sin(rot);
 
-	Point p(pos.x+c*ep.x-s*ep.y, pos.y+s*ep.x+c*ep.y, pos.z);
+	Point p(pos.x+c*ep.pos.x-s*ep.pos.y, pos.y+s*ep.pos.x+c*ep.pos.y, pos.z);
 	if(eps.size()==2 && epi==1)
 		p.z+=slope;
 	return p;
@@ -118,7 +151,7 @@ bool Track::snap_to(Track &other, bool link)
 			if(dx*dx+dy*dy<limit)
 			{
 				set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
-				set_position(Point(epp2.x-(eps[i].x*cos(rot)-eps[i].y*sin(rot)), epp2.y-(eps[i].y*cos(rot)+eps[i].x*sin(rot)), epp2.z));
+				set_position(Point(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(link)
 				{
@@ -185,34 +218,6 @@ Track *Track::get_link(unsigned i) const
 	return links[i];
 }
 
-void Track::check_slope()
-{
-	if(links.size()!=2)
-		return;
-
-	if(links[0] && links[1])
-	{
-		Point epp0=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
-		Point epp1=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
-		pos.z=epp0.z;
-		slope=epp1.z-pos.z;
-	}
-	else
-	{
-		slope=0;
-		if(links[0])
-		{
-			Point epp=links[0]->get_endpoint_position(links[0]->get_endpoint_by_link(*this));
-			pos.z=epp.z;
-		}
-		else if(links[1])
-		{
-			Point epp=links[1]->get_endpoint_position(links[1]->get_endpoint_by_link(*this));
-			pos.z=epp.z;
-		}
-	}
-}
-
 int Track::traverse(unsigned i, unsigned route) const
 {
 	const vector<Endpoint> &eps=type.get_endpoints();
@@ -239,6 +244,68 @@ int Track::traverse(unsigned i, unsigned route) const
 	return -1;
 }
 
+Point Track::get_point(unsigned epi, unsigned route, float d) const
+{
+	const vector<Endpoint> &eps=type.get_endpoints();
+	if(epi>=eps.size())
+		throw InvalidParameterValue("Endpoint index out of range");
+
+	float x=eps[epi].pos.x;
+	float y=eps[epi].pos.y;
+
+	const vector<TrackPart> &parts=type.get_parts();
+	const TrackPart *last_part=0;
+	while(1)
+	{
+		for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+		{
+			if((eps[epi].routes&(1<<route)) && i->route!=route)
+				continue;
+			if(&*i==last_part)
+				continue;
+
+			vector<Endpoint> part_eps;
+			i->collect_endpoints(part_eps);
+			for(unsigned j=0; j<part_eps.size(); ++j)
+			{
+				float dx=part_eps[j].pos.x-x;
+				float dy=part_eps[j].pos.y-y;
+				if(dx*dx+dy*dy<1e-6)
+				{
+					float plen=i->length;
+					if(i->radius)
+						plen*=abs(i->radius);
+					if(d<plen)
+					{
+						if(j==1)
+							d=plen-d;
+						Point p=i->get_point(d);
+						float c=cos(rot);
+						float s=sin(rot);
+						return Point(pos.x+c*p.x-s*p.y, pos.y+c*p.y+s*p.x);
+					}
+					else if(part_eps.size()>1)
+					{
+						d-=plen;
+						x=part_eps[1-j].pos.x;
+						y=part_eps[1-j].pos.y;
+						last_part=&*i;
+						i=parts.begin();
+						break;
+					}
+					else
+						return pos;
+				}
+			}
+		}
+
+		if(!last_part)
+			throw Exception("Internal error (Endpoint does not match any part)");
+		else
+			return pos;
+	}
+}
+
 Track *Track::copy() const
 {
 	Track *trk=new Track(type);
@@ -250,24 +317,34 @@ Track *Track::copy() const
 	return trk;
 }
 
-/*******************
-** Track::Loader
-*/
+void Track::save(list<DataFile::Statement> &st) const
+{
+	st.push_back((DataFile::Statement("position"), pos.x, pos.y, pos.z));
+	st.push_back((DataFile::Statement("rotation"), rot));
+	st.push_back((DataFile::Statement("slope"), slope));
+	if(turnout_id)
+		st.push_back((DataFile::Statement("turnout_id"), turnout_id));
+	if(sensor_id)
+		st.push_back((DataFile::Statement("sensor_id"), sensor_id));
+	if(flex)
+		st.push_back((DataFile::Statement("flex"), true));
+}
+
 
 Track::Loader::Loader(Track &t):
-	track(t)
+	DataFile::BasicLoader<Track>(t)
 {
-	add("position",    &Loader::position);
-	add("rotation",    &Track::rot);
-	add("slope",       &Track::slope);
-	add("turnout_id",  &Track::turnout_id);
-	add("sensor_id",   &Track::sensor_id);
-	add("flex",        &Track::flex);
+	add("position",   &Loader::position);
+	add("rotation",   &Track::rot);
+	add("slope",      &Track::slope);
+	add("turnout_id", &Track::turnout_id);
+	add("sensor_id",  &Track::sensor_id);
+	add("flex",       &Track::flex);
 }
 
 void Track::Loader::position(float x, float y, float z)
 {
-	track.pos=Point(x, y, z);
+	obj.pos=Point(x, y, z);
 }
 
 } // namespace Marklin