X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=cb327c560efeb51236169b369675d42b16c26798;hb=6e5d36dbc3f1e4a221d424fa7d57b07998df67a8;hp=25289093538f3a2722da62a3991a71aa5641a1a5;hpb=a861c2729a356173059177a0b800de2b31c9b49c;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index 2528909..cb327c5 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -25,7 +25,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" @@ -46,17 +48,13 @@ Designer::Designer(int argc, char **argv): mode(SELECT), manipulator(*this, selection), measure(*this), - input(0), camera_ctl(window, camera), - shift(false) + track_wrap(*this, selection) { window.set_title("Railway Designer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); - window.signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press)); - window.signal_key_release.connect(sigc::mem_fun(this, &Designer::key_release)); - window.signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press)); - window.signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion)); + 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)); @@ -70,6 +68,8 @@ Designer::Designer(int argc, char **argv): layout = new Layout(catalogue); layout_3d = new Layout3D(*layout); + layout->signal_track_added.connect(sigc::mem_fun(this, &Designer::track_added)); + if(argc>1) { filename = argv[1]; @@ -83,22 +83,32 @@ Designer::Designer(int argc, char **argv): } // Setup OpenGL - GL::enable(GL::DEPTH_TEST); - GL::enable(GL::BLEND); - GL::blend_func(GL::SRC_ALPHA, GL::ONE_MINUS_SRC_ALPHA); GL::enable(GL_CULL_FACE); pipeline = new GL::Pipeline(window.get_width(), window.get_height(), false); pipeline->set_camera(&camera); - pipeline->add_renderable(layout_3d->get_scene()); + 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"); light.set_position(0, -0.259, 0.966, 0); lighting.attach(0, light); - GL::PipelinePass *pass = &pipeline->add_pass(GL::Tag()); + GL::PipelinePass *pass = &pipeline->add_pass(0); + pass->lighting = &lighting; + pass->depth_test = &GL::DepthTest::lequal(); + + pass = &pipeline->add_pass("unlit"); + pass->depth_test = &GL::DepthTest::lequal(); + pass->blend = &GL::Blend::alpha(); + + pass = &pipeline->add_pass("blended"); pass->lighting = &lighting; + pass->depth_test = &GL::DepthTest::lequal(); + pass->blend = &GL::Blend::alpha(); camera.set_up_direction(GL::Vector3(0, 0, 1)); view_all(); @@ -106,29 +116,40 @@ Designer::Designer(int argc, char **argv): // Setup UI DataFile::load(ui_res, "marklin.res"); root = new GLtk::Root(ui_res, window); - - lbl_tooltip = new GLtk::Label(ui_res); - lbl_tooltip->set_style("tooltip"); - root->add(*lbl_tooltip); - lbl_tooltip->set_visible(false); + 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, window.get_height()-toolbar->get_geometry().h); - toolbar->set_visible(true); + 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); + + lbl_status = new GLtk::Label(ui_res); + statusbar->add(*lbl_status); + lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16)); overlay = new Overlay3D(window, camera, ui_res.get_default_font()); - const list &tracks = layout_3d->get_tracks(); - for(list::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - update_track_icon(**i); + 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 overlay; delete root; - delete layout; + delete pipeline; + delete base_object; delete layout_3d; + delete layout; delete cat_layout_3d; } @@ -143,10 +164,8 @@ int Designer::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() @@ -154,9 +173,59 @@ void Designer::quit() exit(0); } -void Designer::edit_route(Route &r) +void Designer::new_track() +{ + 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; + cur_route = r; + show_route(r); } void Designer::add_selection_to_route() @@ -166,14 +235,14 @@ 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); } Point Designer::map_pointer_coords(int x, int y) @@ -193,54 +262,25 @@ void Designer::tick() last_tick = t; window.get_display().tick(); + root->tick(); camera_ctl.tick(dt); - 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(); - 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()); - - set_tooltip(pointer_x, pointer_y, info); - } - else - clear_tooltip(); - - tooltip_timeout = Msp::Time::TimeStamp(); - } + for(list::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i) + layout_3d->get_track(**i).get_path().set_mask(0); + new_tracks.clear(); render(); 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; - - if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R) - shift = true; + key = Input::key_from_sys(key); + mod = Input::mod_from_sys(mod); if(key==Msp::Input::KEY_N) - mode = CATALOGUE; + new_track(); else if(key==Msp::Input::KEY_G) { manipulator.start_move(); @@ -261,14 +301,8 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t) 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(); - IO::print("Total length: %.1fm\n", len); - } + else if(key==Msp::Input::KEY_L && (mod&Input::MOD_SHIFT)) + selection.select_blocks(); else if(key==Msp::Input::KEY_L) selection.select_linked(); else if(key==Msp::Input::KEY_M) @@ -296,11 +330,12 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t) 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 <racks = layout->get_tracks(); @@ -317,64 +352,22 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t) } else if(key==Msp::Input::KEY_F) manipulator.flatten(); - else if(key==Msp::Input::KEY_E && (mod&1)) + 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(); else if(key==Msp::Input::KEY_T) - { - Track *track = selection.get_track(); - if(selection.size()==1 && track->get_type().get_n_paths()>1) - { - input = new ::Input(*this, "Turnout ID", lexical_cast(track->get_turnout_id())); - 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_paths()==1) - ok = true; - if(static_cast((*i)->get_sensor_id())!=id) - { - if(id==-1) - id = (*i)->get_sensor_id(); - else - id = -2; - } - } - if(ok) - { - input = new ::Input(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string())); - input->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(); } -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; -} - -void Designer::button_press(int x, int y, unsigned btn, unsigned) +void Designer::button_press(int x, int y, unsigned btn, unsigned mod) { y = window.get_height()-y-1; + mod = Input::mod_from_sys(mod); Point ground = map_pointer_coords(x, y); @@ -385,9 +378,8 @@ 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 *track = new Track(*layout, ctrack->get_track().get_type()); track->set_position(ground); - layout->add_track(*track); selection.clear(); selection.add_track(track); @@ -405,7 +397,7 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned) Track3D *track = pick_track(x, y); if(track) { - if(!shift) + if(!(mod&Input::MOD_SHIFT)) selection.clear(); selection.toggle_track(&track->get_track()); } @@ -421,15 +413,7 @@ void Designer::pointer_motion(int x, int y) { y = window.get_height()-y-1; - pointer_x = x; - pointer_y = y; - - if(mode==SELECT || mode==CATALOGUE) - tooltip_timeout = Msp::Time::now()+100*Msp::Time::msec; - - clear_tooltip(); - - if(mode!=INPUT) + if(!root->get_child_at(x, y)) { Point ground = map_pointer_coords(x, y); manipulator.pointer_motion(x, y, ground.x, ground.y); @@ -454,9 +438,7 @@ void Designer::apply_camera() void Designer::render() { - GL::clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); - GL::enable(GL::DEPTH_TEST); - GL::Texture::unbind(); + GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT); if(mode==CATALOGUE) { @@ -466,30 +448,13 @@ void Designer::render() else { pipeline->render_all(); - layout_3d->get_endpoint_scene().render(); GL::enable(GL_CULL_FACE); - GL::disable(GL::DEPTH_TEST); - overlay->render(0); - GL::enable(GL::DEPTH_TEST); - /*if(cur_route) { - 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 path = 0; - if(unsigned tid=(*i)->get_turnout_id()) - { - map::const_iterator j = turnouts.find(tid); - if(j!=turnouts.end()) - path = j->second; - } - layout_3d->get_track(**i).render_path(path); - } - }*/ + GL::Bind bind_blend(GL::Blend::alpha()); + overlay->render(0); + } - manipulator.render(); + GL::Bind bind_depth(GL::DepthTest::lequal()); if(mode==MEASURE) measure.render(); } @@ -502,7 +467,14 @@ void Designer::render() 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); } Track3D *Designer::pick_track(int x, int y) @@ -534,19 +506,37 @@ void Designer::update_track_icon(Track3D &track) } else if(unsigned tid = track.get_track().get_turnout_id()) { - overlay->add_graphic(track, "turnout"); - overlay->set_label(track, lexical_cast(tid)); + if(tid<0x800) + { + overlay->add_graphic(track, "turnout"); + overlay->set_label(track, lexical_cast(tid)); + } + } +} + +void Designer::selection_changed() +{ + const set &tracks = selection.get_tracks(); + if(tracks.empty()) + lbl_status->set_text(string()); + else + { + 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() @@ -556,68 +546,40 @@ void Designer::measure_changed() float d = sqrt(pard*pard+perpd*perpd); float adiff = measure.get_angle_difference()*180/M_PI; string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff); - set_tooltip(pointer_x, pointer_y, info); + lbl_status->set_text(info); } void Designer::measure_done() { mode = SELECT; + selection_changed(); } -void Designer::set_tooltip(int x, int y, const std::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(window.get_width())-w, x), 0); - y = max(min(static_cast(window.get_height())-h, y), 0); - lbl_tooltip->set_text(text); - lbl_tooltip->set_geometry(GLtk::Geometry(x, y, w, h)); - lbl_tooltip->set_visible(true); -} - -void Designer::clear_tooltip() -{ - lbl_tooltip->set_visible(false); -} - -void Designer::save_accept() -{ - layout->save(input->get_text()); - - input_dismiss(); -} - -void Designer::turnout_id_accept() +void Designer::turnout_id_accept(const string &text) { Track *track = selection.get_track(); - unsigned id = lexical_cast(input->get_text()); + unsigned id = (text.empty() ? 0 : lexical_cast(text)); track->set_turnout_id(id); update_track_icon(layout_3d->get_track(*track)); - - input_dismiss(); } -void Designer::sensor_id_accept() +void Designer::sensor_id_accept(const string &text) { const set &tracks = selection.get_tracks(); - unsigned id = lexical_cast(input->get_text()); + unsigned id = (text.empty() ? 0 : lexical_cast(text)); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { (*i)->set_sensor_id(id); update_track_icon(layout_3d->get_track(**i)); } - - input_dismiss(); } -void Designer::input_dismiss() +void Designer::route_name_accept(const string &text) { - delete input; - input = 0; - mode = SELECT; + if(cur_route) + cur_route->set_name(text); } void Designer::view_all() @@ -625,12 +587,12 @@ void Designer::view_all() Point minp; Point maxp; - const list &tracks = layout_3d->get_tracks(); - for(list::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + const Layout3D::TrackMap &tracks = layout_3d->get_tracks(); + for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { Point tmin; Point tmax; - (*i)->get_bounds(0, tmin, tmax); + i->second->get_bounds(0, tmin, tmax); minp.x = min(minp.x, tmin.x); minp.y = min(minp.y, tmin.y); maxp.x = max(maxp.x, tmax.x); @@ -644,3 +606,49 @@ void Designer::view_all() camera.set_position(GL::Vector3(center.x, center.y-cam_dist*0.5, cam_dist*0.866)); camera.set_look_direction(GL::Vector3(0, 0.5, -0.866)); } + +string Designer::tooltip(int x, int y) +{ + if(Track3D *t3d = pick_track(x, y)) + { + 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; + } + + return string(); +} + +void Designer::show_route(const Route *route) +{ + 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); + } +}