if(dx*dx+dy*dy<limit)
{
set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
- set_position(Point(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)), epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)), epp2.z));
+ Point p(epp2.x-(eps[i].pos.x*cos(rot)-eps[i].pos.y*sin(rot)),
+ epp2.y-(eps[i].pos.y*cos(rot)+eps[i].pos.x*sin(rot)),
+ epp2.z);
+ if(eps.size()==2 && i==1)
+ p.z -= slope;
+ set_position(p);
if(link)
{
return links[i];
}
-int Track::traverse(unsigned i, unsigned route) const
+int Track::traverse(unsigned i, unsigned path) const
{
const vector<Endpoint> &eps = type.get_endpoints();
if(i>=eps.size())
const Endpoint &ep = eps[i];
- if(ep.routes&(1<<route))
+ if(ep.paths&(1<<path))
{
- // Find the other endpoint for this route
+ // Find the other endpoint for this path
for(unsigned j=0; j<eps.size(); ++j)
- if((eps[j].routes&(1<<route)) && j!=i)
+ if((eps[j].paths&(1<<path)) && j!=i)
return j;
}
else
{
- // Find an endpoint that's connected to this one and has the requested route
+ // Find an endpoint that's connected to this one and has the requested path
for(unsigned j=0; j<eps.size(); ++j)
- if((eps[j].routes&(1<<route)) && (eps[j].routes&ep.routes))
+ if((eps[j].paths&(1<<path)) && (eps[j].paths&ep.paths))
return j;
}
return -1;
}
-Point Track::get_point(unsigned epi, unsigned route, float d) const
+Point Track::get_point(unsigned epi, unsigned path, float d) const
{
const vector<Endpoint> &eps = type.get_endpoints();
if(epi>=eps.size())
{
for(vector<TrackPart>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
{
- if((eps[epi].routes&(1<<route)) && i->route!=route)
+ if((eps[epi].paths&(1<<path)) && i->path!=path)
continue;
if(&*i==last_part)
continue;