X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrack.cpp;h=540c24743d05136f121816cba463a92c8f395c7f;hb=e75f12451201fb6540ad2155e8796c2b5aee8d4c;hp=0d4052ea999a83b6394bb79f7d03f9216604fc39;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/libr2c2/track.cpp b/source/libr2c2/track.cpp
index 0d4052e..540c247 100644
--- a/source/libr2c2/track.cpp
+++ b/source/libr2c2/track.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <cmath>
 #include "block.h"
 #include "catalogue.h"
@@ -50,9 +43,9 @@ Track::~Track()
 void Track::set_block(Block *b)
 {
 	if(b && !b->has_track(*this))
-		throw InvalidParameterValue("Track is not in the Block");
+		throw logic_error("track not in block");
 	if(!b && block && block->has_track(*this))
-		throw InvalidState("Track is still in a Block");
+		throw logic_error("track still in block");
 
 	block = b;
 }
@@ -60,7 +53,7 @@ void Track::set_block(Block *b)
 Block &Track::get_block() const
 {
 	if(!block)
-		throw InvalidState("No Block");
+		throw logic_error("!block");
 
 	return *block;
 }
@@ -123,7 +116,7 @@ void Track::check_slope()
 void Track::set_turnout_id(unsigned i)
 {
 	if(!type.is_turnout())
-		throw InvalidState("Not a turnout");
+		throw logic_error("not a turnout");
 
 	turnout_id = i;
 	layout.create_blocks(*this);
@@ -135,7 +128,7 @@ void Track::set_turnout_id(unsigned i)
 void Track::set_sensor_id(unsigned i)
 {
 	if(type.is_turnout())
-		throw InvalidState("Can't set sensor on a turnout");
+		throw logic_error("is a turnout");
 
 	sensor_id = i;
 	layout.create_blocks(*this);
@@ -146,9 +139,9 @@ void Track::set_sensor_id(unsigned i)
 void Track::set_active_path(unsigned p)
 {
 	if(!turnout_id)
-		throw InvalidState("Not a turnout");
+		throw logic_error("not a turnout");
 	if(!(type.get_paths()&(1<<p)))
-		throw InvalidParameterValue("Invalid path");
+		throw invalid_argument("Track::set_active_path");
 
 	layout.get_driver().set_turnout(turnout_id, p);
 }
@@ -166,7 +159,7 @@ Vector Track::get_endpoint_position(unsigned epi) const
 {
 	const vector<TrackType::Endpoint> &eps = type.get_endpoints();
 	if(epi>=eps.size())
-		throw InvalidParameterValue("TrackType::Endpoint index out of range");
+		throw out_of_range("Track::get_endpoint_position");
 
 	const TrackType::Endpoint &ep = eps[epi];
 
@@ -183,7 +176,7 @@ float Track::get_endpoint_direction(unsigned epi) const
 {
 	const vector<TrackType::Endpoint> &eps = type.get_endpoints();
 	if(epi>=eps.size())
-		throw InvalidParameterValue("TrackType::Endpoint index out of range");
+		throw out_of_range("Track::get_endpoint_direction");
 
 	const TrackType::Endpoint &ep = eps[epi];
 
@@ -295,8 +288,8 @@ void Track::break_links()
 
 Track *Track::get_link(unsigned i) const
 {
-	if(i>links.size())
-		throw InvalidParameterValue("Link index out of range");
+	if(i>=links.size())
+		throw out_of_range("Track::get_link");
 
 	return links[i];
 }
@@ -333,6 +326,32 @@ TrackPoint Track::get_point(unsigned epi, float d) const
 	return get_point(epi, active_path, d);
 }
 
+TrackPoint Track::get_nearest_point(const Vector &p) const
+{
+	Vector local(p.x-pos.x, p.y-pos.y, p.z-pos.z);
+	float c = cos(rot);
+	float s = sin(rot);
+	local = Vector(c*local.x+s*local.y, c*local.y-s*local.x, local.z);
+
+	TrackPoint tp = type.get_nearest_point(local);
+	tp.pos = Vector(pos.x+tp.pos.x*c-tp.pos.y*s, pos.y+tp.pos.y*c+tp.pos.x*s, pos.z+tp.pos.z);
+	tp.dir += rot;
+	return tp;
+}
+
+bool Track::collide_ray(const Vector &start, const Vector &ray)
+{
+	Vector local_start(start.x-pos.x, start.y-pos.y, start.z-pos.z);
+	float c = cos(rot);
+	float s = sin(rot);
+	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);
+
+	float width = layout.get_catalogue().get_ballast_profile().get_width();
+
+	return type.collide_ray(local_start, local_ray, width);
+}
+
 void Track::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("position"), pos.x, pos.y, pos.z));
@@ -360,7 +379,7 @@ void Track::turnout_event(unsigned addr, unsigned state)
 
 
 Track::Loader::Loader(Track &t):
-	DataFile::BasicLoader<Track>(t)
+	DataFile::ObjectLoader<Track>(t)
 {
 	add("position",   &Loader::position);
 	add("rotation",   &Track::rot);