rot(0),
slope(0),
flex(false),
- turnout_id(0),
+ turnout_id(type.is_turnout() ? layout.allocate_turnout_id(type.is_double_address()) : 0),
sensor_id(0),
- links(t.get_endpoints().size()),
+ links(type.get_endpoints().size()),
active_path(0)
{
layout.add_track(*this);
turnout_id = i;
layout.create_blocks(*this);
+ layout.update_routes();
if(layout.has_driver() && turnout_id)
{
layout.get_driver().add_turnout(turnout_id);
throw InvalidParameterValue("Invalid path");
layout.get_driver().set_turnout(turnout_id, p&1);
- if(type.get_n_paths()>2)
+ if(type.is_double_address())
layout.get_driver().set_turnout(turnout_id+1, p&2);
+ else if(type.get_n_paths()>2)
+ active_path = (active_path&1) | (p&2);
}
int Track::get_endpoint_by_link(const Track &other) const
bool Track::snap_to(Track &other, bool link)
{
- float limit = (link && !flex) ? 1e-6 : 1e-4;
+ float limit = (link && !flex && !other.get_flex()) ? 1e-6 : 1e-4;
const vector<Endpoint> &eps = type.get_endpoints();
const vector<Endpoint> &other_eps = other.get_type().get_endpoints();
float dy = epp2.y-epp.y;
if(dx*dx+dy*dy<limit)
{
- set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
- 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 || (!flex && !other.get_flex()))
+ {
+ set_rotation(other.rot+other_eps[j].dir-eps[i].dir+M_PI);
+ 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)
{
throw Exception("Track endpoint did not have a counterpart");
}
+unsigned Track::traverse(unsigned i) const
+{
+ return traverse(i, active_path);
+}
+
TrackPoint Track::get_point(unsigned epi, unsigned path, float d) const
{
TrackPoint p = type.get_point(epi, path, d);
float c = cos(rot);
float s = sin(rot);
- p.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, 0);
+ p.pos = Point(pos.x+c*p.pos.x-s*p.pos.y, pos.y+s*p.pos.x+c*p.pos.y, pos.z);
p.dir += rot;
if(type.get_endpoints().size()==2)
{
float grade = slope/len;
if(epi==0)
{
- p.pos.z = pos.z+grade*d;
+ p.pos.z += grade*d;
p.grade = grade;
}
else
{
- p.pos.z = pos.z+slope-grade*d;
+ p.pos.z += slope-grade*d;
p.grade = -grade;
}
}