X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=36412cfeb017f857efd354c30e8e8e85c1f33fcd;hb=32cf18ff4306b36f2ce59d41056f888638a85578;hp=49edd48d0d86b7cd8e4bdae246e62c72637d0188;hpb=2220ba2f11705ea9a4e480603d43ab7ed4cf5a89;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 49edd48..36412cf 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -25,11 +25,11 @@ #include "3d/track.h" #include "3d/trackcircuit.h" #include "3d/vehicle.h" +#include "dynamicdialog.h" #include "engineer.h" #include "mainwindow.h" #include "newtraindialog.h" #include "traindialog.h" -#include "trainview.h" using namespace std; using namespace R2C2; @@ -40,12 +40,13 @@ Engineer::Engineer(int argc, char **argv): window(options.screen_w, options.screen_h, options.fullscreen), keyboard(window), mouse(window), - ui_res("r2c2.res"), + ui_res("data/r2c2.res"), import_active(false), layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))), layout_3d(layout), server(0), - main_view(layout_3d, window.get_width(), window.get_height()) + main_view(layout_3d, window.get_width(), window.get_height()), + emergency_blink_state(0) { // Setup GUI window.set_title("Railroad Engineer"); @@ -68,16 +69,17 @@ Engineer::Engineer(int argc, char **argv): overlay = new Overlay3D(ui_res.get_default_font()); // Setup railroad control - DataFile::load(catalogue, "tracks.dat"); - DataFile::load(catalogue, "locos.dat"); - DataFile::load(catalogue, "wagons.dat"); - DataFile::load(catalogue, "terrain.dat"); + catalogue.add_source("data/Märklin/H0"); DataFile::load(layout, options.layout_fn); if(layout.has_driver()) - layout.get_driver().signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected)); + { + Driver &driver = layout.get_driver(); + driver.signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected)); + driver.signal_halt.connect(sigc::mem_fun(this, &Engineer::halt_event)); + } layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added)); - layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status)); + layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::emergency)); const set &blocks = layout.get_all(); for(set::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) if(TrackCircuit *tc = (*i)->get_sensor()) @@ -121,17 +123,15 @@ Engineer::Engineer(int argc, char **argv): Engineer::~Engineer() { - const map &trains = layout.get_trains(); - for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) - layout.get_driver().set_loco_speed(i->first, 0); - layout.get_driver().flush(); - if(!options.simulate) { layout.save_dynamic(options.state_fn+".tmp"); FS::rename(options.state_fn+".tmp", options.state_fn); } + layout.get_driver().halt(true); + layout.get_driver().flush(); + delete overlay; delete root_arrangement; delete root; @@ -145,14 +145,14 @@ void Engineer::set_status(const string &text) status_timeout = Time::now()+10*Time::sec; } -void Engineer::add_train_view(TrainView &tv) +void Engineer::add_dynamic_dialog(DynamicDialog &tv) { - train_views.push_back(&tv); + dyn_dialogs.push_back(&tv); } -void Engineer::remove_train_view(TrainView &tv) +void Engineer::remove_dynamic_dialog(DynamicDialog &tv) { - train_views.erase(remove(train_views.begin(), train_views.end(), &tv), train_views.end()); + dyn_dialogs.erase(remove(dyn_dialogs.begin(), dyn_dialogs.end(), &tv), dyn_dialogs.end()); } int Engineer::main() @@ -171,16 +171,26 @@ void Engineer::tick() new_trains.clear(); layout.tick(); + layout_3d.tick(); event_disp.tick(Time::zero); - for(list::iterator i=train_views.begin(); i!=train_views.end(); ++i) - (*i)->prepare(); + for(list::iterator i=dyn_dialogs.begin(); i!=dyn_dialogs.end(); ++i) + (*i)->update(); - if(status_timeout && Time::now()>status_timeout) + Time::TimeStamp t = Time::now(); + if(status_timeout && t>status_timeout) { main_wnd->set_status_text(string()); status_timeout = Time::TimeStamp(); } + if(!emergencies.empty() && t>emergency_blink_timeout) + { + emergency_blink_state = (emergency_blink_state+1)%2; + GL::Color color(1.0f/(1+emergency_blink_state), 0.0f, 0.0f); + for(list::iterator i=emergencies.begin(); i!=emergencies.end(); ++i) + (*i)->set_color(color); + emergency_blink_timeout = t+0.5*Time::sec; + } GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); @@ -198,7 +208,7 @@ void Engineer::button_press(unsigned btn) Object *obj = pick_object(pointer); if(Track *track = dynamic_cast(obj)) { - if(track->get_turnout_address()) + if(track->get_type().is_turnout()) { Block &block = track->get_block(); if(block.get_train() && block.get_train()->is_block_critical(block)) @@ -296,9 +306,31 @@ Object *Engineer::pick_object(const Vector &p) GL::Vector4 ray = main_view.get_camera().unproject(GL::Vector4(p.x, p.y, 0, 0)); // XXX Do this better; make this function a template? - if(Vehicle *veh = layout.pick(Ray(start, Vector(ray)))) + if(Vehicle *veh = layout.pick(Ray(start, ray.slice<3>(0)))) return veh; - return layout.pick(Ray(start, Vector(ray))); + return layout.pick(Ray(start, ray.slice<3>(0))); +} + +void Engineer::emergency(Block *block, const string &msg) +{ + set_status(msg); + if(block) + { + TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block); + tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f)); + tch3d->set_layer(2); + emergencies.push_back(tch3d); + } +} + +void Engineer::halt_event(bool h) +{ + if(!h) + { + for(list::iterator i=emergencies.begin(); i!=emergencies.end(); ++i) + delete *i; + emergencies.clear(); + } } void Engineer::locomotive_detected(const Driver::DetectedLocomotive &loco) @@ -367,9 +399,7 @@ void Engineer::sighandler(int sig) { signal(sig, SIG_DFL); IO::print(IO::cerr, "Fatal signal received, terminating\n"); - const map &trains = layout.get_trains(); - for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) - layout.get_driver().set_loco_speed(i->first, 0); + layout.get_driver().halt(true); layout.get_driver().flush(); raise(sig); }