X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrackpart.cpp;h=943832fff413577dc77eabdef5d7d16840d61dbc;hb=39566dc89cdadf4f6e701a14b5d9049f22b591fb;hp=046b9276ac23025a34ac586ef2509d74ca2b1d7f;hpb=319f90fd59587efc1242c34f307abc29f323642b;p=r2c2.git

diff --git a/source/libmarklin/trackpart.cpp b/source/libmarklin/trackpart.cpp
index 046b927..943832f 100644
--- a/source/libmarklin/trackpart.cpp
+++ b/source/libmarklin/trackpart.cpp
@@ -28,8 +28,8 @@ void TrackPart::collect_endpoints(vector<Endpoint> &eps) const
 		;
 	else if(radius)
 	{
-		float a=((radius<0) ? -length : length);
-		Point p=get_point(length*abs(radius));
+		float a = ((radius<0) ? -length : length);
+		Point p = get_point(length*abs(radius));
 		eps.push_back(Endpoint(p.x, p.y, dir+a, 1<<route));
 	}
 	else
@@ -40,11 +40,11 @@ Point TrackPart::get_point(float d) const
 {
 	if(radius)
 	{
-		float a=d/radius;
-		float c=cos(a);
-		float s=sin(a);
-		float rx=radius*sin(dir);
-		float ry=-radius*cos(dir);
+		float a = d/radius;
+		float c = cos(a);
+		float s = sin(a);
+		float rx = radius*sin(dir);
+		float ry = -radius*cos(dir);
 		return Point(pos.x+c*rx-s*ry-rx, pos.y+c*ry+s*rx-ry);
 	}
 	else
@@ -53,7 +53,7 @@ Point TrackPart::get_point(float d) const
 
 
 TrackPart::Loader::Loader(TrackPart &p):
-	part(p)
+	Msp::DataFile::BasicLoader<TrackPart>(p)
 {
 	add("start",    &Loader::start);
 	add("length",   &TrackPart::length);
@@ -64,23 +64,23 @@ TrackPart::Loader::Loader(TrackPart &p):
 
 void TrackPart::Loader::finish()
 {
-	if(part.radius)
+	if(obj.radius)
 	{
-		part.length*=M_PI/180;
-		part.radius/=1000;
+		obj.length *= M_PI/180;
+		obj.radius /= 1000;
 	}
 	else
-		part.length/=1000;
+		obj.length /= 1000;
 
-	part.pos.x/=1000;
-	part.pos.y/=1000;
-	part.dir*=M_PI/180;
+	obj.pos.x /= 1000;
+	obj.pos.y /= 1000;
+	obj.dir *= M_PI/180;
 }
 
 void TrackPart::Loader::start(float x, float y, float d)
 {
-	part.pos=Point(x, y);
-	part.dir=d;
+	obj.pos = Point(x, y);
+	obj.dir = d;
 }
 
 } // namespace Marklin