X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=83164b5da169ba05aaf98876754208deec54b5b6;hb=283542ae424b94786652fbf0c67b883b63a8e7a0;hp=c5c274edbda8ccd3163b7f81ff30d777aed6cb15;hpb=6109a2122226e1c71e9cc71e4c21036e99e43601;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index c5c274e..83164b5 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -1,14 +1,16 @@ /* $Id$ This file is part of the MSP Märklin suite -Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa +Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include +#include #include -#include #include +#include +#include #include #include #include @@ -24,7 +26,9 @@ Distributed under the GPL #include #include #include +#include "libmarklin/route.h" #include "libmarklin/tracktype.h" +#include "3d/path.h" #include "designer.h" #include "input.h" #include "manipulator.h" @@ -39,132 +43,134 @@ using namespace Msp; Application::RegApp Designer::reg; Designer::Designer(int argc, char **argv): - screen_w(1280), - screen_h(960), - base_mesh(0), + window(1280, 960), + base_object(0), cur_route(0), mode(SELECT), - input(0), - cam_yaw(M_PI/2), - cam_pitch(-M_PI/4), - cam_pos(0, -0.5, 0.5), - shift(false), - move_x(0), - move_y(0), - zoom(0), - rotate(0), - pitch(0) + manipulator(*this, selection), + measure(*this), + track_wrap(*this, selection) { - DataFile::load(catalogue, "tracks.dat"); + window.set_title("Railway Designer"); + window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); - cat_layout = new Layout(catalogue); - cat_layout_3d = new Layout3D(*cat_layout); + selection.signal_changed.connect(sigc::mem_fun(this, &Designer::selection_changed)); + manipulator.signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status)); + manipulator.signal_done.connect(sigc::mem_fun(this, &Designer::manipulation_done)); + measure.signal_changed.connect(sigc::mem_fun(this, &Designer::measure_changed)); + measure.signal_done.connect(sigc::mem_fun(this, &Designer::measure_done)); - const map &ctracks = catalogue.get_tracks(); - unsigned n = 0; - for(map::const_iterator i=ctracks.begin(); i!=ctracks.end(); ++i, ++n) - { - Track *track = new Track(*i->second); - track->set_position(Point((n%11)*0.1-0.5, 0.2-n/11*0.3, 0)); - track->set_rotation(M_PI/2); - cat_layout->add_track(*track); - } + // Setup catalogue and layout + DataFile::load(catalogue, "tracks.dat"); - manipulator = new Manipulator(*this); - manipulator->signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status)); - manipulator->signal_done.connect(sigc::mem_fun(this, &Designer::manipulation_done)); + cat_layout_3d = new Layout3D(catalogue.get_layout()); layout = new Layout(catalogue); layout_3d = new Layout3D(*layout); + layout->signal_track_added.connect(sigc::mem_fun(this, &Designer::track_added)); + layout->signal_track_removed.connect(sigc::mem_fun(this, &Designer::track_removed)); + if(argc>1) { filename = argv[1]; DataFile::load(*layout, argv[1]); - const list <racks = layout_3d->get_tracks(); - for(list::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i) - update_track_color(**i); if(!layout->get_base().empty()) { - base_mesh = new GL::Mesh; - DataFile::load(*base_mesh, layout->get_base()); + base_object = new GL::Object; + DataFile::load(*base_object, layout->get_base()); } } - selection = new Selection; - manipulator->set_selection(selection); + // Setup OpenGL + GL::enable(GL_CULL_FACE); - measure = new Measure(*this); - measure->signal_changed.connect(sigc::mem_fun(this, &Designer::measure_changed)); - measure->signal_done.connect(sigc::mem_fun(this, &Designer::measure_done)); -} + pipeline = new GL::Pipeline(window.get_width(), window.get_height(), false); + pipeline->set_camera(&camera); + pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0); + if(base_object) + pipeline->add_renderable(*base_object); + pipeline->add_renderable_for_pass(track_wrap, "unlit"); + pipeline->add_renderable_for_pass(layout_3d->get_path_scene(), "unlit"); + pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit"); -Designer::~Designer() -{ - delete manipulator; - delete selection; - delete layout; - delete layout_3d; - delete cat_layout; - delete cat_layout_3d; - delete measure; -} + light.set_position(0, -0.259, 0.966, 0); + lighting.attach(0, light); -int Designer::main() -{ - dpy = new Graphics::Display; - wnd = new Graphics::Window(*dpy, screen_w, screen_h); - glc = new Graphics::GLContext(*wnd); - wnd->set_title("Railway Designer"); + GL::PipelinePass *pass = &pipeline->add_pass(0); + pass->lighting = &lighting; + pass->depth_test = &GL::DepthTest::lequal(); - wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); - wnd->show(); + pass = &pipeline->add_pass("unlit"); + pass->depth_test = &GL::DepthTest::lequal(); + pass->blend = &GL::Blend::alpha(); - glEnableClientState(GL_VERTEX_ARRAY); - glEnable(GL_DEPTH_TEST); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnable(GL_CULL_FACE); + pass = &pipeline->add_pass("blended"); + pass->lighting = &lighting; + pass->depth_test = &GL::DepthTest::lequal(); + pass->blend = &GL::Blend::alpha(); - DataFile::load(ui_res, "marklin.res"); - root = new GLtk::Root(ui_res, *wnd); + camera.set_up_direction(GL::Vector3(0, 0, 1)); + camera.set_look_direction(GL::Vector3(0, 0.5, -0.866)); - lbl_tooltip = new GLtk::Label(ui_res); - lbl_tooltip->set_style("tooltip"); - root->add(*lbl_tooltip); - lbl_tooltip->set_visible(false); + // Setup UI + DataFile::load(ui_res, "marklin.res"); + root = new GLtk::Root(ui_res, window); + root->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press)); + root->signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press)); + root->signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion)); + root->signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip)); toolbar = new Toolbar(*this); root->add(*toolbar); - toolbar->set_position(0, screen_h-toolbar->get_geometry().h); - toolbar->set_visible(true); + toolbar->set_position(0, window.get_height()-toolbar->get_geometry().h); + toolbar->set_focusable(false); + GLtk::Panel *statusbar = new GLtk::Panel(ui_res); + root->add(*statusbar); + statusbar->set_size(window.get_width(), 20); + statusbar->set_focusable(false); - wnd->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press)); - wnd->signal_key_release.connect(sigc::mem_fun(this, &Designer::key_release)); - wnd->signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press)); - wnd->signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion)); + lbl_status = new GLtk::Label(ui_res); + statusbar->add(*lbl_status); + lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16)); - mode = SELECT; + overlay = new Overlay3D(window, camera, ui_res.get_default_font()); + + camera_ctl = new CameraController(*this, *root, camera); + camera_ctl->view_all(); - Application::main(); + const Layout3D::TrackMap &tracks = layout_3d->get_tracks(); + for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + update_track_icon(*i->second); +} +Designer::~Designer() +{ + delete camera_ctl; + delete overlay; delete root; + delete pipeline; + delete base_object; + delete layout_3d; + delete layout; + delete cat_layout_3d; +} - delete glc; - delete wnd; - delete dpy; +int Designer::main() +{ + window.show(); - return exit_code; + mode = SELECT; + + return Application::main(); } void Designer::save() { - input = new ::Input(*this, "Save layout", filename); - input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss)); - input->signal_accept.connect(sigc::mem_fun(this, &Designer::save_accept)); - mode = INPUT; + InputDialog *input = new InputDialog(*this, "Save layout", filename); + input->signal_accept.connect(sigc::mem_fun(layout, &Layout::save)); } void Designer::quit() @@ -172,9 +178,59 @@ void Designer::quit() exit(0); } -void Designer::edit_route(Route &r) +void Designer::new_track() { - cur_route = &r; + mode = CATALOGUE; +} + +void Designer::set_turnout_id() +{ + Track *track = selection.get_track(); + if(selection.size()==1 && track->get_type().is_turnout()) + { + InputDialog *input = new InputDialog(*this, "Turnout ID", lexical_cast(track->get_turnout_id())); + input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept)); + } +} + +void Designer::set_sensor_id() +{ + const set &tracks = selection.get_tracks(); + bool ok = false; + int id = -1; + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + { + if(!(*i)->get_type().is_turnout()) + ok = true; + if(static_cast((*i)->get_sensor_id())!=id) + { + if(id==-1) + id = (*i)->get_sensor_id(); + else + id = -2; + } + } + + if(ok) + { + InputDialog *input = new InputDialog(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string())); + input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept)); + } +} + +void Designer::rename_route() +{ + if(!cur_route) + return; + + InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name()); + input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept)); +} + +void Designer::edit_route(Route *r) +{ + cur_route = r; + show_route(r); } void Designer::add_selection_to_route() @@ -184,39 +240,24 @@ void Designer::add_selection_to_route() try { - const set &stracks = selection->get_tracks(); - set tracks(stracks.begin(), stracks.end()); - cur_route->add_tracks(tracks); + cur_route->add_tracks(selection.get_tracks()); } catch(const Exception &e) { - IO::print("%s\n", e.what()); + lbl_status->set_text(e.what()); } + + show_route(cur_route); } -void Designer::map_pointer_coords(int x, int y, float &gx, float &gy) +Point Designer::map_pointer_coords(int x, int y) { - float cos_pitch = cos(cam_pitch); - float sin_pitch = sin(cam_pitch); - float cos_yaw = cos(cam_yaw); - float sin_yaw = sin(cam_yaw); - - float rx = sin_yaw*0.55228; - float ry = -cos_yaw*0.55228; - - float ux = cos_yaw*-sin_pitch*0.41421; - float uy = sin_yaw*-sin_pitch*0.41421; - float uz = cos_pitch*0.41421; - - float xf = static_cast(x)*2/screen_w-1; - float yf = static_cast(y)*2/screen_h-1; + float xf = x*2.0/window.get_width()-1.0; + float yf = y*2.0/window.get_height()-1.0; + GL::Vector4 vec = camera.unproject(GL::Vector4(xf, yf, 0, 0)); + const GL::Vector3 &pos = camera.get_position(); - float vx = cos_yaw*cos_pitch + xf*rx + yf*ux; - float vy = sin_yaw*cos_pitch + xf*ry + yf*uy; - float vz = sin_pitch + yf*uz; - - gx = cam_pos.x-vx*cam_pos.z/vz; - gy = cam_pos.y-vy*cam_pos.z/vz; + return Point(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z); } void Designer::tick() @@ -225,162 +266,88 @@ void Designer::tick() float dt = (t-last_tick)/Msp::Time::sec; last_tick = t; - dpy->tick(); + window.get_display().tick(); + root->tick(); + camera_ctl->tick(dt); - if(move_y) - { - cam_pos.x += cos(cam_yaw)*dt*move_y; - cam_pos.y += sin(cam_yaw)*dt*move_y; - } - if(move_x) - { - cam_pos.x += sin(cam_yaw)*dt*move_x; - cam_pos.y += -cos(cam_yaw)*dt*move_x; - } - if(zoom) - { - cam_pos.x += cos(cam_yaw)*cos(cam_pitch)*dt*zoom; - cam_pos.y += sin(cam_yaw)*cos(cam_pitch)*dt*zoom; - cam_pos.z += sin(cam_pitch)*dt*zoom; - } - if(rotate) - { - float vx = cos(cam_yaw)*cos(cam_pitch); - float vy = sin(cam_yaw)*cos(cam_pitch); - float vz = sin(cam_pitch); - - float gx = cam_pos.x-vx*cam_pos.z/vz; - float gy = cam_pos.y-vy*cam_pos.z/vz; - float d = sqrt(vx*vx+vy*vy)*cam_pos.z/vz; - - cam_yaw += M_PI*dt*rotate; - if(cam_yaw>M_PI*2) - cam_yaw -= M_PI*2; - else if(cam_yaw<0) - cam_yaw += M_PI*2; - - cam_pos.x = gx+cos(cam_yaw)*d; - cam_pos.y = gy+sin(cam_yaw)*d; - } - if(pitch) - { - cam_pitch += M_PI/2*dt*pitch; - if(cam_pitch>M_PI/12) - cam_pitch = M_PI/12; - else if(cam_pitch<-M_PI/2) - cam_pitch = -M_PI/2; - } - - if(tooltip_timeout && t>tooltip_timeout) - { - Track3D *t3d = 0; - - if(mode==CATALOGUE) - t3d = pick_track(pointer_x, pointer_y); - else - t3d = pick_track(pointer_x, pointer_y); - - if(t3d) - { - const Track &track = t3d->get_track(); - const TrackType &ttype = track.get_type(); - ostringstream ss; - ss.precision(2); - ss<1e-4) - ss<<" (slope "<::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i) + layout_3d->get_track(**i).get_path().set_mask(0); + new_tracks.clear(); render(); - glc->swap_buffers(); + window.swap_buffers(); } -void Designer::key_press(unsigned code, unsigned mod, wchar_t) +void Designer::key_press(unsigned key, unsigned mod, wchar_t) { - unsigned key = Msp::Input::key_from_sys(code); - - if(mode==INPUT) - return; + key = Input::key_from_sys(key); + mod = Input::mod_from_sys(mod); - if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R) - shift = true; - - if(key==Msp::Input::KEY_N) - mode = CATALOGUE; + if(key==Msp::Input::KEY_N && (mod&Input::MOD_SHIFT)) + { + manipulator.start_extend(); + mode = MANIPULATE; + } + else if(key==Msp::Input::KEY_N) + new_track(); else if(key==Msp::Input::KEY_G) { - manipulator->start_move(); + manipulator.start_move(); mode = MANIPULATE; } else if(key==Msp::Input::KEY_R) { - manipulator->start_rotate(); + manipulator.start_rotate(); mode = MANIPULATE; } else if(key==Msp::Input::KEY_D) { - manipulator->duplicate(); - manipulator->start_move(); + manipulator.duplicate(); + manipulator.start_move(); mode = MANIPULATE; } else if(key==Msp::Input::KEY_W) save(); else if(key==Msp::Input::KEY_PLUS) - selection->select_more(); - else if(key==Msp::Input::KEY_L && (mod&1)) - { - const set &tracks = layout->get_tracks(); - float len = 0; - for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - len += (*i)->get_type().get_total_length(); - cout<<"Total length: "<select_linked(); + selection.select_linked(); else if(key==Msp::Input::KEY_M) { - measure->start(); + measure.start(); mode = MEASURE; } else if(key==Msp::Input::KEY_Z) { - manipulator->start_elevate(); + manipulator.start_elevate(); mode = MANIPULATE; } else if(key==Msp::Input::KEY_ESC) { if(mode==MANIPULATE) - manipulator->cancel(); + manipulator.cancel(); else if(mode==CATALOGUE) mode = SELECT; else - selection->clear(); + selection.clear(); } else if(key==Msp::Input::KEY_X) { - set tracks = selection->get_tracks(); - selection->clear(); + set tracks = selection.get_tracks(); + selection.clear(); for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) { + overlay->clear(layout_3d->get_track(**i)); layout->remove_track(**i); delete *i; } } - else if(key==Msp::Input::KEY_F && (mod&1)) + else if(key==Msp::Input::KEY_F && (mod&Input::MOD_SHIFT)) { - const set &tracks = selection->get_tracks(); + const set &tracks = selection.get_tracks(); const set <racks = layout->get_tracks(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { @@ -390,107 +357,31 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t) if(*j!=*i) (*i)->snap_to(**j, true); - update_track_color(layout_3d->get_track(**i)); + update_track_icon(layout_3d->get_track(**i)); } } else if(key==Msp::Input::KEY_F) - manipulator->flatten(); - else if(key==Msp::Input::KEY_E && (mod&1)) - manipulator->even_slope(true); + manipulator.flatten(); + else if(key==Msp::Input::KEY_E && (mod&Input::MOD_SHIFT)) + manipulator.even_slope(true); else if(key==Msp::Input::KEY_E) - manipulator->even_slope(); + manipulator.even_slope(); else if(key==Msp::Input::KEY_T) - { - Track *track = selection->get_track(); - if(selection->size()==1 && track->get_type().get_n_routes()>1) - { - ostringstream ss; - ss<get_turnout_id(); - input = new ::Input(*this, "Turnout ID", ss.str()); - input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss)); - input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept)); - mode = INPUT; - } - } + set_turnout_id(); else if(key==Msp::Input::KEY_S) - { - const set &tracks = selection->get_tracks(); - bool ok = false; - int id = -1; - for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - { - if((*i)->get_type().get_n_routes()==1) - ok = true; - if(static_cast((*i)->get_sensor_id())!=id) - { - if(id==-1) - id = (*i)->get_sensor_id(); - else - id = -2; - } - } - if(ok) - { - ostringstream ss; - if(id>=0) - ss<signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss)); - input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept)); - mode = INPUT; - } - } + set_sensor_id(); else if(key==Msp::Input::KEY_A) add_selection_to_route(); - else if(key==Msp::Input::KEY_RIGHT) - rotate = -1; - else if(key==Msp::Input::KEY_LEFT) - rotate = 1; - else if(key==Msp::Input::KEY_UP) - move_y = 1; - else if(key==Msp::Input::KEY_DOWN) - move_y = -1; - else if(key==Msp::Input::KEY_INSERT) - zoom = -1; - else if(key==Msp::Input::KEY_PGUP) - zoom = 1; - else if(key==Msp::Input::KEY_HOME) - pitch = 1; - else if(key==Msp::Input::KEY_END) - pitch = -1; - else if(key==Msp::Input::KEY_DELETE) - move_x = -1; - else if(key==Msp::Input::KEY_PGDN) - move_x = 1; -} - -void Designer::key_release(unsigned code, unsigned) -{ - unsigned key = Msp::Input::key_from_sys(code); - - if(mode==INPUT) - return; - - if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R) - shift = false; - else if(key==Msp::Input::KEY_RIGHT || key==Msp::Input::KEY_LEFT) - rotate = 0; - else if(key==Msp::Input::KEY_UP || key==Msp::Input::KEY_DOWN) - move_y = 0; - else if(key==Msp::Input::KEY_INSERT || key==Msp::Input::KEY_PGUP) - zoom = 0; - else if(key==Msp::Input::KEY_HOME || key==Msp::Input::KEY_END) - pitch = 0; - else if(key==Msp::Input::KEY_DELETE || key==Msp::Input::KEY_PGDN) - move_x = 0; + else if(key==Msp::Input::KEY_C) + manipulator.connect(); } -void Designer::button_press(int x, int y, unsigned btn, unsigned) +void Designer::button_press(int x, int y, unsigned btn, unsigned mod) { - y = screen_h-y-1; + y = window.get_height()-y-1; + mod = Input::mod_from_sys(mod); - float gx, gy; - map_pointer_coords(x, y, gx, gy); + Point ground = map_pointer_coords(x, y); if(mode==CATALOGUE) { @@ -499,12 +390,11 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned) Track3D *ctrack = pick_track(x, y); if(ctrack) { - Track *track = ctrack->get_track().copy(); - track->set_position(Point(gx, gy, 0)); - layout->add_track(*track); + Track *track = new Track(*layout, ctrack->get_track().get_type()); + track->set_position(ground); - selection->clear(); - selection->add_track(track); + selection.clear(); + selection.add_track(track); mode = SELECT; } @@ -519,108 +409,91 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned) Track3D *track = pick_track(x, y); if(track) { - if(!shift) - selection->clear(); - selection->toggle_track(&track->get_track()); + if(!(mod&Input::MOD_SHIFT)) + selection.clear(); + selection.toggle_track(&track->get_track()); } } } else if(mode==MANIPULATE) - manipulator->button_press(x, y, gx, gy, btn); + manipulator.button_press(x, y, ground.x, ground.y, btn); else if(mode==MEASURE) - measure->button_press(x, y, gx, gy, btn); + measure.button_press(x, y, ground.x, ground.y, btn); } void Designer::pointer_motion(int x, int y) { - y = screen_h-y-1; - - pointer_x = x; - pointer_y = y; - - if(mode==SELECT || mode==CATALOGUE) - tooltip_timeout = Msp::Time::now()+100*Msp::Time::msec; - - clear_tooltip(); + y = window.get_height()-y-1; - if(mode!=INPUT) + if(!root->get_child_at(x, y)) { - float gx, gy; - map_pointer_coords(x, y, gx, gy); - manipulator->pointer_motion(x, y, gx, gy); - measure->pointer_motion(x, y, gx, gy); + Point ground = map_pointer_coords(x, y); + manipulator.pointer_motion(x, y, ground.x, ground.y); + measure.pointer_motion(x, y, ground.x, ground.y); } } -void Designer::project_3d() -{ - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glFrustum(-0.055228, 0.055228, -0.041421, 0.041421, 0.1, 10); - glMatrixMode(GL_MODELVIEW); -} - void Designer::apply_camera() { - glLoadIdentity(); if(mode==CATALOGUE) - glTranslatef(0, 0, -1); - else { - glRotatef(-cam_pitch*180/M_PI-90, 1, 0, 0); - glRotatef(90-cam_yaw*180/M_PI, 0, 0, 1); - glTranslatef(-cam_pos.x, -cam_pos.y, -cam_pos.z); + GL::matrix_mode(GL::PROJECTION); + GL::load_identity(); + GL::frustum_centered(0.11046, 0.082843, 0.1, 10); + GL::matrix_mode(GL::MODELVIEW); + GL::load_identity(); + GL::translate(0, 0, -1); } + else + camera.apply(); } void Designer::render() { - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); - GL::enable(GL::DEPTH_TEST); + GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); - project_3d(); - apply_camera(); if(mode==CATALOGUE) - cat_layout_3d->render(); + { + apply_camera(); + cat_layout_3d->get_scene().render(); + } else { - if(base_mesh) - { - GL::Texture::unbind(); - base_mesh->draw(); - } - layout_3d->render(true); - if(cur_route) + pipeline->render_all(); + GL::enable(GL_CULL_FACE); { - glColor4f(0.5, 0.8, 1.0, 1.0); - const set &rtracks = cur_route->get_tracks(); - const map &turnouts = cur_route->get_turnouts(); - for(set::const_iterator i=rtracks.begin(); i!=rtracks.end(); ++i) - { - unsigned route = 0; - if(unsigned tid=(*i)->get_turnout_id()) - { - map::const_iterator j = turnouts.find(tid); - if(j!=turnouts.end()) - route = j->second; - } - layout_3d->get_track(**i).render_route(route); - } + GL::Bind bind_blend(GL::Blend::alpha()); + overlay->render(0); } - manipulator->render(); + + GL::Bind bind_depth(GL::DepthTest::lequal()); if(mode==MEASURE) - measure->render(); + measure.render(); } GL::matrix_mode(GL::PROJECTION); GL::load_identity(); - GL::ortho_bottomleft(screen_w, screen_h); + GL::ortho_bottomleft(window.get_width(), window.get_height()); GL::matrix_mode(GL::MODELVIEW); GL::load_identity(); GL::disable(GL::DEPTH_TEST); + GL::Bind bind_blend(GL::Blend::alpha()); root->render(); + GL::Texture::unbind(); +} + +void Designer::track_added(Track &trk) +{ + new_tracks.push_back(&trk); +} + +void Designer::track_removed(Track &trk) +{ + list::iterator i = find(new_tracks.begin(), new_tracks.end(), &trk); + if(i!=new_tracks.end()) + new_tracks.erase(i); } Track3D *Designer::pick_track(int x, int y) @@ -629,112 +502,147 @@ Track3D *Designer::pick_track(int x, int y) if(mode==CATALOGUE) l = cat_layout_3d; - float xx = (static_cast(x-static_cast(screen_w)/2)/screen_h)*0.82843; - float yy = (static_cast(y)/screen_h-0.5)*0.82843; - float size = 4.0/screen_h*0.82843; + float xx = ((float(x)-window.get_width()/2)/window.get_height())*0.82843; + float yy = (float(y)/window.get_height()-0.5)*0.82843; + float size = 4.0/window.get_height()*0.82843; - project_3d(); apply_camera(); return l->pick_track(xx, yy, size); } -void Designer::update_track_color(Track3D &track) +void Designer::update_track_icon(Track3D &track) { - if(track.get_track().get_sensor_id()) + overlay->clear(track); + + if(track.get_track().get_flex()) + overlay->add_graphic(track, "flex"); + + if(unsigned sid = track.get_track().get_sensor_id()) { - if(track.get_track().get_flex()) - track.set_color(GL::Color(1, 0.6, 1)); - else - track.set_color(GL::Color(0.7, 0.7, 1)); + overlay->add_graphic(track, "sensor"); + overlay->set_label(track, lexical_cast(sid)); + } + else if(unsigned tid = track.get_track().get_turnout_id()) + { + if(tid<0x800) + { + overlay->add_graphic(track, "turnout"); + overlay->set_label(track, lexical_cast(tid)); + } } - else if(track.get_track().get_turnout_id()) - track.set_color(GL::Color(0.8, 1, 0.8)); - else if(track.get_track().get_flex()) - track.set_color(GL::Color(1, 0.8, 0.8)); +} + +void Designer::selection_changed() +{ + const set &tracks = selection.get_tracks(); + if(tracks.empty()) + lbl_status->set_text(string()); else - track.set_color(GL::Color(1, 1, 1)); + { + float len = 0; + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + len += (*i)->get_type().get_total_length(); + lbl_status->set_text(format("%.2fm of track selected\n", len)); + } } void Designer::manipulation_status(const string &status) { - set_tooltip(pointer_x, pointer_y, status); + lbl_status->set_text(status); } void Designer::manipulation_done(bool) { mode = SELECT; + selection_changed(); } void Designer::measure_changed() { - float pard = measure->get_parallel_distance()*1000; - float perpd = measure->get_perpendicular_distance()*1000; + float pard = measure.get_parallel_distance()*1000; + float perpd = measure.get_perpendicular_distance()*1000; float d = sqrt(pard*pard+perpd*perpd); - float adiff = measure->get_angle_difference()*180/M_PI; - ostringstream ss; - ss.precision(3); - ss<<"Par "<set_text(info); } void Designer::measure_done() { mode = SELECT; + selection_changed(); } -void Designer::set_tooltip(int x, int y, const std::string &text) +void Designer::turnout_id_accept(const string &text) { - int fontsize = ui_res.get_default_font().get_default_size(); - int h = fontsize+6; - int w = static_cast(ui_res.get_default_font().get_string_width(text)*fontsize)+6; - x = max(min(static_cast(screen_w)-w, x), 0); - y = max(min(static_cast(screen_h)-h, y), 0); - lbl_tooltip->set_text(text); - lbl_tooltip->set_geometry(GLtk::Geometry(x, y, w, h)); - lbl_tooltip->set_visible(true); -} + Track *track = selection.get_track(); + unsigned id = (text.empty() ? 0 : lexical_cast(text)); + track->set_turnout_id(id); -void Designer::clear_tooltip() -{ - lbl_tooltip->set_visible(false); + update_track_icon(layout_3d->get_track(*track)); } -void Designer::save_accept() +void Designer::sensor_id_accept(const string &text) { - layout->save(input->get_text()); + const set &tracks = selection.get_tracks(); + unsigned id = (text.empty() ? 0 : lexical_cast(text)); + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + { + (*i)->set_sensor_id(id); - input_dismiss(); + update_track_icon(layout_3d->get_track(**i)); + } } -void Designer::turnout_id_accept() +void Designer::route_name_accept(const string &text) { - Track *track = selection->get_track(); - unsigned id = lexical_cast(input->get_text()); - track->set_turnout_id(id); - - update_track_color(layout_3d->get_track(*track)); - - input_dismiss(); + if(cur_route) + cur_route->set_name(text); } -void Designer::sensor_id_accept() +string Designer::tooltip(int x, int y) { - const set &tracks = selection->get_tracks(); - unsigned id = lexical_cast(input->get_text()); - for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + if(Track3D *t3d = pick_track(x, y)) { - (*i)->set_sensor_id(id); - - update_track_color(layout_3d->get_track(**i)); + const Track &track = t3d->get_track(); + const TrackType &ttype = track.get_type(); + string info = format("%d %s", ttype.get_article_number(), ttype.get_description()); + if(mode!=CATALOGUE && abs(track.get_slope())>1e-4) + info += format(" (slope %.1f%%)", abs(track.get_slope()/ttype.get_total_length()*100)); + if(track.get_turnout_id()) + info += format(" (turnout %d)", track.get_turnout_id()); + else if(track.get_sensor_id()) + info += format(" (sensor %d)", track.get_sensor_id()); + + return info; } - input_dismiss(); + return string(); } -void Designer::input_dismiss() +void Designer::show_route(const Route *route) { - delete input; - input = 0; - mode = SELECT; + const set <racks = layout->get_tracks(); + for(set::iterator i=ltracks.begin(); i!=ltracks.end(); ++i) + { + Track3D &t3d = layout_3d->get_track(**i); + if(route && route->has_track(**i)) + { + t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0)); + if((*i)->get_type().is_turnout()) + { + unsigned tid = (*i)->get_turnout_id(); + int path = (tid ? route->get_turnout(tid) : -1); + if(path>=0) + t3d.get_path().set_path(path); + else + t3d.get_path().set_mask((*i)->get_type().get_paths()); + } + else + t3d.get_path().set_path(0); + } + else + t3d.get_path().set_mask(0); + } }