X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=26fb59e0fa7e756b619ad718d090dec6b6f05314;hb=f730acd5fa2b4f0d0185770ff7950ab814aec47c;hp=c92ff3779021783e82ef85f9683f1fa52984d4e2;hpb=c6cd59c4d40706ccd0f894fee3dc11c48dd20a38;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index c92ff37..26fb59e 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#include <msp/core/maputils.h>
 #include "block.h"
 #include "catalogue.h"
 #include "driver.h"
@@ -26,7 +27,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 +38,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,22 +70,25 @@ 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();
+	signal_moved.emit();
+	propagate_slope();
 }
 
 void Track::set_rotation(const Angle &r)
 {
 	rotation = wrap_positive(r);
+	signal_moved.emit();
 }
 
-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);
+	signal_moved.emit();
+	propagate_slope();
 }
 
 void Track::set_flex(bool f)
@@ -92,6 +96,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 +114,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
 	{
@@ -117,12 +129,16 @@ void Track::check_slope()
 			position.z = epp.z-slope;
 		}
 	}
+
+	signal_moved.emit();
 }
 
 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);
@@ -149,6 +165,7 @@ void Track::set_active_path(unsigned p)
 	if(!(type.get_paths()&(1<<p)))
 		throw invalid_argument("Track::set_active_path");
 
+	signal_path_changing(p);
 	path_changing = true;
 	layout.get_driver().set_turnout(turnout_id, p);
 }
@@ -161,8 +178,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;
@@ -316,22 +332,26 @@ bool Track::break_link(unsigned i)
 	return true;
 }
 
-bool Track::collide_ray(const Vector &start, const Vector &ray) const
+void Track::add_attachment(TrackAttachment &a)
 {
-	Transform trans = Transform::rotation(-rotation, Vector(0, 0, 1));
-	Vector local_start = trans.transform(start-position);
-	Vector local_ray = trans.transform(ray);
-
-	float width = layout.get_catalogue().get_ballast_profile().get_width();
+	if(find(attachments.begin(), attachments.end(), &a)!=attachments.end())
+		throw key_error(&a);
+	attachments.push_back(&a);
+}
 
-	return type.collide_ray(local_start, local_ray, width);
+void Track::remove_attachment(TrackAttachment &a)
+{
+	AttachmentList::iterator i = find(attachments.begin(), attachments.end(), &a);
+	if(i==attachments.end())
+		throw key_error(&a);
+	attachments.erase(i);
 }
 
 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)
@@ -359,20 +379,23 @@ 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)
 {
-	obj.position = Vector(x, y, z);
+	obj.set_position(Vector(x, y, z));
 }
 
 void Track::Loader::rotation(float r)
 {
-	obj.rotation = Angle::from_radians(r);
+	obj.set_rotation(Angle::from_radians(r));
 }
 
 void Track::Loader::sensor_id(unsigned id)
@@ -380,6 +403,16 @@ void Track::Loader::sensor_id(unsigned id)
 	obj.set_sensor_id(id);
 }
 
+void Track::Loader::slope(float s)
+{
+	obj.set_tilt(Geometry::atan(s/obj.type.get_path_length(0)));
+}
+
+void Track::Loader::tilt(float t)
+{
+	obj.set_tilt(Angle::from_radians(t));
+}
+
 void Track::Loader::turnout_id(unsigned id)
 {
 	obj.set_turnout_id(id);