X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=07461b80a9558ecc4000c176bf73565e4c6d922b;hb=d051af7264ee62d03473f1929414e262e918c30a;hp=aa2ba3f528627beb093dc936446b1f2b3bbd4d81;hpb=c4daf1cc6b53cae34e46d4125a993ceed500de1a;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index aa2ba3f..07461b8 100644 --- a/source/libr2c2/train.cpp +++ b/source/libr2c2/train.cpp @@ -6,6 +6,7 @@ #include #include #include "aicontrol.h" +#include "beamgate.h" #include "block.h" #include "catalogue.h" #include "driver.h" @@ -184,20 +185,29 @@ void Train::ai_message(const TrainAI::Message &msg) (*i)->message(msg); } -void Train::place(const BlockIter &block) +bool Train::place(const BlockIter &block) { if(!block) throw invalid_argument("Train::place"); if(controller->get_speed()) throw logic_error("moving"); - allocator.start_from(block); accurate_position = false; + last_entry_block = BlockIter(); - if(reverse) - vehicles.front()->place(block.reverse().track_iter(), 0, Vehicle::FRONT_BUFFER); + if(allocator.start_from(block)) + { + if(reverse) + vehicles.front()->place(block.reverse().track_iter(), VehiclePlacement::FRONT_BUFFER); + else + vehicles.back()->place(block.track_iter(), VehiclePlacement::BACK_BUFFER); + return true; + } else - vehicles.back()->place(block.track_iter(), 0, Vehicle::BACK_BUFFER); + { + unplace(); + return false; + } } void Train::unplace() @@ -207,6 +217,7 @@ void Train::unplace() allocator.clear(); accurate_position = false; + last_entry_block = BlockIter(); for(vector::iterator i=vehicles.begin(); i!=vehicles.end(); ++i) (*i)->unplace(); @@ -219,7 +230,7 @@ void Train::stop_at(Block *block) bool Train::is_block_critical(const Block &block) const { - return get_reserved_distance_until(&block)get_braking_distance()*1.3; + return get_reserved_distance_until(&block)<=controller->get_braking_distance()*1.3; } BlockIter Train::get_first_noncritical_block() const @@ -309,6 +320,7 @@ void Train::tick(const Time::TimeDelta &dt) driver.set_loco_reverse(address, r); allocator.reverse(); + last_entry_block = BlockIter(); } if(speed_quantizer) @@ -333,7 +345,7 @@ void Train::tick(const Time::TimeDelta &dt) Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front()); float d = speed*(dt/Time::sec); - if(allocator.is_block_current(vehicle.get_track()->get_block())) + if(allocator.is_block_current(vehicle.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE)->get_block())) { SetFlag setf(advancing); vehicle.advance(reverse ? -d : d); @@ -422,28 +434,28 @@ void Train::loco_func_event(unsigned addr, unsigned func, bool state) void Train::sensor_state_changed(Sensor &sensor, Sensor::State state) { - if(state!=Sensor::MAYBE_ACTIVE) + if(!current_speed_step || state!=Sensor::MAYBE_ACTIVE) return; Block *block = sensor.get_block(); if(!block || block->get_train()!=this) return; + if(last_entry_block && &*last_entry_block!=block) + { + for(BlockIter i=last_entry_block.next(); (i && &*i!=block); i=i.next()) + if(i->get_train()!=this || i->get_sensor_id()) + return; + } + if(dynamic_cast(&sensor)) { - if(last_entry_block) + if(last_entry_block && pure_speed && speed_quantizer) { - float travel_distance = -1; - if(pure_speed && speed_quantizer && current_speed_step>0) - travel_distance = 0; + float travel_distance = 0; for(BlockIter i=last_entry_block; &*i!=block; i=i.next()) - { - if(i->get_sensor_id()) - return; - if(travel_distance>=0) - travel_distance += i->get_path_length(i.entry()); - } + travel_distance += i->get_path_length(i.entry()); if(travel_distance>0) { @@ -460,16 +472,35 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state) accurate_position = true; overshoot_dist = 0; - if(!advancing && vehicles.front()->get_track()) + if(!advancing && vehicles.front()->is_placed()) { TrackIter track = last_entry_block.track_iter(); if(reverse) { track = track.flip(); - vehicles.back()->place(track, 0, Vehicle::BACK_AXLE); + vehicles.back()->place(track, VehiclePlacement::BACK_AXLE); } else - vehicles.front()->place(track, 0, Vehicle::FRONT_AXLE); + vehicles.front()->place(track, VehiclePlacement::FRONT_AXLE); + } + } + else if(BeamGate *gate = dynamic_cast(&sensor)) + { + if(!advancing && vehicles.front()->is_placed()) + { + TrackIter track = allocator.iter_for(*block).track_iter(); + for(; (track && &track->get_block()==block); track=track.next()) + if(track.track()==gate->get_track()) + { + if(reverse) + track = track.reverse(); + float offset = gate->get_offset_from_endpoint(track.entry()); + if(reverse) + vehicles.back()->place(TrackOffsetIter(track, offset), VehiclePlacement::BACK_BUFFER); + else + vehicles.front()->place(TrackOffsetIter(track, offset), VehiclePlacement::FRONT_BUFFER); + break; + } } } } @@ -487,7 +518,7 @@ float Train::get_reserved_distance_until(const Block *until_block) const Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front()); - TrackIter track = veh.get_track_iter(); + TrackOffsetIter track = veh.get_placement().get_position(reverse ? VehiclePlacement::BACK_AXLE : VehiclePlacement::FRONT_AXLE); if(!track) // XXX Probably unnecessary return 0; @@ -495,7 +526,7 @@ float Train::get_reserved_distance_until(const Block *until_block) const return 0; // Account for the vehicle's offset on its current track - float result = veh.get_offset(); + float result = track.offset(); if(reverse) track = track.reverse(); else @@ -543,7 +574,7 @@ void Train::Loader::finish() { TrackIter track = obj.allocator.first().track_iter(); float offset = 2*obj.layout.get_catalogue().get_scale(); - obj.vehicles.back()->place(track, offset, Vehicle::BACK_BUFFER); + obj.vehicles.back()->place(TrackOffsetIter(track, offset), VehiclePlacement::BACK_BUFFER); } }