X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fvehicle.cpp;h=0316887fded747e90e2d62fa07afa3fd287de499;hb=18c529dfdd34e07f4f6021151ddce29fa85437bc;hp=1c4a5b0f441ec9d5e6b40f711cc54afd176cbf08;hpb=54392d65e2053d1eacb4cfcc435f1013993f2973;p=r2c2.git diff --git a/source/libr2c2/vehicle.cpp b/source/libr2c2/vehicle.cpp index 1c4a5b0..0316887 100644 --- a/source/libr2c2/vehicle.cpp +++ b/source/libr2c2/vehicle.cpp @@ -16,16 +16,24 @@ namespace R2C2 { Vehicle::Vehicle(Layout &l, const VehicleType &t): Object(l), type(t), + train(0), next(0), prev(0), + placement(type), front_sensor(0), back_sensor(0) { - axles.assign(type.get_fixed_axles().begin(), type.get_fixed_axles().end()); + axles.assign(type.get_axles().begin(), type.get_axles().end()); + for(vector::iterator i=axles.begin(); i!=axles.end(); ++i) + if(!i->type->bogie) + fixed_axles.push_back(&*i); bogies.assign(type.get_bogies().begin(), type.get_bogies().end()); rods.assign(type.get_rods().begin(), type.get_rods().end()); + for(vector::iterator i=bogies.begin(); i!=bogies.end(); ++i) + for(unsigned j=0; jaxles.size(); ++j) + i->axles[j] = &axles[i->type->first_axle+j]; - layout.add_vehicle(*this); + layout.add(*this); } Vehicle::~Vehicle() @@ -34,7 +42,7 @@ Vehicle::~Vehicle() detach_back(); if(prev) detach_front(); - layout.remove_vehicle(*this); + layout.remove(*this); } Vehicle *Vehicle::clone(Layout *to_layout) const @@ -45,6 +53,11 @@ Vehicle *Vehicle::clone(Layout *to_layout) const return veh; } +void Vehicle::set_train(Train *t) +{ + train = t; +} + void Vehicle::attach_back(Vehicle &veh) { if(next || veh.prev) @@ -53,7 +66,7 @@ void Vehicle::attach_back(Vehicle &veh) next = &veh; veh.prev = this; - if(track_pos.track) + if(is_placed()) propagate_backward(); } @@ -65,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(); } @@ -87,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_pos = TrackPosition(t, o); - - if(m==FRONT_AXLE) - 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) - track_pos.advance(-type.get_back_axle_offset()); - else if(m==BACK_BUFFER) - track_pos.advance(type.get_length()/2); + placement.place(t, a); - update_position(); + update_position(0); propagate_position(); } void Vehicle::unplace() { - if(!track_pos.track) + if(!placement.is_placed()) return; - track_pos = TrackPosition(); + placement.unplace(); if(prev) prev->unplace(); @@ -122,19 +126,26 @@ void Vehicle::unplace() void Vehicle::advance(float d) { - track_pos.advance(d); - update_position(); + placement.advance(d); turn_axles(d); + update_position(d<0 ? -1 : 1); propagate_position(); } -const Vehicle::Axle &Vehicle::get_fixed_axle(unsigned i) const +const Vehicle::Axle &Vehicle::get_axle(unsigned i) const { if(i>=axles.size()) - throw out_of_range("Vehicle::get_fixed_axle"); + throw out_of_range("Vehicle::get_axle"); return axles[i]; } +const Vehicle::Axle &Vehicle::get_fixed_axle(unsigned i) const +{ + if(i>=fixed_axles.size()) + throw out_of_range("Vehicle::get_fixed_axle"); + return *fixed_axles[i]; +} + const Vehicle::Bogie &Vehicle::get_bogie(unsigned i) const { if(i>=bogies.size()) @@ -148,7 +159,7 @@ const Vehicle::Axle &Vehicle::get_bogie_axle(unsigned i, unsigned j) const throw out_of_range("Vehicle::get_bogie_axle"); if(j>=bogies[i].axles.size()) throw out_of_range("Vehicle::get_bogie_axle"); - return bogies[i].axles[j]; + return *bogies[i].axles[j]; } const Vehicle::Rod &Vehicle::get_rod(unsigned i) const @@ -158,48 +169,29 @@ const Vehicle::Rod &Vehicle::get_rod(unsigned i) const return rods[i]; } -void Vehicle::update_position() +void Vehicle::update_position(int sign) { - TrackPoint tp; + OrientedPoint p = placement.get_point(); + position = p.position; + position.z += layout.get_catalogue().get_rail_elevation(); + rotation = p.rotation; + tilt = p.tilt; - if(axles.size()>=2) - { - float wheelbase = axles.front().type->position-axles.back().type->position; - tp = get_point(track_pos, wheelbase, -axles.back().type->position/wheelbase); - } - else if(bogies.size()>=2) + if(bogies.size()>=2) { - TrackPosition front = track_pos; - front.advance(bogies.front().type->position); - TrackPosition back = track_pos; - back.advance(bogies.back().type->position); - float bogie_spacing = bogies.front().type->position-bogies.back().type->position; - adjust_for_distance(front, back, bogie_spacing); + OrientedPoint front_point = placement.get_bogie_point(bogies.front().type->index); + bogies.front().direction = front_point.rotation-p.rotation; - const vector &front_axles = bogies.front().axles; - float wheelbase = front_axles.front().type->position-front_axles.back().type->position; - TrackPoint 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; - TrackPoint back_point = get_point(back, wheelbase, -back_axles.back().type->position/wheelbase); - - tp = get_point(front_point.pos, back_point.pos, -bogies.back().type->position/bogie_spacing); - - bogies.front().direction = front_point.dir-tp.dir; - bogies.back().direction = back_point.dir-tp.dir; + OrientedPoint back_point = placement.get_bogie_point(bogies.back().type->index); + bogies.back().direction = back_point.rotation-p.rotation; } - else - tp = track_pos.get_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 = tp.pos; - position.z += layout.get_catalogue().get_rail_elevation(); - rotation = tp.dir; + signal_moved.emit(); } void Vehicle::update_position_from(const Vehicle &veh) @@ -210,18 +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_pos.track || disttdist+margin) + if(!is_placed() || disttdist+margin) { - track_pos = veh.track_pos; - track_pos.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_pos.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() @@ -248,29 +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) { - TrackPosition pos = track_pos; - pos.advance(offset); - unsigned s = pos.track->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_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. */ + if(release) layout.get_driver().set_sensor(old, false); + else + layout.get_driver().set_sensor(sensor, true); } } @@ -278,9 +261,6 @@ void Vehicle::turn_axles(float d) { for(vector::iterator i=axles.begin(); i!=axles.end(); ++i) i->angle += Angle::from_radians(d*2/i->type->wheel_dia); - for(vector::iterator i=bogies.begin(); i!=bogies.end(); ++i) - for(vector::iterator j=i->axles.begin(); j!=i->axles.end(); ++j) - j->angle += Angle::from_radians(d*2/j->type->wheel_dia); update_rods(); } @@ -338,59 +318,6 @@ void Vehicle::update_rods() } } -void Vehicle::adjust_for_distance(TrackPosition &front, TrackPosition &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.get_point().pos; - Vector back_point = back.get_point().pos; - - 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.advance(diff*(1-ratio)); - back.advance(-diff*ratio); - } -} - -TrackPoint Vehicle::get_point(const Vector &front, const Vector &back, float ratio) const -{ - Vector span = front-back; - - TrackPoint tp; - tp.pos = back+span*ratio; - tp.dir = Geometry::atan2(span.y, span.x); - - return tp; -} - -TrackPoint Vehicle::get_point(const TrackPosition &pos, float tdist, float ratio) const -{ - TrackPosition front = pos; - front.advance(tdist*(1-ratio)); - - TrackPosition back = pos; - back.advance(-tdist*ratio); - - adjust_for_distance(front, back, tdist, ratio); - return get_point(front.get_point().pos, back.get_point().pos, ratio); -} - unsigned Vehicle::get_n_link_slots() const { return 2; @@ -421,67 +348,13 @@ Vehicle::Axle::Axle(const VehicleType::Axle &t): Vehicle::Bogie::Bogie(const VehicleType::Bogie &t): - type(&t) -{ - for(VehicleType::AxleArray::const_iterator i=type->axles.begin(); i!=type->axles.end(); ++i) - axles.push_back(*i); -} + type(&t), + axles(t.axles.size()) +{ } Vehicle::Rod::Rod(const VehicleType::Rod &t): type(&t) { } - -Vehicle::TrackPosition::TrackPosition(): - offs(0) -{ } - -Vehicle::TrackPosition::TrackPosition(const TrackIter &t, float o): - track(t), - offs(o) -{ } - -void Vehicle::TrackPosition::advance(float d) -{ - if(!track) - return; - - offs += d; - while(track) - { - float path_len = track->get_type().get_path_length(track->get_active_path()); - - if(offs>path_len) - { - offs -= path_len; - track = track.next(); - } - else - break; - } - - while(track && offs<0) - { - track = track.flip().reverse(); - - if(track) - { - float path_len = track->get_type().get_path_length(track->get_active_path()); - offs += path_len; - } - } - - if(!track) - offs = 0; -} - -TrackPoint Vehicle::TrackPosition::get_point() const -{ - if(track) - return track->get_point(track.entry(), offs); - else - return TrackPoint(); -} - } // namespace R2C2