X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=fde251cfccd4c8f7afc7da6050b458a25439d159;hb=3c04e77e639e7b7fff995ceb9cc8c00da622d26e;hp=83164b5da169ba05aaf98876754208deec54b5b6;hpb=283542ae424b94786652fbf0c67b883b63a8e7a0;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index 83164b5..fde251c 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -1,21 +1,19 @@ /* $Id$ -This file is part of the MSP Märklin suite -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa +This file is part of R²C² +Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ #include #include #include -#include +#include #include #include #include #include #include -#include -#include #include #include #include @@ -26,29 +24,40 @@ Distributed under the GPL #include #include #include -#include "libmarklin/route.h" -#include "libmarklin/tracktype.h" +#include "libr2c2/route.h" +#include "libr2c2/tracktype.h" +#include "libr2c2/zone.h" #include "3d/path.h" #include "designer.h" #include "input.h" +#include "layoutbar.h" #include "manipulator.h" #include "measure.h" +#include "routebar.h" #include "selection.h" -#include "toolbar.h" +#include "svgexporter.h" +#include "trackbar.h" +#include "trackproperties.h" +#include "zonebar.h" +#include "zoneproperties.h" using namespace std; -using namespace Marklin; +using namespace R2C2; using namespace Msp; Application::RegApp Designer::reg; Designer::Designer(int argc, char **argv): window(1280, 960), + ui_res("r2c2.res"), + root(ui_res, window), base_object(0), cur_route(0), + cur_zone(0), mode(SELECT), - manipulator(*this, selection), + manipulator(*this, root, selection), measure(*this), + camera_ctl(*this, root, camera), track_wrap(*this, selection) { window.set_title("Railway Designer"); @@ -84,8 +93,6 @@ Designer::Designer(int argc, char **argv): } // Setup OpenGL - GL::enable(GL_CULL_FACE); - 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); @@ -111,35 +118,44 @@ Designer::Designer(int argc, char **argv): pass->depth_test = &GL::DepthTest::lequal(); pass->blend = &GL::Blend::alpha(); + pass = &pipeline->add_pass("overlay"); + pass->blend = &GL::Blend::alpha(); + camera.set_up_direction(GL::Vector3(0, 0, 1)); camera.set_look_direction(GL::Vector3(0, 0.5, -0.866)); // 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, window.get_height()-toolbar->get_geometry().h); - toolbar->set_focusable(false); - - GLtk::Panel *statusbar = new GLtk::Panel(ui_res); - root->add(*statusbar); + 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)); + + toolbars.push_back(new Layoutbar(*this)); + toolbars.push_back(new Trackbar(*this)); + toolbars.push_back(new Routebar(*this)); + toolbars.push_back(new Zonebar(*this)); + for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) + { + root.add(**i); + if(i!=toolbars.begin()) + (*i)->expand(false); + (*i)->signal_expanded.connect(sigc::hide(sigc::mem_fun(this, &Designer::arrange_toolbars))); + } + arrange_toolbars(); + + GLtk::Panel *statusbar = new GLtk::Panel; + root.add(*statusbar); statusbar->set_size(window.get_width(), 20); statusbar->set_focusable(false); - lbl_status = new GLtk::Label(ui_res); + lbl_status = new GLtk::Label; statusbar->add(*lbl_status); lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16)); - overlay = new Overlay3D(window, camera, ui_res.get_default_font()); + overlay = new Overlay3D(ui_res.get_default_font()); + pipeline->add_renderable_for_pass(*overlay, "overlay"); - camera_ctl = new CameraController(*this, *root, camera); - camera_ctl->view_all(); + camera_ctl.view_all(); const Layout3D::TrackMap &tracks = layout_3d->get_tracks(); for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) @@ -148,9 +164,9 @@ Designer::Designer(int argc, char **argv): Designer::~Designer() { - delete camera_ctl; + for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) + delete *i; delete overlay; - delete root; delete pipeline; delete base_object; delete layout_3d; @@ -180,57 +196,89 @@ void Designer::quit() void Designer::new_track() { + if(mode!=SELECT) + return; + mode = CATALOGUE; + lbl_status->set_text("Select new track or press Esc to cancel"); } -void Designer::set_turnout_id() +void Designer::erase_tracks() { - Track *track = selection.get_track(); - if(selection.size()==1 && track->get_type().is_turnout()) + if(mode!=SELECT) + return; + + set tracks = selection.get_tracks(); + selection.clear(); + for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) { - 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)); + overlay->clear(layout_3d->get_track(**i)); + delete *i; } } -void Designer::set_sensor_id() +void Designer::track_properties() { - 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(mode!=SELECT || selection.empty()) + return; - 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)); - } + TrackProperties *track_prop = new TrackProperties(selection); + root.add(*track_prop); + const GLtk::Geometry &root_geom = root.get_geometry(); + const GLtk::Geometry &dlg_geom = track_prop->get_geometry(); + track_prop->set_position((root_geom.w-dlg_geom.w)/2, (root_geom.h-dlg_geom.h)/2); + + track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response)); } -void Designer::rename_route() +void Designer::extend_track() { - if(!cur_route) + if(mode!=SELECT) return; - InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name()); - input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept)); + if(manipulator.start_extend()) + mode = MANIPULATE; +} + +void Designer::connect_tracks() +{ + if(mode!=SELECT) + return; + + manipulator.connect(); +} + +void Designer::flatten_tracks() +{ + if(mode!=SELECT) + return; + + manipulator.flatten(); +} + +void Designer::svg_export() +{ + InputDialog *input = new InputDialog(*this, "SVG export", FS::basepart(filename)+".svg"); + input->signal_accept.connect(sigc::mem_fun(this, &Designer::svg_export_accept)); } void Designer::edit_route(Route *r) { cur_route = r; - show_route(r); + cur_zone = 0; + if(cur_route) + show_route(*cur_route); + else + clear_paths(); +} + +void Designer::rename_route() +{ + if(mode!=SELECT || !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::add_selection_to_route() @@ -247,17 +295,56 @@ void Designer::add_selection_to_route() lbl_status->set_text(e.what()); } - show_route(cur_route); + show_route(*cur_route); +} + +void Designer::edit_zone(Zone *z) +{ + cur_zone = z; + cur_route = 0; + if(cur_zone) + show_zone(*cur_zone); + else + clear_paths(); +} + +void Designer::zone_properties() +{ + if(!cur_zone) + return; + + ZoneProperties *zone_prop = new ZoneProperties(*cur_zone); + root.add(*zone_prop); + const GLtk::Geometry &root_geom = root.get_geometry(); + const GLtk::Geometry &dlg_geom = zone_prop->get_geometry(); + zone_prop->set_position((root_geom.w-dlg_geom.w)/2, (root_geom.h-dlg_geom.h)/2); } -Point Designer::map_pointer_coords(int x, int y) +void Designer::add_selection_to_zone() +{ + if(!cur_zone) + return; + + try + { + cur_zone->add_tracks(selection.get_tracks()); + } + catch(const Exception &e) + { + lbl_status->set_text(e.what()); + } + + show_zone(*cur_zone); +} + +Vector Designer::map_pointer_to_ground(int x, int y) { 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(); - return Point(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z); + return Vector(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z); } void Designer::tick() @@ -266,9 +353,12 @@ void Designer::tick() float dt = (t-last_tick)/Msp::Time::sec; last_tick = t; - window.get_display().tick(); - root->tick(); - camera_ctl->tick(dt); + if(mode==MANIPULATE_DONE) + mode = SELECT; + + window.tick(); + root.tick(); + camera_ctl.tick(dt); for(list::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i) layout_3d->get_track(**i).get_path().set_mask(0); @@ -285,10 +375,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) mod = Input::mod_from_sys(mod); if(key==Msp::Input::KEY_N && (mod&Input::MOD_SHIFT)) - { - manipulator.start_extend(); - mode = MANIPULATE; - } + extend_track(); else if(key==Msp::Input::KEY_N) new_track(); else if(key==Msp::Input::KEY_G) @@ -335,16 +422,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) selection.clear(); } else if(key==Msp::Input::KEY_X) - { - 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; - } - } + erase_tracks(); else if(key==Msp::Input::KEY_F && (mod&Input::MOD_SHIFT)) { const set &tracks = selection.get_tracks(); @@ -361,19 +439,24 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) } } else if(key==Msp::Input::KEY_F) - manipulator.flatten(); + flatten_tracks(); 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) - set_turnout_id(); - else if(key==Msp::Input::KEY_S) - set_sensor_id(); else if(key==Msp::Input::KEY_A) - add_selection_to_route(); + { + if(cur_route) + add_selection_to_route(); + else if(cur_zone) + add_selection_to_zone(); + } else if(key==Msp::Input::KEY_C) - manipulator.connect(); + connect_tracks(); + else if(key==Msp::Input::KEY_V) + svg_export(); + else if(key==Msp::Input::KEY_P) + track_properties(); } void Designer::button_press(int x, int y, unsigned btn, unsigned mod) @@ -381,16 +464,16 @@ 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); + Vector ground = map_pointer_to_ground(x, y); if(mode==CATALOGUE) { if(btn==1) { - Track3D *ctrack = pick_track(x, y); + Track *ctrack = pick_track(x, y); if(ctrack) { - Track *track = new Track(*layout, ctrack->get_track().get_type()); + Track *track = new Track(*layout, ctrack->get_type()); track->set_position(ground); selection.clear(); @@ -406,17 +489,15 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned mod) { if(btn==1) { - Track3D *track = pick_track(x, y); + Track *track = pick_track(x, y); if(track) { if(!(mod&Input::MOD_SHIFT)) selection.clear(); - selection.toggle_track(&track->get_track()); + selection.toggle_track(track); } } } - else if(mode==MANIPULATE) - manipulator.button_press(x, y, ground.x, ground.y, btn); else if(mode==MEASURE) measure.button_press(x, y, ground.x, ground.y, btn); } @@ -425,10 +506,9 @@ void Designer::pointer_motion(int x, int y) { y = window.get_height()-y-1; - if(!root->get_child_at(x, y)) + if(!root.get_child_at(x, y)) { - Point ground = map_pointer_coords(x, y); - manipulator.pointer_motion(x, y, ground.x, ground.y); + Vector ground = map_pointer_to_ground(x, y); measure.pointer_motion(x, y, ground.x, ground.y); } } @@ -460,11 +540,6 @@ void Designer::render() else { pipeline->render_all(); - GL::enable(GL_CULL_FACE); - { - GL::Bind bind_blend(GL::Blend::alpha()); - overlay->render(0); - } GL::Bind bind_depth(GL::DepthTest::lequal()); if(mode==MEASURE) @@ -477,11 +552,11 @@ void Designer::render() GL::matrix_mode(GL::MODELVIEW); GL::load_identity(); - GL::disable(GL::DEPTH_TEST); - GL::Bind bind_blend(GL::Blend::alpha()); - root->render(); + root.render(); + // XXX Should fix GLtk so these would not be needed GL::Texture::unbind(); + glColor3f(1.0, 1.0, 1.0); } void Designer::track_added(Track &trk) @@ -496,19 +571,18 @@ void Designer::track_removed(Track &trk) new_tracks.erase(i); } -Track3D *Designer::pick_track(int x, int y) +Track *Designer::pick_track(int x, int y) { - Layout3D *l = layout_3d; + float xx = x*2.0/window.get_width()-1.0; + float yy = y*2.0/window.get_height()-1.0; if(mode==CATALOGUE) - l = cat_layout_3d; - - 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; - - apply_camera(); - - return l->pick_track(xx, yy, size); + return catalogue.get_layout().pick_track(Vector(0, 0, 1), Vector(xx*0.05523, yy*0.042421, -0.1)); + else + { + const GL::Vector3 &cpos = camera.get_position(); + GL::Vector4 cray = camera.unproject(GL::Vector4(xx, yy, 0, 0)); + return layout->pick_track(Vector(cpos.x, cpos.y, cpos.z), Vector(cray.x, cray.y, cray.z)); + } } void Designer::update_track_icon(Track3D &track) @@ -554,7 +628,7 @@ void Designer::manipulation_status(const string &status) void Designer::manipulation_done(bool) { - mode = SELECT; + mode = MANIPULATE_DONE; selection_changed(); } @@ -574,25 +648,22 @@ void Designer::measure_done() selection_changed(); } -void Designer::turnout_id_accept(const string &text) +void Designer::arrange_toolbars() { - Track *track = selection.get_track(); - unsigned id = (text.empty() ? 0 : lexical_cast(text)); - track->set_turnout_id(id); - - update_track_icon(layout_3d->get_track(*track)); + unsigned x = 0; + for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) + { + const GLtk::Geometry &geom = (*i)->get_geometry(); + (*i)->set_position(x, window.get_height()-geom.h); + x += geom.w; + } } -void Designer::sensor_id_accept(const string &text) +void Designer::track_properties_response(int) { 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); - update_track_icon(layout_3d->get_track(**i)); - } } void Designer::route_name_accept(const string &text) @@ -601,19 +672,24 @@ void Designer::route_name_accept(const string &text) cur_route->set_name(text); } +void Designer::svg_export_accept(const string &text) +{ + SvgExporter svg_exp(*layout); + svg_exp.save(text); +} + string Designer::tooltip(int x, int y) { - if(Track3D *t3d = pick_track(x, y)) + if(Track *track = pick_track(x, y)) { - const Track &track = t3d->get_track(); - const TrackType &ttype = track.get_type(); + 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()); + 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; } @@ -621,28 +697,44 @@ string Designer::tooltip(int x, int y) return string(); } -void Designer::show_route(const Route *route) +void Designer::clear_paths() { 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); - } + t3d.get_path().set_mask(0); + } +} + +void Designer::show_route(const Route &route) +{ + clear_paths(); + + const set &rtracks = route.get_tracks(); + for(set::iterator i=rtracks.begin(); i!=rtracks.end(); ++i) + { + Track3D &t3d = layout_3d->get_track(**i); + t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0)); + int path = -1; + if(unsigned tid = (*i)->get_turnout_id()) + path = route.get_turnout(tid); + if(path>=0) + t3d.get_path().set_path(path); else - t3d.get_path().set_mask(0); + t3d.get_path().set_mask((*i)->get_type().get_paths()); + } +} + +void Designer::show_zone(const Zone &zone) +{ + clear_paths(); + + const Zone::TrackSet &ztracks = zone.get_tracks(); + for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i) + { + Track3D &t3d = layout_3d->get_track(**i); + t3d.get_path().set_color(GL::Color(0.8, 1.0, 0.5)); + t3d.get_path().set_mask((*i)->get_type().get_paths()); } }