X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Flibr2c2%2Ftrain.cpp;h=50ad137723d42ec2a8c10775767a3de92c91d745;hb=b28062f2dc88e082ee5a28b2e1f7c4c8bd989023;hp=b5f600e09e3a58a9744cbef5e7844cf57252aa78;hpb=14b71235fbf3406ed88fab9125ea646eb6a9b702;p=r2c2.git diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp index b5f600e..50ad137 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,21 +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() @@ -221,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 @@ -246,7 +255,7 @@ BlockIter Train::get_first_noncritical_block() const dist += i->get_path_length(i.entry()); - if(i->get_sensor_id()) + if(i->get_sensor_address()) sensor_seen = true; } @@ -336,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); @@ -435,7 +444,7 @@ void Train::sensor_state_changed(Sensor &sensor, Sensor::State state) 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()) + if(i->get_train()!=this || i->get_sensor_address()) return; } @@ -463,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; + } } } } @@ -490,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; @@ -498,18 +526,18 @@ 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 - result = track->get_type().get_path_length(track->get_active_path())-result; + result = track->get_path_length()-result; result -= veh.get_type().get_length()/2; BlockIter block = track.block_iter(); // Count remaining distance in the vehicle's current block for(track=track.next(); &track->get_block()==&*block; track=track.next()) - result += track->get_type().get_path_length(track->get_active_path()); + result += track->get_path_length(); const BlockIter &last = allocator.last(); if(&*block==&*last) @@ -546,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); } } @@ -574,7 +602,7 @@ void Train::Loader::router() void Train::Loader::vehicle(ArticleNumber art_nr) { - const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(art_nr); + const VehicleType &vtype = obj.layout.get_catalogue().get(art_nr); Vehicle *veh = new Vehicle(obj.layout, vtype); obj.vehicles.back()->attach_back(*veh); obj.vehicles.push_back(veh);