rot(0),
slope(0),
flex(false),
- turnout_id(0),
+ turnout_id(type.is_turnout() ? layout.allocate_turnout_id() : 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);
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)
{