X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=ef5b54d8c7110bef454e1f76b1966622bcae70df;hb=eb8b919a1a224c0d6f206d1d29a9b4b8c3a0cac8;hp=f89fbd174d061aad7b5838a885de09976f8390dc;hpb=5fa009f4af8d0a2e4f52929e1ee29f5c93986ab6;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index f89fbd1..ef5b54d 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -24,10 +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; @@ -38,22 +40,23 @@ 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()), - picking(false), - picking_track(0), - picking_entry(0), - picking_path(0), - pointer_moved(false) + emergency_blink_state(0) { // Setup GUI window.set_title("Railroad Engineer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); root = new GLtk::Root(ui_res, &window, &keyboard, &mouse); + GLtk::Layout *root_layout = new GLtk::Layout; + root->set_layout(root_layout); + root_layout->set_margin(GLtk::Sides()); + root_arrangement = new GLtk::FloatingArrangement(*root_layout); mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::button_press), false)); mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Engineer::axis_motion), false)); root->set_visible(true); @@ -66,13 +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"); + catalogue.add_source("data/Märklin/H0"); DataFile::load(layout, options.layout_fn); + if(layout.has_driver()) + { + 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()) @@ -81,7 +88,7 @@ Engineer::Engineer(int argc, char **argv): const set &tracks = layout.get_all(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) if((*i)->get_type().is_turnout()) - new Path3D(layout_3d.get(**i)); + new Path3D(layout_3d.get_3d(**i)); if(FS::exists(options.state_fn)) DataFile::load(layout, options.state_fn); @@ -93,8 +100,6 @@ Engineer::Engineer(int argc, char **argv): } // Setup 3D view - DataFile::load(arrow_mesh, "arrow.mesh"); - GL::Pipeline &pipeline = main_view.get_pipeline(); GL::Pipeline::Pass *pass = &pipeline.add_pass("unlit"); @@ -118,18 +123,17 @@ 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; delete server; @@ -141,21 +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()); -} - -void Engineer::pick(bool with_ep) -{ - picking = true; - picking_track = 0; - picking_entry = (with_ep ? 0 : -1); + dyn_dialogs.erase(remove(dyn_dialogs.begin(), dyn_dialogs.end(), &tv), dyn_dialogs.end()); } int Engineer::main() @@ -173,55 +170,31 @@ void Engineer::tick() process_new_train(**i); new_trains.clear(); - layout.tick(); + layout.tick(options.sim_speed); + 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(); } - - GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); - - main_view.render(); - - if(pointer_moved) + if(!emergencies.empty() && t>emergency_blink_timeout) { - pointer_moved = false; - - if(picking) - { - Track *track = dynamic_cast(pick_object(pointer)); - if(track && track!=picking_track) - { - picking_track = track; - if(picking_entry>=0) - picking_entry = 0; - - delete picking_path; - picking_path = new Path3D(layout_3d.get(*track)); - picking_path->set_color(GL::Color(0)); - picking_path->set_layer(2); - } - } + 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; } - if(picking && picking_track && picking_entry>=0) - { - main_view.get_camera().apply(); - GL::MatrixStack::Push push_mat(GL::MatrixStack::modelview()); - - Snap sn = picking_track->get_snap_node(picking_entry); - - GL::MatrixStack::modelview() *= GL::Matrix::translation(sn.position+GL::Vector3(0, 0, 0.03)); - GL::MatrixStack::modelview() *= GL::Matrix::rotation(sn.rotation+Angle::half_turn(), 0, 0, 1); + GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); - arrow_mesh.draw(); - } + main_view.render(); root->render(); @@ -230,26 +203,12 @@ void Engineer::tick() void Engineer::button_press(unsigned btn) { - if(picking) - { - if(btn==1 && picking_track) - { - picking = false; - delete picking_path; - picking_path = 0; - signal_pick_done.emit(picking_track, picking_entry); - } - else if(btn==3 && picking_entry>=0) - { - picking_entry = (picking_entry+1)%picking_track->get_type().get_endpoints().size(); - } - } - else + if(btn==1) { Object *obj = pick_object(pointer); if(Track *track = dynamic_cast(obj)) { - if(track->get_turnout_id()) + if(track->get_type().is_turnout()) { Block &block = track->get_block(); if(block.get_train() && block.get_train()->is_block_critical(block)) @@ -266,14 +225,14 @@ void Engineer::button_press(unsigned btn) ++i; } track->set_active_path(i); - set_status(format("Turnout %d", track->get_turnout_id())); + set_status(format("Turnout %d", track->get_turnout_address())); } } - if(unsigned sid = track->get_sensor_id()) + if(unsigned saddr = track->get_sensor_address()) { if(options.simulate) - layout.get_driver().set_sensor(sid, !layout.get_driver().get_sensor(sid)); - set_status(format("Sensor %d", sid)); + layout.get_driver().set_sensor(saddr, !layout.get_driver().get_sensor(saddr)); + set_status(format("Sensor %d", saddr)); } } else if(Vehicle *veh = dynamic_cast(obj)) @@ -291,7 +250,6 @@ void Engineer::axis_motion(unsigned axis, float value, float) pointer.x = value; if(axis==1) pointer.y = value; - pointer_moved = true; } void Engineer::view_all() @@ -348,14 +306,53 @@ 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) +{ + if(!import_active) + { + NewTrainDialog *dlg = new NewTrainDialog(*this); + dlg->prefill(loco); + dlg->signal_response.connect(sigc::mem_fun(this, &Engineer::import_finished)); + root->add(*dlg); + import_active = true; + } +} + +void Engineer::import_finished(int) +{ + import_active = false; } void Engineer::process_new_train(Train &train) { - Vehicle3D &loco3d = layout_3d.get(train.get_vehicle(0)); + Vehicle3D &loco3d = layout_3d.get_3d(train.get_vehicle(0)); overlay->set_label(loco3d, train.get_name()); train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(loco3d))); } @@ -402,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); }