X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fvehicle.cpp;h=b54b531e0de2964e9fe1fb87590d4d3835ed4da7;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=109c3f420d91621a44f427b70fae241669dfce71;hpb=378f04522aa762729c0d5651fb60ad7e4d8ba9f3;p=r2c2.git diff --git a/source/libmarklin/vehicle.cpp b/source/libmarklin/vehicle.cpp index 109c3f4..b54b531 100644 --- a/source/libmarklin/vehicle.cpp +++ b/source/libmarklin/vehicle.cpp @@ -7,8 +7,10 @@ Distributed under the GPL #include #include "catalogue.h" +#include "driver.h" #include "layout.h" #include "track.h" +#include "trackiter.h" #include "tracktype.h" #include "vehicle.h" #include "vehicletype.h" @@ -24,7 +26,9 @@ Vehicle::Vehicle(Layout &l, const VehicleType &t): next(0), prev(0), direction(0), - bogie_dirs(type.get_bogies().size()) + bogie_dirs(type.get_bogies().size()), + front_sensor(0), + back_sensor(0) { layout.add_vehicle(*this); } @@ -45,6 +49,9 @@ void Vehicle::attach_back(Vehicle &veh) next = &veh; veh.prev = this; + + if(track_pos.track) + propagate_backward(); } void Vehicle::attach_front(Vehicle &veh) @@ -52,8 +59,11 @@ void Vehicle::attach_front(Vehicle &veh) if(prev || veh.next) throw InvalidState("Already attached"); - next = &veh; - veh.prev = this; + prev = &veh; + veh.next = this; + + if(prev->get_track()) + prev->propagate_backward(); } void Vehicle::detach_back() @@ -74,36 +84,16 @@ void Vehicle::detach_front() prev = 0; } -void Vehicle::place(Track *t, unsigned e, float o, PlaceMode m) +void Vehicle::place(Track &t, unsigned e, float o, PlaceMode m) { - track_pos = TrackPosition(t, e, o); + track_pos = TrackPosition(&t, e, o); if(m==FRONT_AXLE) - { - float front = type.get_length()/2; - if(!type.get_axles().empty()) - front = type.get_axles().front().position; - if(!type.get_bogies().empty()) - { - const VehicleType::Bogie &bogie = type.get_bogies().front(); - front = max(front, bogie.position+bogie.axles.front().position); - } - track_pos.advance(-front); - } + track_pos.advance(-type.get_front_axle_offset()); else if(m==FRONT_BUFFER) track_pos.advance(-type.get_length()/2); else if(m==BACK_AXLE) - { - float back = type.get_length()/2; - if(!type.get_axles().empty()) - back = type.get_axles().back().position; - if(!type.get_bogies().empty()) - { - const VehicleType::Bogie &bogie = type.get_bogies().back(); - back = min(back, bogie.position+bogie.axles.back().position); - } - track_pos.advance(-back); - } + track_pos.advance(-type.get_back_axle_offset()); else if(m==BACK_BUFFER) track_pos.advance(type.get_length()/2); @@ -111,6 +101,19 @@ void Vehicle::place(Track *t, unsigned e, float o, PlaceMode m) propagate_position(); } +void Vehicle::unplace() +{ + if(!track_pos.track) + return; + + track_pos = TrackPosition(); + + if(prev) + prev->unplace(); + if(next) + next->unplace(); +} + void Vehicle::advance(float d) { track_pos.advance(d); @@ -130,41 +133,44 @@ void Vehicle::update_position() TrackPoint tp; const vector &axles = type.get_axles(); + const vector &bogies = type.get_bogies(); if(axles.size()>=2) { float wheelbase = axles.front().position-axles.back().position; tp = get_point(track_pos, wheelbase, -axles.back().position/wheelbase); } - else + else if(bogies.size()>=2) { - const vector &bogies = type.get_bogies(); - if(bogies.size()>=2) - { - TrackPosition front = track_pos; - front.advance(bogies.front().position); - TrackPosition back = track_pos; - back.advance(bogies.back().position); - float bogie_spacing = bogies.front().position-bogies.back().position; - adjust_for_distance(front, back, bogie_spacing); + TrackPosition front = track_pos; + front.advance(bogies.front().position); + TrackPosition back = track_pos; + back.advance(bogies.back().position); + float bogie_spacing = bogies.front().position-bogies.back().position; + adjust_for_distance(front, back, bogie_spacing); - const vector &front_axles = bogies.front().axles; - float wheelbase = front_axles.front().position-front_axles.back().position; - TrackPoint front_point = get_point(front, wheelbase, -front_axles.back().position/wheelbase); + const vector &front_axles = bogies.front().axles; + float wheelbase = front_axles.front().position-front_axles.back().position; + TrackPoint front_point = get_point(front, wheelbase, -front_axles.back().position/wheelbase); - const vector &back_axles = bogies.back().axles; - wheelbase = back_axles.front().position-back_axles.back().position; - TrackPoint back_point = get_point(back, wheelbase, -back_axles.back().position/wheelbase); + const vector &back_axles = bogies.back().axles; + wheelbase = back_axles.front().position-back_axles.back().position; + TrackPoint back_point = get_point(back, wheelbase, -back_axles.back().position/wheelbase); - tp = get_point(front_point.pos, back_point.pos, -bogies.back().position/bogie_spacing); + tp = get_point(front_point.pos, back_point.pos, -bogies.back().position/bogie_spacing); - bogie_dirs.front() = front_point.dir-tp.dir; - bogie_dirs.back() = back_point.dir-tp.dir; - } - else - tp = track_pos.get_point(); + bogie_dirs.front() = front_point.dir-tp.dir; + bogie_dirs.back() = back_point.dir-tp.dir; } + else + tp = track_pos.get_point(); + + if(!prev) + check_sensor(type.get_front_axle_offset(), front_sensor); + if(!next) + check_sensor(type.get_back_axle_offset(), back_sensor); position = tp.pos; + position.z += layout.get_catalogue().get_rail_elevation(); direction = tp.dir; } @@ -213,6 +219,32 @@ void Vehicle::propagate_backward() next->propagate_backward(); } +void Vehicle::check_sensor(float offset, unsigned &sensor) +{ + TrackPosition pos = track_pos; + pos.advance(offset); + unsigned s = pos.track->get_sensor_id(); + if(s!=sensor) + { + /* Sensor ID under axle has changed. Deduce movement direction by using + the sensor ID under the midpoint of the vehicle. */ + /* XXX This depends on the simulation running fast enough. Something + more robust would be preferable. */ + unsigned old = sensor; + sensor = s; + unsigned mid = track_pos.track->get_sensor_id(); + + if(s && s!=mid) + /* There's a sensor and it's different from mid. We've just entered + that sensor. */ + layout.get_driver().set_sensor(sensor, true); + if(old && old!=mid) + /* A sensor was under the axle and it was different from mid. We've + just left that sensor. */ + layout.get_driver().set_sensor(old, false); + } +} + void Vehicle::adjust_for_distance(TrackPosition &front, TrackPosition &back, float tdist, float ratio) const { float margin = 0.01*layout.get_catalogue().get_scale(); @@ -289,51 +321,36 @@ void Vehicle::TrackPosition::advance(float d) if(!track) return; - unsigned path = track->get_active_path(); - offs += d; - float path_len = track->get_type().get_path_length(path); - while(track && offs>=path_len) + TrackIter iter(track, ep); + while(iter) { - unsigned out = track->traverse(ep, path); - Track *next = track->get_link(out); + float path_len = iter->get_type().get_path_length(iter->get_active_path()); - if(next) + if(offs>path_len) { - ep = next->get_endpoint_by_link(*track); - track = next; - offs -= path_len; - path = track->get_active_path(); - path_len = track->get_type().get_path_length(path); + iter = iter.next(); } else - track = 0; + break; } - while(track && offs<0) + while(iter && offs<0) { - Track *prev = track->get_link(ep); - if(prev) - { - unsigned in = prev->get_endpoint_by_link(*track); - track = prev; + iter = iter.flip().reverse(); - path = track->get_active_path(); - ep = track->traverse(in, path); - - path_len = track->get_type().get_path_length(path); + if(iter) + { + float path_len = iter->get_type().get_path_length(iter->get_active_path()); offs += path_len; } - else - track = 0; } + track = iter.track(); + ep = iter.entry(); if(!track) - { - ep = 0; offs = 0; - } } TrackPoint Vehicle::TrackPosition::get_point() const