X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=308e5b2d4db0e80437a790ac7cbd1bf8ae38075c;hb=4d84248a4990e913a56f013e67a608ad9698233e;hp=d5f8495171daecd082a2e43d75670c0952335b49;hpb=aead7f2da831199fbb8f6950b067656b2965c2fa;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index d5f8495..308e5b2 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -1,8 +1,16 @@ +/* $Id$ + +This file is part of the MSP Märklin suite +Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa +Distributed under the GPL +*/ + #include #include #include #include #include +#include #include #include #include @@ -12,6 +20,9 @@ #include #include #include +#include +#include "libmarklin/except.h" +#include "libmarklin/tracktype.h" #include "engineer.h" #include "mainpanel.h" #include "trainpanel.h" @@ -21,26 +32,24 @@ using namespace std; using namespace Marklin; using namespace Msp; -#include - Engineer::Engineer(int argc, char **argv): screen_w(1280), screen_h(960), fullscreen(false), layout(catalogue), layout_3d(layout), - no_lighting(false), + server(0), placing_train(0), placing_block(0), placing_entry(0), - simulate(false), - train_prop(0), - train_prop_stale(false) + no_lighting(false), + simulate(false) { string res; - bool debug=false; - string device="/dev/ttyS0"; - unsigned quality=4; + bool debug = false; + string device = "/dev/ttyS0"; + unsigned quality = 4; + bool network = false; GetOpt getopt; getopt.add_option('r', "resolution", res, GetOpt::REQUIRED_ARG); @@ -49,6 +58,7 @@ Engineer::Engineer(int argc, char **argv): getopt.add_option('d', "device", device, GetOpt::REQUIRED_ARG); getopt.add_option('q', "quality", quality, GetOpt::REQUIRED_ARG); getopt.add_option('s', "simulate", simulate, GetOpt::NO_ARG); + getopt.add_option('n', "network", network, GetOpt::NO_ARG); getopt.add_option( "no-lighting", no_lighting, GetOpt::NO_ARG); getopt(argc, argv); @@ -56,8 +66,8 @@ Engineer::Engineer(int argc, char **argv): { 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); + screen_w = lexical_cast(m[1].str); + screen_h = lexical_cast(m[2].str); } else throw UsageError("Invalid resolution"); @@ -70,17 +80,27 @@ Engineer::Engineer(int argc, char **argv): layout_3d.set_quality(quality); - catalogue.load("tracks.dat"); + DataFile::load(catalogue, "tracks.dat"); + DataFile::load(catalogue, "locos.dat"); - const vector &args=getopt.get_args(); + const vector &args = getopt.get_args(); if(args.empty()) throw UsageError("No layout given"); - layout.load(args.front()); + DataFile::load(layout, args.front()); - trfc_mgr=new TrafficManager(control, layout); + trfc_mgr = new TrafficManager(control, layout); + if(FS::exists("engineer.state")) + DataFile::load(*trfc_mgr, "engineer.state"); + 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)); - const map &sensors=control.get_sensors(); + if(network) + { + server = new Server(*trfc_mgr); + 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)); @@ -89,57 +109,32 @@ Engineer::Engineer(int argc, char **argv): Engineer::~Engineer() { + if(!simulate) + trfc_mgr->save("engineer.state"); delete trfc_mgr; + delete server; } -Train *Engineer::add_train(unsigned addr) +void Engineer::place_train(Train &train) { - if(addr==0) - { - train_prop=new TrainProperties(*this, ui_res, 0); - root->add(*train_prop); - train_prop->signal_ok.connect(sigc::mem_fun(this, &Engineer::dismiss_train_prop)); - train_prop_stale=false; - train_prop->set_visible(true); - - return 0; - } - else - { - Locomotive *loco=new Locomotive(control, addr); - Train *train=new Train(*trfc_mgr, *loco); - train->set_name(format("Train %d", trfc_mgr->get_trains().size())); - - TrainPanel *tpanel=new TrainPanel(*this, ui_res, *train); - root->add(*tpanel); - int y=main_panel->get_geometry().y; - for(TrainPanelSeq::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); - - placing_train=train; - placing_block=0; - main_panel->set_status_text("Select location"); - - return train; - } + placing_train = &train; + placing_block = 0; + main_panel->set_status_text("Select location"); } int Engineer::main() { - dpy=new Graphics::Display; + dpy = new Graphics::Display; Graphics::WindowOptions wopt; - wopt.width=screen_w; - wopt.height=screen_h; - wopt.fullscreen=fullscreen; - wnd=new Graphics::Window(*dpy, wopt); + wopt.width = screen_w; + wopt.height = screen_h; + wopt.fullscreen = fullscreen; + wnd = new Graphics::Window(*dpy, wopt); Graphics::GLOptions glopt; - //glopt.multisample=4; - glc=new Graphics::GLContext(*wnd, glopt); + //glopt.multisample = 4; + glc = new Graphics::GLContext(*wnd, glopt); wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Engineer::exit), 0)); wnd->signal_button_press.connect(sigc::mem_fun(this, &Engineer::button_press)); @@ -153,26 +148,43 @@ int Engineer::main() glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - DataFile::load(ui_res, "engineer.res"); - root=new GLtk::Root(ui_res, *wnd); + DataFile::load(ui_res, "marklin.res"); + root = new GLtk::Root(ui_res, *wnd); root->set_visible(true); - list texs=ui_res.get_list(); + list texs = ui_res.get_list(); for(list::iterator i=texs.begin(); i!=texs.end(); ++i) { (*i)->set_min_filter(GL::NEAREST); (*i)->set_mag_filter(GL::NEAREST); } - main_panel=new MainPanel(*this, ui_res); + main_panel = new MainPanel(*this, ui_res); root->add(*main_panel); main_panel->set_position(0, screen_h-main_panel->get_geometry().h); main_panel->set_visible(true); + const list &trains = trfc_mgr->get_trains(); + int y = main_panel->get_geometry().y; + for(list::const_iterator i=trains.begin(); i!=trains.end(); ++i) + { + TrainPanel *tpanel = new TrainPanel(*this, ui_res, **i); + root->add(*tpanel); + tpanel->set_position(0, y-tpanel->get_geometry().h); + train_panels.push_back(tpanel); + tpanel->set_visible(true); + y -= tpanel->get_geometry().h; + } + + const list &blocks = trfc_mgr->get_blocks(); + for(list::const_iterator i=blocks.begin(); i!=blocks.end(); ++i) + reset_block_color(**i); + wnd->show(); Application::main(); + delete root; delete glc; delete wnd; delete dpy; @@ -186,6 +198,7 @@ void Engineer::tick() control.tick(); trfc_mgr->tick(); + event_disp.tick(Time::zero); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); @@ -199,10 +212,10 @@ void Engineer::tick() glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); float params[4]; - params[0]=0; - params[1]=-0.2; - params[2]=1; - params[3]=0; + params[0] = 0; + params[1] = -0.2; + params[2] = 1; + params[3] = 0; glLightfv(GL_LIGHT0, GL_POSITION, params); } @@ -213,26 +226,26 @@ void Engineer::tick() glDisable(GL_LIGHTING); glColor4f(1, 1, 1, 1); - const Track3DSeq <racks=layout_3d.get_tracks(); - for(Track3DSeq::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) + const list <racks = layout_3d.get_tracks(); + for(list::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) { - Track &track=(*i)->get_track(); + Track &track = (*i)->get_track(); if(track.get_turnout_id()) { - Turnout &trnt=control.get_turnout(track.get_turnout_id()); - (*i)->render_route(trnt.get_route()); + Turnout &trnt = control.get_turnout(track.get_turnout_id()); + (*i)->render_path(trnt.get_path()); } else - (*i)->render_route(-1); + (*i)->render_path(-1); } if(placing_train && placing_block) { GL::push_matrix(); - 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); + 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); @@ -241,18 +254,43 @@ void Engineer::tick() GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2)); imm.color(1.0f, 1.0f, 1.0f); imm.begin(GL::TRIANGLE_FAN); - imm.vertex(0.08, 0); - imm.vertex(0.05, 0.03); - imm.vertex(0.05, 0.01); - imm.vertex(0, 0.01); - imm.vertex(0, -0.01); - imm.vertex(0.05, -0.01); - imm.vertex(0.05, -0.03); + imm.vertex(0.08, 0); + imm.vertex(0.05, 0.03); + imm.vertex(0.05, 0.01); + imm.vertex(0, 0.01); + imm.vertex(0, -0.01); + imm.vertex(0.05, -0.01); + imm.vertex(0.05, -0.03); imm.end(); GL::pop_matrix(); } + const list &trains = trfc_mgr->get_trains(); + for(list::const_iterator i=trains.begin(); i!=trains.end(); ++i) + { + if(!(*i)->is_placed()) + continue; + + GL::PushMatrix _push; + + const Point &tp = (*i)->get_position(); + GL::translate(tp.x, tp.y, tp.z+0.02); + GL::Immediate imm((GL::COLOR4_UBYTE, GL::VERTEX2)); + imm.color(0.8f, 0.8f, 1.0f); + imm.begin(GL::TRIANGLE_FAN); + imm.vertex(0, 0); + for(unsigned j=0; j<=12; ++j) + imm.vertex(0.02*cos(j*M_PI/6), 0.02*sin(j*M_PI/6)); + imm.end(); + + GL::rotate(cam_rot*180/M_PI, 0, 0, 1); + GL::translate(0.03, -0.02, 0); + GL::scale_uniform(0.04); + ui_res.get_default_font().draw_string((*i)->get_name()); + GL::Texture::unbind(); + } + GL::matrix_mode(GL::PROJECTION); GL::load_identity(); GL::ortho_bottomleft(screen_w, screen_h); @@ -265,54 +303,50 @@ void Engineer::tick() root->render(); - if(train_prop_stale) - { - delete train_prop; - train_prop=0; - } - glc->swap_buffers(); } -void Engineer::key_press(unsigned key, unsigned mod, wchar_t ch) -{ - if(train_prop) - train_prop->key_press(key, mod, ch); -} - void Engineer::button_press(int x, int y, unsigned btn, unsigned) { if(placing_train) { - if(btn==1 && placing_block) + if(btn==1 && placing_block && !placing_block->get_train()) { - set_block_color(*placing_block, Color(1, 1, 1)); + set_block_color(*placing_block, GL::Color(1, 1, 1)); - placing_train->place(placing_block, placing_entry); - placing_train=0; + 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(); + const vector &endpoints = placing_block->get_endpoints(); + placing_entry = (placing_entry+1)%endpoints.size(); } } else { - Track3D *track=pick_track(x, screen_h-y-1); + Track3D *track = pick_track(x, screen_h-y-1); if(track) { if(unsigned tid=track->get_track().get_turnout_id()) { - Turnout &turnout=control.get_turnout(tid); - turnout.set_route(1-turnout.get_route()); + Turnout &turnout = control.get_turnout(tid); + try + { + 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()); + } } else if(simulate) { if(unsigned sid=track->get_track().get_sensor_id()) { - Sensor &sensor=control.get_sensor(sid); + Sensor &sensor = control.get_sensor(sid); control.signal_sensor_event.emit(sid, !sensor.get_state()); } } @@ -328,17 +362,17 @@ void Engineer::pointer_motion(int x, int y) { if(placing_train) { - Track3D *track=pick_track(x, screen_h-y-1); + Track3D *track = pick_track(x, screen_h-y-1); if(track && placing_train) { - Block &block=trfc_mgr->get_block_by_track(track->get_track()); + Block &block = trfc_mgr->get_block_by_track(track->get_track()); if(&block!=placing_block) { if(placing_block) - set_block_color(*placing_block, Color(1, 1, 1)); - placing_block=█ - placing_entry=0; - set_block_color(*placing_block, Color(0.5, 1, 0.7)); + reset_block_color(*placing_block); + placing_block = █ + placing_entry = 0; + set_block_color(*placing_block, GL::Color(0.5, 1, 0.7)); } } else if(track && track->get_track().get_turnout_id()) @@ -350,101 +384,100 @@ void Engineer::pointer_motion(int x, int y) void Engineer::view_all() { - const Track3DSeq &tracks=layout_3d.get_tracks(); + const list &tracks = layout_3d.get_tracks(); - cam_rot=0; - float best_height=-1; - float mid_x=0; - float mid_y=0; + cam_rot = 0; + float best_height = -1; + float mid_x = 0; + float mid_y = 0; for(float angle=0; angle::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { - Point minp,maxp; + 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); + 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); } - float width=max_x-min_x; - float height=max_y-min_y; - height=max(height, width); + float width = max_x-min_x; + float height = max_y-min_y; + height = max(height, width); if(height &tracks=block.get_tracks(); + const set &tracks = block.get_tracks(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - layout_3d.get_track(*i)->set_color(color); -} - -void Engineer::sensor_event(bool state, Sensor *sensor) -{ - const list <racks=layout_3d.get_tracks(); - for(list::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) - if((*i)->get_track().get_sensor_id()==sensor->get_address()) - { - Block &block=trfc_mgr->get_block_by_track((*i)->get_track()); - if(state) - (*i)->set_color(Color(1, 0.5, 0.3)); - else if(block.get_train()) - set_block_color(block, Color(1, 1, 0.3)); - else - (*i)->set_color(Color(1, 1, 1)); - } + layout_3d.get_track(**i).set_color(color); } -void Engineer::block_reserved(const Block &block, const Train *train) +void Engineer::reset_block_color(const Block &block) { if(unsigned sid=block.get_sensor_id()) { - Sensor &sensor=control.get_sensor(sid); + Sensor &sensor = control.get_sensor(sid); if(sensor.get_state()) + { + set_block_color(block, GL::Color(1, 0.5, 0.3)); return; + } } - if(train) - set_block_color(block, Color(1, 1, 0.3)); + if(block.get_train()) + set_block_color(block, GL::Color(1, 1, 0.3)); else - set_block_color(block, Color(1, 1, 1)); + set_block_color(block, GL::Color(1, 1, 1)); +} + +void Engineer::sensor_event(bool, Sensor *sensor) +{ + 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); } void Engineer::project_3d() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - //glFrustum(-0.055228, 0.055228, -0.041421, 0.041421, 0.1, 10); - glFrustum(-0.069036, 0.041421, -0.041421, 0.041421, 0.1, 10); + float offset = 200.0/screen_w*0.055228; + glFrustum(-0.055228-offset, 0.055228-offset, -0.041421, 0.041421, 0.1, 10); glMatrixMode(GL_MODELVIEW); } Track3D *Engineer::pick_track(int x, int y) { - float xx=((float)(x-(int)screen_w*5/8)/screen_h)*0.82843; - //float xx=((float)(x-(int)screen_w/2)/screen_h)*0.82843; - float yy=((float)y/screen_h-0.5)*0.82843; - float size=(float)4/screen_h*0.82843; + float xx = (static_cast(x-static_cast(screen_w)/2-100)/screen_h)*0.82843; + float yy = (static_cast(y)/screen_h-0.5)*0.82843; + float size = 4.0/screen_h*0.82843; project_3d(); glLoadIdentity(); @@ -454,9 +487,18 @@ Track3D *Engineer::pick_track(int x, int y) return layout_3d.pick_track(xx, yy, size); } -void Engineer::dismiss_train_prop() +void Engineer::train_added(Train &train) { - train_prop_stale=true; + 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); + + place_train(train); } Application::RegApp Engineer::reg;