X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicle.cpp;h=0316887fded747e90e2d62fa07afa3fd287de499;hb=18c529dfdd34e07f4f6021151ddce29fa85437bc;hp=96ad879fbc0c2d300ad1ae19cb6f10e2f2bb050e;hpb=bc9e941447da48905295192289bc09483a678180;p=r2c2.git diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp index 96ad879..0316887 100644 --- a/source/libr2c2/vehicle.cpp +++ b/source/libr2c2/vehicle.cpp @@ -19,6 +19,7 @@ Vehicle::Vehicle(Layout &l, const VehicleType &t): train(0), next(0), prev(0), + placement(type), front_sensor(0), back_sensor(0) { @@ -65,7 +66,7 @@ void Vehicle::attach_back(Vehicle &veh) next = &veh; veh.prev = this; - if(track) + if(is_placed()) propagate_backward(); } @@ -77,7 +78,7 @@ void Vehicle::attach_front(Vehicle &veh) prev = &veh; veh.next = this; - if(prev->get_track()) + if(prev->is_placed()) prev->propagate_backward(); } @@ -99,32 +100,23 @@ void Vehicle::detach_front() prev = 0; } -void Vehicle::place(const TrackIter &t, float o, PlaceMode m) +void Vehicle::place(const TrackOffsetIter &t, VehiclePlacement::Anchor a) { if(!t) throw invalid_argument("Vehicle::place"); - track = TrackOffsetIter(t, o); + placement.place(t, a); - if(m==FRONT_AXLE) - track = track.advance(-type.get_front_axle_offset()); - else if(m==FRONT_BUFFER) - track = track.advance(-type.get_length()/2); - else if(m==BACK_AXLE) - track = track.advance(-type.get_back_axle_offset()); - else if(m==BACK_BUFFER) - track = track.advance(type.get_length()/2); - - update_position(); + update_position(0); propagate_position(); } void Vehicle::unplace() { - if(!track) + if(!placement.is_placed()) return; - track = TrackOffsetIter(); + placement.unplace(); if(prev) prev->unplace(); @@ -134,9 +126,9 @@ void Vehicle::unplace() void Vehicle::advance(float d) { - track = track.advance(d); - update_position(); + placement.advance(d); turn_axles(d); + update_position(d<0 ? -1 : 1); propagate_position(); } @@ -177,47 +169,28 @@ const Vehicle::Rod &Vehicle::get_rod(unsigned i) const return rods[i]; } -void Vehicle::update_position() +void Vehicle::update_position(int sign) { - OrientedPoint p; + OrientedPoint p = placement.get_point(); + position = p.position; + position.z += layout.get_catalogue().get_rail_elevation(); + rotation = p.rotation; + tilt = p.tilt; - if(fixed_axles.size()>=2) - { - float wheelbase = fixed_axles.front()->type->position-fixed_axles.back()->type->position; - p = get_point(track, wheelbase, -fixed_axles.back()->type->position/wheelbase); - } - else if(bogies.size()>=2) + if(bogies.size()>=2) { - TrackOffsetIter front = track.advance(bogies.front().type->position); - TrackOffsetIter back = track.advance(bogies.back().type->position); - float bogie_spacing = bogies.front().type->position-bogies.back().type->position; - adjust_for_distance(front, back, bogie_spacing); - - const vector &front_axles = bogies.front().axles; - float wheelbase = front_axles.front()->type->position-front_axles.back()->type->position; - OrientedPoint front_point = get_point(front, wheelbase, -front_axles.back()->type->position/wheelbase); - - const vector &back_axles = bogies.back().axles; - wheelbase = back_axles.front()->type->position-back_axles.back()->type->position; - OrientedPoint back_point = get_point(back, wheelbase, -back_axles.back()->type->position/wheelbase); - - p = get_point(front_point.position, back_point.position, -bogies.back().type->position/bogie_spacing); - + OrientedPoint front_point = placement.get_bogie_point(bogies.front().type->index); bogies.front().direction = front_point.rotation-p.rotation; + + OrientedPoint back_point = placement.get_bogie_point(bogies.back().type->index); bogies.back().direction = back_point.rotation-p.rotation; } - else - p = track.point(); if(!prev) - check_sensor(type.get_front_axle_offset(), front_sensor); + check_sensor(placement.get_position(VehiclePlacement::FRONT_AXLE), front_sensor, sign<0); if(!next) - check_sensor(type.get_back_axle_offset(), back_sensor); + check_sensor(placement.get_position(VehiclePlacement::BACK_AXLE), back_sensor, sign>0); - position = p.position; - position.z += layout.get_catalogue().get_rail_elevation(); - rotation = p.rotation; - tilt = p.tilt; signal_moved.emit(); } @@ -229,17 +202,21 @@ void Vehicle::update_position_from(const Vehicle &veh) float margin = layout.get_catalogue().get_scale(); float dist = distance(veh.position, position); - if(!track || disttdist+margin) + if(!is_placed() || disttdist+margin) { - track = veh.track.advance(sign*tdist); - update_position(); + if(sign<0) + placement.place_after(veh.placement); + else + placement.place_before(veh.placement); + update_position(0); dist = distance(veh.position, position); } - track = track.advance(sign*(tdist-dist)); - update_position(); - turn_axles(sign*(tdist-dist)); + float d = sign*(tdist-dist); + placement.advance(d); + update_position(d<0 ? -1 : 1); + turn_axles(d); } void Vehicle::propagate_position() @@ -266,28 +243,17 @@ void Vehicle::propagate_backward() next->propagate_backward(); } -void Vehicle::check_sensor(float offset, unsigned &sensor) +void Vehicle::check_sensor(const TrackOffsetIter &t, unsigned &sensor, bool release) { - TrackOffsetIter iter = track.advance(offset); - unsigned s = iter->get_sensor_id(); + unsigned s = t->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->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. */ + if(release) layout.get_driver().set_sensor(old, false); + else + layout.get_driver().set_sensor(sensor, true); } } @@ -352,57 +318,6 @@ void Vehicle::update_rods() } } -void Vehicle::adjust_for_distance(TrackOffsetIter &front, TrackOffsetIter &back, float tdist, float ratio) const -{ - float margin = 0.01*layout.get_catalogue().get_scale(); - int adjust_dir = 0; - while(1) - { - Vector front_point = front.point().position; - Vector back_point = back.point().position; - - float dist = distance(front_point, back_point); - - float diff = tdist-dist; - if(diff<-margin && adjust_dir<=0) - { - diff -= margin; - adjust_dir = -1; - } - else if(diff>margin && adjust_dir>=0) - { - diff += margin; - adjust_dir = 1; - } - else - return; - - front = front.advance(diff*(1-ratio)); - back = back.advance(-diff*ratio); - } -} - -OrientedPoint Vehicle::get_point(const Vector &front, const Vector &back, float ratio) const -{ - Vector span = front-back; - - OrientedPoint p; - p.position = back+span*ratio; - p.rotation = Geometry::atan2(span.y, span.x); - p.tilt = Geometry::atan2(span.z, LinAl::Vector(span).norm()); - - return p; -} - -OrientedPoint Vehicle::get_point(const TrackOffsetIter &iter, float tdist, float ratio) const -{ - TrackOffsetIter front = iter.advance(tdist*(1-ratio)); - TrackOffsetIter back = iter.advance(-tdist*ratio); - - adjust_for_distance(front, back, tdist, ratio); - return get_point(front.point().position, back.point().position, ratio); -} - unsigned Vehicle::get_n_link_slots() const { return 2;