X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=ea87df659d7e3a7b33ccff8ed519a866295cd993;hb=de09cba1d12af38ff2e7e4312d67624fe63bf0e4;hp=bb29591094fae7e8852f2438ada6eb39d8267fe6;hpb=78bc40c2d1a5fcc5715143bd2326716fbb143730;p=r2c2.git diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp index bb29591..ea87df6 100644 --- a/source/engineer/engineer.cpp +++ b/source/engineer/engineer.cpp @@ -1,14 +1,28 @@ +/* $Id$ + +This file is part of the MSP Märklin suite +Copyright © 2006-2008 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 "engineer.h" #include "mainpanel.h" #include "trainpanel.h" +#include "trainproperties.h" using namespace std; using namespace Marklin; @@ -23,7 +37,12 @@ Engineer::Engineer(int argc, char **argv): layout(catalogue), layout_3d(layout), no_lighting(false), - placing_train(0) + placing_train(0), + placing_block(0), + placing_entry(0), + simulate(false), + train_prop(0), + train_prop_stale(false) { string res; bool debug=false; @@ -36,6 +55,7 @@ Engineer::Engineer(int argc, char **argv): getopt.add_option('g', "debug", debug, GetOpt::NO_ARG); 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( "no-lighting", no_lighting, GetOpt::NO_ARG); getopt(argc, argv); @@ -58,73 +78,82 @@ Engineer::Engineer(int argc, char **argv): layout_3d.set_quality(quality); catalogue.load("tracks.dat"); + catalogue.load("locos.dat"); - const list &args=getopt.get_args(); + const vector &args=getopt.get_args(); if(args.empty()) throw UsageError("No layout given"); layout.load(args.front()); trfc_mgr=new TrafficManager(control, layout); + trfc_mgr->signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved)); - view_all(); - - /*const TrackSeq &tracks=layout.get_tracks(); + 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)); - for(TrackSeq::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - { - if(unsigned trnt_id=(*i)->get_turnout_id()) - { - Turnout *trnt=new Turnout(control, trnt_id); - trnt->signal_route_changed.connect(sigc::mem_fun(this, &Engineer::turnout_route_changed)); - } - if(unsigned sens_id=(*i)->get_sensor_id()) - { - Sensor *sens=new Sensor(control, sens_id); - sens->signal_state_changed.connect(sigc::bind(sigc::mem_fun(this, &Engineer::sensor_state_changed), sens_id)); - } - }*/ + view_all(); } Engineer::~Engineer() { + delete trfc_mgr; } -void Engineer::add_train(unsigned addr) +void Engineer::add_train() { - if(control.get_locomotive(addr)) - return; + 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); +} - Locomotive *loco=new Locomotive(control, addr); +Train *Engineer::add_train(const LocoType &type, unsigned addr) +{ + Locomotive *loco=new Locomotive(type, 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) + 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); - placing_train=train; + return train; +} + +void Engineer::place_train(Train &train) +{ + placing_train=&train; + placing_block=0; + main_panel->set_status_text("Select location"); } int Engineer::main() { - SDL_Init(SDL_INIT_VIDEO); - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4); - SDL_Surface *screen=SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0)); - if(!screen) - { - SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0); - screen=SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0)); - } - if(!screen) - { - SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0); - screen=SDL_SetVideoMode(screen_w, screen_h, 32, SDL_OPENGL|(fullscreen?SDL_FULLSCREEN:0)); - } - if(!screen) - throw Exception("Couldn't create window"); + dpy=new Graphics::Display; + + Graphics::WindowOptions 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); + + 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)); + wnd->signal_button_release.connect(sigc::mem_fun(this, &Engineer::button_release)); + wnd->signal_pointer_motion.connect(sigc::mem_fun(this, &Engineer::pointer_motion)); glEnableClientState(GL_VERTEX_ARRAY); glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE); @@ -133,60 +162,39 @@ int Engineer::main() glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - font=new GL::Font(); - if(screen_w>=1024) - { - font_size=20; - Parser::load(*font, "dejavu-20.font"); - } - else + DataFile::load(ui_res, "marklin.res"); + root=new GLtk::Root(ui_res, *wnd); + root->set_visible(true); + + list texs=ui_res.get_list(); + for(list::iterator i=texs.begin(); i!=texs.end(); ++i) { - font_size=12; - Parser::load(*font, "dejavu-12.font"); + (*i)->set_min_filter(GL::NEAREST); + (*i)->set_mag_filter(GL::NEAREST); } - Parser::load(ui_res, "engineer.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); - Application::main(); + wnd->show(); - delete font; - delete main_panel; + Application::main(); - SDL_Quit(); + delete glc; + delete wnd; + delete dpy; return exit_code; } void Engineer::tick() { - //cout<<"tick\n"; - - SDL_Event event; - while(SDL_PollEvent(&event)) - { - switch(event.type) - { - case SDL_MOUSEBUTTONDOWN: - button_press(event.button.x, screen_h-1-event.button.y, event.button.button); - break; - case SDL_MOUSEBUTTONUP: - button_release(event.button.x, screen_h-1-event.button.y, event.button.button); - break; - case SDL_MOUSEMOTION: - pointer_motion(event.motion.x, screen_h-1-event.motion.y); - break; - case SDL_KEYDOWN: - key_press(event.key.keysym.sym, event.key.keysym.mod); - break; - case SDL_QUIT: - exit(0); - break; - } - } + dpy->tick(); control.tick(); + trfc_mgr->tick(); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); @@ -214,122 +222,144 @@ 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(); if(track.get_turnout_id()) { - Turnout *trnt=control.get_turnout(track.get_turnout_id()); - if(trnt) - (*i)->render_route(trnt->get_route()); - else - (*i)->render_route(-1); + Turnout &trnt=control.get_turnout(track.get_turnout_id()); + (*i)->render_route(trnt.get_route()); } else (*i)->render_route(-1); } - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, screen_w, 0, screen_h, 0, 1); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + 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); + + GL::translate(pos.x, pos.y, pos.z+0.03); + GL::rotate(rot*180/M_PI+180, 0, 0, 1); + GL::Texture::unbind(); + + 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.end(); + + GL::pop_matrix(); + } + + GL::matrix_mode(GL::PROJECTION); + GL::load_identity(); + GL::ortho_bottomleft(screen_w, screen_h); + GL::matrix_mode(GL::MODELVIEW); + GL::load_identity(); glDisable(GL_DEPTH_TEST); glDisable(GL_LIGHTING); glDisable(GL_MULTISAMPLE); - main_panel->render(); - for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i) - (*i)->render(); + root->render(); - glLoadIdentity(); - glTranslatef(340, 10, 0); - glScalef(20, 20, 20); - glColor4f(1, 1, 1, 1); - font->draw_string(status_text); + if(train_prop_stale) + { + delete train_prop; + train_prop=0; + } - SDL_GL_SwapBuffers(); + glc->swap_buffers(); } -void Engineer::key_press(unsigned, unsigned) +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) +void Engineer::button_press(int x, int y, unsigned btn, unsigned) { - if(main_panel->get_geometry().is_inside(x, y)) + if(placing_train) { - main_panel->button_press(x, y, btn); - return; - } - for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i) - if((*i)->get_geometry().is_inside(x, y)) + if(btn==1 && placing_block && !placing_block->get_train()) { - (*i)->button_press(x, y, btn); - return; - } + set_block_color(*placing_block, GL::Color(1, 1, 1)); - Track3D *track=pick_track(x, y); - if(track) - { - if(placing_train) + placing_train->place(placing_block, placing_entry); + placing_train=0; + main_panel->set_status_text(string()); + } + else if(btn==3) { - Block *block=trfc_man->get_block_by_track(&track->get_track()); + const vector &endpoints=placing_block->get_endpoints(); + placing_entry=(placing_entry+1)%endpoints.size(); } - else + } + else + { + Track3D *track=pick_track(x, screen_h-y-1); + if(track) { - Turnout *turnout=control.get_turnout(track->get_track().get_turnout_id()); - if(turnout) - turnout->set_route(1-turnout->get_route()); + if(unsigned tid=track->get_track().get_turnout_id()) + { + Turnout &turnout=control.get_turnout(tid); + turnout.set_route(1-turnout.get_route()); + } + else if(simulate) + { + if(unsigned sid=track->get_track().get_sensor_id()) + { + Sensor &sensor=control.get_sensor(sid); + control.signal_sensor_event.emit(sid, !sensor.get_state()); + } + } } } } -void Engineer::button_release(int x, int y, unsigned btn) +void Engineer::button_release(int, int, unsigned, unsigned) { - if(main_panel->get_geometry().is_inside(x, y)) - { - main_panel->button_release(x, y, btn); - return; - } - for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i) - if((*i)->get_geometry().is_inside(x, y)) - { - (*i)->button_release(x, y, btn); - return; - } } void Engineer::pointer_motion(int x, int y) { - if(main_panel->get_geometry().is_inside(x, y)) + if(placing_train) { - main_panel->pointer_motion(x, y); - return; - } - for(TrainPanelSeq::iterator i=train_panels.begin(); i!=train_panels.end(); ++i) - if((*i)->get_geometry().is_inside(x, y)) + Track3D *track=pick_track(x, screen_h-y-1); + if(track && placing_train) { - (*i)->pointer_motion(x, y); - return; + 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)); + } } - - Track3D *track=pick_track(x, y); - if(track && track->get_track().get_turnout_id()) - { - ostringstream ss; - ss<<"Turnout "<get_track().get_turnout_id(); - status_text=ss.str(); + else if(track && track->get_track().get_turnout_id()) + main_panel->set_status_text(format("Turnout %d", track->get_track().get_turnout_id())); + else if(!placing_train) + main_panel->set_status_text(string()); } - else - status_text=""; } 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; @@ -341,9 +371,9 @@ void Engineer::view_all() float max_x=0; float min_y=0; float max_y=0; - for(Track3DSeq::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + for(list::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); @@ -371,38 +401,58 @@ void Engineer::view_all() cam_pos.z=max(best_height*1.05/0.82843, 0.15); } -void Engineer::turnout_route_changed(unsigned) +void Engineer::set_block_color(const Block &block, const GL::Color &color) { + 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_state_changed(bool state, unsigned addr) +void Engineer::reset_block_color(const Block &block) { - const Track3DSeq <racks=layout_3d.get_tracks(); - for(Track3DSeq::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) - if((*i)->get_track().get_sensor_id()==addr) + if(unsigned sid=block.get_sensor_id()) + { + Sensor &sensor=control.get_sensor(sid); + if(sensor.get_state()) { - if(state) - (*i)->set_color(Color(1, 0, 0)); - else - (*i)->set_color(Color(1, 1, 1)); + set_block_color(block, GL::Color(1, 0.5, 0.3)); + return; } + } + + 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) +{ + 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(); @@ -410,76 +460,11 @@ Track3D *Engineer::pick_track(int x, int y) glTranslatef(-cam_pos.x, -cam_pos.y, -cam_pos.z); return layout_3d.pick_track(xx, yy, size); +} - /*unsigned select_buf[1024]; - glSelectBuffer(1024, select_buf); - glRenderMode(GL_SELECT); - - //XXX Hardcoded values - float xn=((float)(x-800)/960)*0.082843; - float yn=((float)(y-480)/960)*0.082843; - float size=(float)4/960*0.082843; - - project_3d(); - glLoadIdentity(); - - double clip[4]; - clip[0]=0.1; - clip[1]=0; - clip[2]=xn-size; - clip[3]=0; - glClipPlane(GL_CLIP_PLANE0, clip); - glEnable(GL_CLIP_PLANE0); - - clip[0]=-0.1; - clip[2]=-(xn+size); - glClipPlane(GL_CLIP_PLANE1, clip); - glEnable(GL_CLIP_PLANE1); - - clip[0]=0; - clip[1]=0.1; - clip[2]=yn-size; - glClipPlane(GL_CLIP_PLANE2, clip); - glEnable(GL_CLIP_PLANE2); - - clip[1]=-0.1; - clip[2]=-(yn+size); - glClipPlane(GL_CLIP_PLANE3, clip); - glEnable(GL_CLIP_PLANE3); - - glRotatef(-cam_rot*180/M_PI, 0, 0, 1); - glTranslatef(-cam_pos.x, -cam_pos.y, -cam_pos.z); - - layout_3d.render(); - - glDisable(GL_CLIP_PLANE0); - glDisable(GL_CLIP_PLANE1); - glDisable(GL_CLIP_PLANE2); - glDisable(GL_CLIP_PLANE3); - - unsigned n_records=glRenderMode(GL_RENDER); - if(n_records) - { - Track *track=0; - unsigned i=0; - unsigned track_depth=numeric_limits::max(); - for(unsigned j=0; j Engineer::reg;