X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=30b022f8597e12e8e539d6b247d8e38d92728b9c;hb=05b95b6b6b095821f1e79dabed802b853c296c9d;hp=61f0d9c00fb495ca08b98ec6654858a2c550d0b4;hpb=107a7f787d406f1f664c4986557f9a896e0845ea;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index 61f0d9c..30b022f 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -21,12 +21,18 @@ #include "libr2c2/zone.h" #include "3d/path.h" #include "designer.h" +#include "elevatetool.h" +#include "extendtool.h" #include "input.h" #include "layoutbar.h" #include "manipulator.h" #include "measure.h" +#include "movetool.h" +#include "objectselecttool.h" +#include "rotatetool.h" #include "routebar.h" #include "selection.h" +#include "slopetool.h" #include "svgexporter.h" #include "trackbar.h" #include "trackproperties.h" @@ -46,20 +52,13 @@ Designer::Designer(int argc, char **argv): base_object(0), cur_route(0), cur_zone(0), - mode(SELECT), + mode(TOOL), sel_wrap(selection), - manipulator(*this, mouse, selection), - measure(*this) + cur_tool(0) { window.set_title("Railway Designer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); - 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)); - // Setup catalogue and layout DataFile::load(catalogue, "tracks.dat"); @@ -68,9 +67,6 @@ Designer::Designer(int argc, char **argv): layout = new Layout(catalogue); layout_3d = new Layout3D(*layout); - layout->signal_object_added.connect(sigc::mem_fun(this, &Designer::object_added)); - layout->signal_object_removed.connect(sigc::mem_fun(this, &Designer::object_removed)); - if(argc>1) { filename = argv[1]; @@ -109,7 +105,6 @@ Designer::Designer(int argc, char **argv): // Setup UI keyboard.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::key_press), false)); mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::button_press), false)); - mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::axis_motion), false)); root.signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip)); root_layout = new GLtk::Layout; root_layout->set_margin(0); @@ -147,16 +142,15 @@ Designer::Designer(int argc, char **argv): pipeline->add_renderable_for_pass(sel_wrap, "unlit"); overlay = new Overlay3D(ui_res.get_default_font()); pipeline->add_renderable_for_pass(*overlay, "overlay"); - pipeline->add_renderable_for_pass(measure, "unlit"); camera_ctl = new CameraController(*main_view, keyboard, mouse); cat_view->get_camera().set_look_direction(GL::Vector3(0, 0.13053, -0.99144)); cat_view->view_all(true); main_view->view_all(); - 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); + const set &tracks = layout->get_all(); + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + update_track_icon(layout_3d->get_3d(**i)); } Designer::~Designer() @@ -177,7 +171,7 @@ int Designer::main() { window.show(); - mode = SELECT; + use_select_tool(); return Application::main(); } @@ -197,8 +191,7 @@ void Designer::quit() void Designer::new_track() { - if(mode!=SELECT) - return; + use_select_tool(); mode = CATALOGUE; lbl_status->set_text("Select new track or press Esc to cancel"); @@ -206,21 +199,21 @@ void Designer::new_track() void Designer::erase_tracks() { - if(mode!=SELECT) - return; + use_select_tool(); set tracks = selection.get_objects(); selection.clear(); for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) { - overlay->clear(layout_3d->get_track(**i)); + overlay->clear(layout_3d->get_3d(**i)); delete *i; } } void Designer::track_properties() { - if(mode!=SELECT || selection.empty()) + use_select_tool(); + if(selection.empty()) return; TrackProperties *track_prop = new TrackProperties(selection); @@ -232,27 +225,17 @@ void Designer::track_properties() void Designer::extend_track() { - if(mode!=SELECT) - return; - - if(manipulator.start_extend()) - mode = MANIPULATE; + use_tool_with_selected_objects(); } void Designer::connect_tracks() { - if(mode!=SELECT) - return; - - manipulator.connect(); + use_tool_with_selected_objects()->connect(); } void Designer::flatten_tracks() { - if(mode!=SELECT) - return; - - manipulator.flatten(); + use_tool_with_selected_objects()->flatten(); } void Designer::svg_export() @@ -275,7 +258,8 @@ void Designer::edit_route(Route *r) void Designer::rename_route() { - if(mode!=SELECT || !cur_route) + use_select_tool(); + if(!cur_route) return; InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name()); @@ -354,17 +338,16 @@ void Designer::tick() float dt = (t-last_tick)/Msp::Time::sec; last_tick = t; - if(mode==MANIPULATE_DONE) - mode = SELECT; + if(cur_tool && cur_tool->is_done()) + { + cur_tool->update_selection(selection); + use_select_tool(); + } 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); - new_tracks.clear(); - render(); window.swap_buffers(); @@ -375,51 +358,39 @@ void Designer::key_press(unsigned key) bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R); if(key==Msp::Input::KEY_N && shift) - extend_track(); + use_tool_with_selected_objects(); else if(key==Msp::Input::KEY_N) new_track(); else if(key==Msp::Input::KEY_G) - { - manipulator.start_move(); - mode = MANIPULATE; - } + use_tool_with_selected_objects(); else if(key==Msp::Input::KEY_R) - { - manipulator.start_rotate(); - mode = MANIPULATE; - } + use_tool_with_selected_objects(); else if(key==Msp::Input::KEY_D) { - manipulator.duplicate(); - manipulator.start_move(); - mode = MANIPULATE; + const set &sel_objs = selection.get_objects(); + list new_objs; + for(set::iterator i=sel_objs.begin(); i!=sel_objs.end(); ++i) + { + Object *obj = (*i)->clone(layout); + for(list::iterator j=new_objs.begin(); j!=new_objs.end(); ++j) + obj->link_to(**j); + new_objs.push_back(obj); + } + + selection.replace(new_objs.begin(), new_objs.end()); + + use_tool_with_selected_objects(); } 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 && shift) - selection.select_blocks(); - else if(key==Msp::Input::KEY_L) - selection.select_linked(); else if(key==Msp::Input::KEY_M) - { - measure.start(); - mode = MEASURE; - } + use_tool(); else if(key==Msp::Input::KEY_Z) - { - manipulator.start_elevate(); - mode = MANIPULATE; - } + use_tool_with_selected_objects(); else if(key==Msp::Input::KEY_ESC) { - if(mode==MANIPULATE) - manipulator.cancel(); - else if(mode==CATALOGUE) - mode = SELECT; - else - selection.clear(); + if(mode==CATALOGUE) + use_select_tool(); } else if(key==Msp::Input::KEY_X) erase_tracks(); @@ -435,15 +406,15 @@ void Designer::key_press(unsigned key) if(*j!=*i) (*i)->snap_to(**j, true); - update_track_icon(layout_3d->get_track(**i)); + update_track_icon(layout_3d->get_3d(**i)); } } else if(key==Msp::Input::KEY_F) - flatten_tracks(); + use_tool_with_selected_objects()->flatten(); else if(key==Msp::Input::KEY_E && shift) - manipulator.even_slope(true); + use_tool_with_selected_objects()->even_slope(true); else if(key==Msp::Input::KEY_E) - manipulator.even_slope(); + use_tool_with_selected_objects()->even_slope(); else if(key==Msp::Input::KEY_A) { if(cur_route) @@ -452,66 +423,70 @@ void Designer::key_press(unsigned key) add_selection_to_zone(); } else if(key==Msp::Input::KEY_C) - connect_tracks(); + use_tool_with_selected_objects()->connect(); else if(key==Msp::Input::KEY_V) svg_export(); else if(key==Msp::Input::KEY_P) track_properties(); } -void Designer::button_press(unsigned btn) +template +T *Designer::use_tool_with_selected_objects() { - bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R); + T *tool = new T(*this, keyboard, mouse, selection.get_objects()); + use_tool(tool); + return tool; +} - Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0); - Vector ground = map_pointer_to_ground(pointer); +template +T *Designer::use_tool() +{ + T *tool = new T(*this, keyboard, mouse); + use_tool(tool); + return tool; +} - if(mode==CATALOGUE) +void Designer::use_tool(Tool *tool) +{ + if(cur_tool) { - if(btn==1) - { - Object *cobj = pick_object(pointer); - if(cobj) - { - Object *obj = cobj->clone(layout); - obj->set_position(ground); + delete cur_tool; + cur_tool = 0; + } - selection.clear(); - selection.add_object(obj); + cur_tool = tool; + cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status)); + tool_status(cur_tool->get_status()); + mode = TOOL; +} - mode = SELECT; - } - } - else - mode = SELECT; - } - else if(mode==SELECT) - { - if(btn==1) - { - Object *obj = pick_object(pointer); - if(obj) - { - if(!shift) - selection.clear(); - selection.toggle_object(obj); - } - } - } - else if(mode==MEASURE) - measure.button_press(ground.x, ground.y, btn); +void Designer::use_select_tool() +{ + use_tool(new ObjectSelectTool(*this, keyboard, mouse, selection)); } -void Designer::axis_motion(unsigned, float, float) +void Designer::button_press(unsigned btn) { Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0); - float wx = pointer.x*window.get_width(); - float wy = pointer.y*window.get_height(); + Vector ground = map_pointer_to_ground(pointer); - if(!root.get_child_at(wx, wy)) + if(mode==CATALOGUE) { - Vector ground = map_pointer_to_ground(pointer); - measure.pointer_motion(ground.x, ground.y); + Object *obj; + if(btn==1) + obj = pick_object(pointer); + + if(obj) + { + obj = obj->clone(layout); + obj->set_position(ground); + + selection.clear(); + selection.add_object(obj); + } + + if(obj || btn==3) + use_select_tool(); } } @@ -523,24 +498,6 @@ void Designer::render() view->render(); root.render(); - // XXX Should fix GLtk so this would not be needed - glColor3f(1.0, 1.0, 1.0); -} - -void Designer::object_added(Object &obj) -{ - if(Track *trk = dynamic_cast(&obj)) - new_tracks.push_back(trk); -} - -void Designer::object_removed(Object &obj) -{ - if(Track *trk = dynamic_cast(&obj)) - { - list::iterator i = find(new_tracks.begin(), new_tracks.end(), trk); - if(i!=new_tracks.end()) - new_tracks.erase(i); - } } Object *Designer::pick_object(const Vector &pointer) @@ -574,52 +531,16 @@ void Designer::update_track_icon(Track3D &track) } } -void Designer::selection_changed() -{ - const set &tracks = selection.get_objects(); - 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) +void Designer::tool_status(const string &status) { lbl_status->set_text(status); } -void Designer::manipulation_done(bool) -{ - mode = MANIPULATE_DONE; - selection_changed(); -} - -void Designer::measure_changed() -{ - float pard = measure.get_parallel_distance()*1000; - float perpd = measure.get_perpendicular_distance()*1000; - float d = sqrt(pard*pard+perpd*perpd); - const Angle &adiff = measure.get_angle_difference(); - string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff.degrees()); - lbl_status->set_text(info); -} - -void Designer::measure_done() -{ - mode = SELECT; - selection_changed(); -} - void Designer::track_properties_response(int) { const set &tracks = selection.get_objects(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - update_track_icon(layout_3d->get_track(**i)); + update_track_icon(layout_3d->get_3d(**i)); } void Designer::route_name_accept(const string &text) @@ -658,12 +579,9 @@ string Designer::tooltip(int x, int y) void Designer::clear_paths() { - const set <racks = layout->get_all(); - for(set::iterator i=ltracks.begin(); i!=ltracks.end(); ++i) - { - Track3D &t3d = layout_3d->get_track(**i); - t3d.get_path().set_mask(0); - } + for(list::iterator i=highlight_paths.begin(); i!=highlight_paths.end(); ++i) + delete *i; + highlight_paths.clear(); } void Designer::show_route(const Route &route) @@ -673,15 +591,11 @@ void Designer::show_route(const Route &route) 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; + Track3D &t3d = layout_3d->get_3d(**i); + Path3D *path = new Path3D(t3d); + path->set_color(GL::Color(0.5, 0.8, 1.0)); 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((*i)->get_type().get_paths()); + path->set_path(route.get_turnout(tid)); } } @@ -692,8 +606,8 @@ void Designer::show_zone(const Zone &zone) 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()); + Track3D &t3d = layout_3d->get_3d(**i); + Path3D *path = new Path3D(t3d); + path->set_color(GL::Color(0.8, 1.0, 0.5)); } }