X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftracktype.cpp;h=fe3a54cd824d7471cb78c95b47b8ba9ceb33e8df;hb=57e0944ee8ed442e2d0aa7c9964cac00450af5e7;hp=c7a6aef7ba70fa85bac12a2ac2c1ff1738cc6a6e;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git

diff --git a/source/libr2c2/tracktype.cpp b/source/libr2c2/tracktype.cpp
index c7a6aef..fe3a54c 100644
--- a/source/libr2c2/tracktype.cpp
+++ b/source/libr2c2/tracktype.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#include <msp/geometry/union.h>
 #include "tracktype.h"
 
 using namespace std;
@@ -7,7 +8,7 @@ using namespace Msp;
 namespace R2C2 {
 
 TrackType::TrackType(const ArticleNumber &an):
-	art_nr(an),
+	ObjectType(an),
 	state_bits(0),
 	autofit_preference(1)
 { }
@@ -69,16 +70,15 @@ TrackPoint TrackType::get_point(unsigned epi, unsigned path, float d) const
 	unsigned part_ep = 0;
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
-		if((endpoints[epi].paths&(1<<path)) && i->get_path()!=path)
+		if(endpoints[epi].has_path(path) && i->get_path()!=path)
 			continue;
 
 		unsigned n_part_eps = (i->is_dead_end() ? 1 : 2);
 		for(unsigned j=0; j<n_part_eps; ++j)
 		{
 			TrackPoint p = i->get_point(j ? i->get_length() : 0);
-			float dx = p.pos.x-endpoints[epi].pos.x;
-			float dy = p.pos.y-endpoints[epi].pos.y;
-			if(dx*dx+dy*dy<1e-6)
+			Vector span = p.pos-endpoints[epi].pos;
+			if(dot(span, span)<1e-6)
 			{
 				part = &*i;
 				part_ep = j;
@@ -98,7 +98,7 @@ TrackPoint TrackType::get_point(unsigned epi, unsigned path, float d) const
 				d = plen-d;
 			TrackPoint p = part->get_point(d);
 			if(part_ep==1)
-				p.dir += M_PI;
+				p.dir += Angle::half_turn();
 			return p;
 		}
 		else
@@ -113,13 +113,23 @@ TrackPoint TrackType::get_point(unsigned epi, unsigned path, float d) const
 	}
 }
 
-bool TrackType::collide_ray(const Vector &start, const Vector &dir, float width) const
+TrackPoint TrackType::get_nearest_point(const Vector &p) const
 {
+	TrackPoint result;
+	float dist = -1;
+
 	for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
-		if(i->collide_ray(start, dir, width))
-			return true;
+	{
+		TrackPoint n = i->get_nearest_point(p);
+		float d = distance(n.pos, p);
+		if(d<dist || dist<0)
+		{
+			result = n;
+			dist = d;
+		}
+	}
 
-	return false;
+	return result;
 }
 
 void TrackType::collect_endpoints()
@@ -137,21 +147,16 @@ void TrackType::collect_endpoints()
 			{
 				TrackPoint p = i->get_point(j ? i->get_length() : 0);
 				if(j==0)
-					p.dir += M_PI;
+					p.dir += Angle::half_turn();
 
 				bool found = false;
 				for(vector<Endpoint>::iterator k=endpoints.begin(); k!=endpoints.end(); ++k)
 				{
-					float dx = k->pos.x-p.pos.x;
-					float dy = k->pos.y-p.pos.y;
+					Vector d = k->pos-p.pos;
 
-					float da = k->dir-p.dir;
-					while(da>M_PI)
-						da -= M_PI*2;
-					while(da<-M_PI)
-						da += M_PI*2;
+					Angle da = wrap_balanced(k->dir-p.dir);
 
-					if(dx*dx+dy*dy<1e-6 && da>-0.01 && da<0.01)
+					if(dot(d, d)<1e-6 && abs(da).radians()<0.01)
 					{
 						k->paths |= 1<<i->get_path();
 						found = true;
@@ -165,19 +170,18 @@ void TrackType::collect_endpoints()
 	}
 }
 
-TrackType::Endpoint::Endpoint(float x, float y, float d, unsigned p):
-	pos(x, y),
+TrackType::Endpoint::Endpoint(float x, float y, const Angle &d, unsigned p):
+	pos(x, y, 0),
 	dir(d),
 	paths(p)
 { }
 
 
 TrackType::Loader::Loader(TrackType &t):
-	Msp::DataFile::BasicLoader<TrackType>(t),
+	DataFile::DerivedObjectLoader<TrackType, ObjectType::Loader>(t),
 	state_bits_set(false)
 {
 	add("autofit_preference", &TrackType::autofit_preference);
-	add("description", &TrackType::description);
 	add("object",      &TrackType::object);
 	add("state_bits",  &Loader::state_bits);
 	add("part",        &Loader::part);
@@ -186,6 +190,13 @@ TrackType::Loader::Loader(TrackType &t):
 void TrackType::Loader::finish()
 {
 	obj.collect_endpoints();
+	vector<const Shape *> shapes;
+	for(vector<TrackPart>::iterator i=obj.parts.begin(); i!=obj.parts.end(); ++i)
+	{
+		i->create_shape();
+		shapes.push_back(&i->get_shape());
+	}
+	obj.shape = Geometry::Union<float, 3>::from_iterator_range(shapes.begin(), shapes.end()).clone();
 }
 
 void TrackType::Loader::part()