X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=697e67843080ec68fba6898e3ad3eae81d3d60d4;hb=107a7f787d406f1f664c4986557f9a896e0845ea;hp=71c570cee86ccd251d6269c080b1c619bac18054;hpb=b261812f040caed52bc3de783e8bcb86b222a9ed;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 71c570c..697e678 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -69,9 +69,7 @@ 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();
+	propagate_slope();
 }
 
 void Track::set_rotation(const Angle &r)
@@ -79,12 +77,14 @@ void Track::set_rotation(const Angle &r)
 	rotation = wrap_positive(r);
 }
 
-void Track::set_slope(float s)
+void Track::set_tilt(const Angle &t)
 {
 	if(links.size()!=2)
 		return;
 
-	slope = s;
+	tilt = t;
+	slope = tan(tilt)*type.get_path_length(0);
+	propagate_slope();
 }
 
 void Track::set_flex(bool f)
@@ -92,6 +92,13 @@ void Track::set_flex(bool f)
 	flex = f;
 }
 
+void Track::propagate_slope()
+{
+	for(vector<Track *>::const_iterator i=links.begin(); i!=links.end(); ++i)
+		if(*i)
+			(*i)->check_slope();
+}
+
 void Track::check_slope()
 {
 	if(links.size()!=2)
@@ -103,6 +110,7 @@ void Track::check_slope()
 		Vector epp1 = links[1]->get_snap_node(links[1]->get_link_slot(*this)).position;
 		position.z = epp0.z;
 		slope = epp1.z-position.z;
+		tilt = Geometry::atan(slope/type.get_path_length(0));
 	}
 	else
 	{
@@ -164,8 +172,7 @@ TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
 	p.dir += rotation;
 	if(type.get_endpoints().size()==2)
 	{
-		float len = type.get_path_length(path);
-		float grade = slope/len;
+		float grade = tan(tilt);
 		if(epi==0)
 		{
 			p.pos.z += grade*d;
@@ -323,7 +330,7 @@ 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.radians()));
-	st.push_back((DataFile::Statement("slope"), slope));
+	st.push_back((DataFile::Statement("tilt"), tilt.radians()));
 	if(turnout_id)
 		st.push_back((DataFile::Statement("turnout_id"), turnout_id));
 	if(sensor_id)
@@ -351,10 +358,13 @@ Track::Loader::Loader(Track &t):
 {
 	add("position",   &Loader::position);
 	add("rotation",   &Loader::rotation);
-	add("slope",      &Track::slope);
+	add("tilt",       &Loader::tilt);
 	add("turnout_id", &Loader::turnout_id);
 	add("sensor_id",  &Loader::sensor_id);
 	add("flex",       &Track::flex);
+
+	// deprecated
+	add("slope",      &Loader::slope);
 }
 
 void Track::Loader::position(float x, float y, float z)
@@ -372,6 +382,20 @@ void Track::Loader::sensor_id(unsigned id)
 	obj.set_sensor_id(id);
 }
 
+void Track::Loader::slope(float s)
+{
+	tilt(atan(s/obj.type.get_path_length(0)));
+}
+
+void Track::Loader::tilt(float t)
+{
+	if(obj.links.size()!=2)
+		return;
+
+	obj.tilt = Angle::from_radians(t);
+	obj.slope = tan(t)*obj.type.get_path_length(0);
+}
+
 void Track::Loader::turnout_id(unsigned id)
 {
 	obj.set_turnout_id(id);