X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=18258090c7755213f8cec76226418fd32e33ce27;hb=abed4a255060d5a233ec0ac2dd60af9132e29201;hp=87a4d6d3afa6c4a75f424ce804e4c3b49491e3e4;hpb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index 87a4d6d..1825809 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -1,142 +1,99 @@ -/* $Id$ - -This file is part of the MSP Märklin suite -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - +#include #include +#include #include #include -#include -#include #include -#include -#include +#include +#include +#include #include #include -#include #include #include -#include #include -#include #include -#include -#include -#include -#include -#include "libmarklin/except.h" -#include "libmarklin/tracktype.h" +#include +#include +#include "libr2c2/driver.h" +#include "libr2c2/trackcircuit.h" +#include "libr2c2/tracktype.h" +#include "libr2c2/zone.h" +#include "3d/allocation.h" +#include "3d/path.h" +#include "3d/track.h" +#include "3d/trackcircuit.h" +#include "3d/vehicle.h" #include "engineer.h" -#include "mainpanel.h" -#include "trainpanel.h" -#include "trainproperties.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; Engineer::Engineer(int argc, char **argv): - layout(catalogue), + options(argc, argv), + window(options.screen_w, options.screen_h, options.fullscreen), + keyboard(window), + mouse(window), + layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))), layout_3d(layout), server(0), - placing_train(0), - placing_block(0), - placing_entry(0), - simulate(false) + main_view(layout_3d, window.get_width(), window.get_height()), + ui(*this, window, keyboard, mouse), + emergency_blink_state(0) { - // Parse options - unsigned screen_w = 1280; - unsigned screen_h = 960; - bool fullscreen = false; - string res; - bool debug = false; - string device = "/dev/ttyS0"; - bool network = false; - - GetOpt getopt; - getopt.add_option('r', "resolution", res, GetOpt::REQUIRED_ARG); - getopt.add_option('f', "fullscreen", fullscreen, GetOpt::NO_ARG); - getopt.add_option('g', "debug", debug, GetOpt::NO_ARG); - getopt.add_option('d', "device", device, GetOpt::REQUIRED_ARG); - getopt.add_option('s', "simulate", simulate, GetOpt::NO_ARG); - getopt.add_option('n', "network", network, GetOpt::NO_ARG); - getopt(argc, argv); - - const vector &args = getopt.get_args(); - if(args.empty()) - throw UsageError("No layout given"); - - if(!res.empty()) - { - if(RegMatch m=Regex("([1-9][0-9]*)x([1-9][0-9]*)").match(res)) - { - screen_w = lexical_cast(m[1].str); - screen_h = lexical_cast(m[2].str); - } - else - throw UsageError("Invalid resolution"); - } - // Setup GUI - window = new Graphics::SimpleGLWindow(screen_w, screen_h, fullscreen); - window->set_title("Railroad Engineer"); - window->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); + window.set_title("Railroad Engineer"); + window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); - DataFile::load(ui_res, "marklin.res"); - root = new GLtk::Root(ui_res, *window); - root->signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press)); - root->signal_pointer_motion.connect(sigc::mem_fun(this, &Engineer::pointer_motion)); - root->set_visible(true); + 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)); - main_panel = new MainPanel(*this, ui_res); - root->add(*main_panel); - main_panel->set_position(0, window->get_height()-main_panel->get_geometry().h); - main_panel->set_visible(true); + overlay = new Overlay3D(ui.get_resources().get_default_font()); // Setup railroad control - DataFile::load(catalogue, "tracks.dat"); - DataFile::load(catalogue, "locos.dat"); - DataFile::load(layout, args.front()); + catalogue.add_source("data/Märklin/H0"); + DataFile::load(layout, options.layout_fn); + + if(layout.has_driver()) + { + Driver &driver = layout.get_driver(); + 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::emergency)); + const set &blocks = layout.get_all(); + for(set::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + if(TrackCircuit *tc = (*i)->get_sensor()) + new TrackCircuit3D(layout_3d, *tc); - if(device!="none") - control.open(device); + 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_3d(**i)); - control.set_debug(debug); + if(FS::exists(options.state_fn)) + DataFile::load(layout, options.state_fn); - trfc_mgr = new TrafficManager(control, layout); - layout_3d.set_traffic_manager(*trfc_mgr); - trfc_mgr->signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added)); - trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved)); - if(FS::exists("engineer.state")) - DataFile::load(*trfc_mgr, "engineer.state"); + if(FS::exists(options.uistate_fn)) + DataFile::load(ui, options.uistate_fn); - if(network) + if(options.network) { - server = new Server(*trfc_mgr); + server = new Server(layout); server->use_event_dispatcher(event_disp); } - const map &sensors = control.get_sensors(); - for(map::const_iterator i=sensors.begin(); i!=sensors.end(); ++i) - i->second->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Engineer::sensor_event), i->second)); - // Setup 3D view - DataFile::load(arrow_mesh, "arrow.mesh"); - - overlay = new Overlay3D(*window, camera, ui_res.get_default_font()); + GL::Pipeline &pipeline = main_view.get_pipeline(); - pipeline = new GL::Pipeline(window->get_width(), window->get_height(), false); - pipeline->set_camera(&camera); - pipeline->add_renderable(layout_3d.get_scene()); + GL::Pipeline::Pass *pass = &pipeline.add_pass("unlit"); + pass->set_depth_test(&GL::DepthTest::lequal()); + pipeline.add_renderable_for_pass(layout_3d.get_path_scene(), "unlit"); - light.set_position(0, -0.259, 0.966, 0); - lighting.attach(0, light); - - GL::PipelinePass &pass = pipeline->add_pass(0); - pass.depth_test = &GL::DepthTest::lequal(); - pass.lighting = &lighting; + pass = &pipeline.add_pass("overlay"); + pass->set_blend(&GL::Blend::alpha()); + pipeline.add_renderable_for_pass(*overlay, "overlay"); view_all(); @@ -151,184 +108,140 @@ Engineer::Engineer(int argc, char **argv): Engineer::~Engineer() { - const list &trains = trfc_mgr->get_trains(); - for(list::const_iterator i=trains.begin(); i!=trains.end(); ++i) - (*i)->set_speed(0); + if(!options.simulate) + { + layout.save_dynamic(options.state_fn+".tmp"); + FS::rename(options.state_fn+".tmp", options.state_fn); + } - while(control.get_queue_length()) - control.tick(); + ui.save_state(options.uistate_fn); - if(!simulate) - trfc_mgr->save("engineer.state"); + layout.get_driver().halt(true); + layout.get_driver().flush(); - delete pipeline; delete overlay; - delete root; - delete window; - delete trfc_mgr; delete server; } -void Engineer::place_train(Train &train) -{ - placing_train = &train; - placing_block = 0; - main_panel->set_status_text("Select location"); -} - int Engineer::main() { - window->show(); + window.show(); return Application::main(); } void Engineer::tick() { - window->get_display().tick(); - - control.tick(); - trfc_mgr->tick(); - event_disp.tick(Time::zero); + window.get_display().tick(); for(list::iterator i=new_trains.begin(); i!=new_trains.end(); ++i) - overlay->set_label(layout_3d.get_train(**i), (*i)->get_name()); + process_new_train(**i); new_trains.clear(); - GL::clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); + layout.tick(options.sim_speed); + layout_3d.tick(); + event_disp.tick(Time::zero); - pipeline->render_all(); - { - GL::Bind blend(GL::Blend::alpha()); - overlay->render(0); - } + ui.tick(); - if(placing_train && placing_block) + Time::TimeStamp t = Time::now(); + if(!emergencies.empty() && t>emergency_blink_timeout) { - GL::PushMatrix push_mat; - - const Marklin::Block::Endpoint &bep = placing_block->get_endpoints()[placing_entry]; - float rot = bep.track->get_endpoint_direction(bep.track_ep); - Point pos = bep.track->get_endpoint_position(bep.track_ep); - - GL::translate(pos.x, pos.y, pos.z+0.03); - GL::rotate(rot*180/M_PI+180, 0, 0, 1); - - arrow_mesh.draw(); + 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; } - const GLtk::Geometry &rgeom = root->get_geometry(); - GL::matrix_mode(GL::PROJECTION); - GL::load_identity(); - GL::ortho_bottomleft(rgeom.w, rgeom.h); - GL::matrix_mode(GL::MODELVIEW); - GL::load_identity(); + GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); - { - GL::Bind blend(GL::Blend::alpha()); - root->render(); - GL::Texture::unbind(); - } + main_view.render(); + + ui.render(); - window->swap_buffers(); + window.swap_buffers(); } -void Engineer::button_press(int x, int y, unsigned btn, unsigned) +void Engineer::button_press(unsigned btn) { - if(placing_train) - { - if(btn==1 && placing_block && !placing_block->get_train()) - { - reset_block_color(*placing_block); - - placing_train->place(*placing_block, placing_entry); - placing_train = 0; - main_panel->set_status_text(string()); - } - else if(btn==3) - { - const vector &endpoints = placing_block->get_endpoints(); - placing_entry = (placing_entry+1)%endpoints.size(); - } - } - else + if(btn==1) { - Track3D *track = pick_track(x, window->get_height()-y-1); - if(track) + Object *obj = pick_object(pointer); + if(Track *track = dynamic_cast(obj)) { - if(unsigned tid=track->get_track().get_turnout_id()) + if(track->get_type().is_turnout()) { - Turnout &turnout = control.get_turnout(tid); - try + Block &block = track->get_block(); + if(block.get_train() && block.get_train()->is_block_critical(block)) + ui.set_status("Turnout is busy"); + else { - turnout.set_path((turnout.get_path()+1)%track->get_track().get_type().get_n_paths()); - main_panel->set_status_text(format("Turnout %d switched", turnout.get_address())); - } - catch(const TurnoutBusy &e) - { - main_panel->set_status_text(e.what()); + unsigned paths = track->get_type().get_paths(); + unsigned i = track->get_active_path()+1; + while(!(paths&(1<>i)) + i = 0; + else + ++i; + } + track->set_active_path(i); + ui.set_status(format("Turnout %d", track->get_turnout_address())); } } - else if(simulate) + else if(unsigned saddr = track->get_sensor_address()) { - if(unsigned sid=track->get_track().get_sensor_id()) - { - Sensor &sensor = control.get_sensor(sid); - control.signal_sensor_event.emit(sid, !sensor.get_state()); - } + if(options.simulate) + layout.get_driver().set_sensor(saddr, !layout.get_driver().get_sensor(saddr)); + ui.set_status(format("Sensor %d", saddr)); + } + else + { + const set &zones = layout.get_all(); + for(set::const_iterator i=zones.begin(); i!=zones.end(); ++i) + if((*i)->has_track(*track)) + { + ui.show_zone(**i); + break; + } } } + else if(Vehicle *veh = dynamic_cast(obj)) + ui.show_train(*veh->get_train()); } } -void Engineer::pointer_motion(int x, int y) +void Engineer::axis_motion(unsigned axis, float value, float) { - if(placing_train) - { - Track3D *track = pick_track(x, window->get_height()-y-1); - if(track) - { - Block &block = trfc_mgr->get_block_by_track(track->get_track()); - if(&block!=placing_block) - { - if(placing_block) - reset_block_color(*placing_block); - placing_block = █ - placing_entry = 0; - set_block_color(*placing_block, GL::Color(0.5, 1, 0.7)); - } - } - } + if(axis==0) + pointer.x = value; + if(axis==1) + pointer.y = value; } void Engineer::view_all() { - const list &tracks = layout_3d.get_tracks(); + const Layout3D::ObjectMap &objects = layout_3d.get_all(); - float view_aspect = float(window->get_width()-200)/window->get_height(); - float view_height = tan(camera.get_field_of_view()/2)*2; + float view_aspect = float(window.get_width())/window.get_height(); + float view_height = tan(main_view.get_camera().get_field_of_view()/2.0f)*2.0f; float best_score = 0; GL::Vector3 pos; GL::Vector3 up; - for(float angle=0; angle::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - { - Point minp, maxp; - (*i)->get_bounds(angle, minp, maxp); - min_x = min(min_x, minp.x); - max_x = max(max_x, maxp.x); - min_y = min(min_y, minp.y); - max_y = max(max_y, maxp.y); - } + Transform trans = Transform::rotation(-angle, Vector(0, 0, 1)); + BoundingBox bbox; + for(Layout3D::ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i) + bbox = bbox|trans.transform(i->second->get_object().get_bounding_box()); - float width = max_x-min_x; - float height = max_y-min_y; + const Vector &minp = bbox.get_minimum_point(); + const Vector &maxp = bbox.get_maximum_point(); + + float width = maxp.x-minp.x; + float height = maxp.y-minp.y; float aspect = width/height; float score = min(aspect/view_aspect, view_aspect/aspect); @@ -339,8 +252,8 @@ void Engineer::view_all() float size = max(width/view_aspect, height); float c = cos(angle); float s = sin(angle); - float x = (min_x+max_x)/2-size*105/window->get_height(); - float y = (min_y+max_y)/2; + float x = (minp.x+maxp.x)/2; + float y = (minp.y+maxp.y)/2; float z = max(size*1.05/view_height, 0.15); pos = GL::Vector3(c*x-s*y, s*x+c*y, z); @@ -348,72 +261,87 @@ void Engineer::view_all() } } + GL::Camera &camera = main_view.get_camera(); camera.set_position(pos); camera.set_up_direction(up); camera.set_look_direction(GL::Vector3(0, 0, -1)); + camera.set_aspect(float(window.get_width())/window.get_height()); + camera.set_depth_clip(pos.z*0.5, pos.z*1.5); } -void Engineer::set_block_color(const Block &block, const GL::Color &color) +Object *Engineer::pick_object(const Vector &p) { - (void)block; - (void)color; + const GL::Vector3 &start = main_view.get_camera().get_position(); + 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, ray.slice<3>(0)))) + return veh; + return layout.pick(Ray(start, ray.slice<3>(0))); } -void Engineer::reset_block_color(const Block &block) +void Engineer::emergency(Block *block, const string &) { - if(unsigned sid=block.get_sensor_id()) + if(block) { - Sensor &sensor = control.get_sensor(sid); - if(sensor.get_state()) - { - set_block_color(block, GL::Color(1, 0.5, 0.3)); - return; - } + 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); } - - if(block.get_train()) - set_block_color(block, GL::Color(1, 1, 0.3)); - else - set_block_color(block, GL::Color(1, 1, 1)); } -void Engineer::sensor_event(bool, Sensor *sensor) +void Engineer::halt_event(bool h) { - const list &blocks = trfc_mgr->get_blocks(); - for(list::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) - if((*i)->get_sensor_id()==sensor->get_address()) - reset_block_color(**i); -} - -void Engineer::block_reserved(const Block &block, const Train *) -{ - reset_block_color(block); + if(!h) + { + for(list::iterator i=emergencies.begin(); i!=emergencies.end(); ++i) + delete *i; + emergencies.clear(); + } } -Track3D *Engineer::pick_track(int x, int y) +void Engineer::process_new_train(Train &train) { - float view_height = tan(camera.get_field_of_view()/2)*2; - float xx = ((float(x)-window->get_width()/2)/window->get_height())*view_height; - float yy = (float(y)/window->get_height()-0.5)*view_height; - float size = 4.0/window->get_height()*view_height; - - camera.apply(); - - return layout_3d.pick_track(xx, yy, size); + 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))); } void Engineer::train_added(Train &train) { - TrainPanel *tpanel = new TrainPanel(*this, ui_res, train); - root->add(*tpanel); - int y = main_panel->get_geometry().y; - for(list::iterator i=train_panels.begin(); i!=train_panels.end(); ++i) - y -= (*i)->get_geometry().h; - tpanel->set_position(0, y-tpanel->get_geometry().h); - train_panels.push_back(tpanel); - tpanel->set_visible(true); - new_trains.push_back(&train); + + GL::Color best_color; + float best_d_sq = 0; + for(unsigned i=0; i<10; ++i) + { + GL::Color color; + unsigned h = rand()%3; + color.r = (h==0 ? 0.0 : rand()*1.0/RAND_MAX); + color.g = (h==1 ? 0.0 : rand()*1.0/RAND_MAX); + color.b = (h==2 ? 0.0 : rand()*1.0/RAND_MAX); + color = color*(1/max(max(color.r, color.g), color.b)); + float min_d_sq = 3; + for(map::const_iterator j=train_colors.begin(); j!=train_colors.end(); ++j) + { + float dr = color.r-j->second.r; + float dg = color.g-j->second.g; + float db = color.b-j->second.b; + float d_sq = dr*dr+dg*dg+db*db; + if(d_sqbest_d_sq) + { + best_color = color; + best_d_sq = min_d_sq; + } + } + train_colors[&train] = best_color; + + Allocation3D *alloc = new Allocation3D(layout_3d, train); + alloc->set_color(best_color); } void Engineer::sighandler(int sig) @@ -422,14 +350,10 @@ void Engineer::sighandler(int sig) { signal(sig, SIG_DFL); IO::print(IO::cerr, "Fatal signal received, terminating\n"); - const map &locos = control.get_locomotives(); - for(map::const_iterator i=locos.begin(); i!=locos.end(); ++i) - i->second->set_speed(0); - control.flush(); + layout.get_driver().halt(true); + layout.get_driver().flush(); raise(sig); } else if(sig==SIGTERM || sig==SIGINT) exit(0); } - -Application::RegApp Engineer::reg;