X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=edbec387d12cc6c7a0a161a5ba2814b862cb1a79;hb=f950f5a77714a155e57c868101911e181a617818;hp=ba7e669134766ace8b7bc93ce5c2331e9684fad0;hpb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index ba7e669..edbec38 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -43,7 +42,7 @@ Designer::Designer(int argc, char **argv): keyboard(window), mouse(window), ui_res("r2c2.res"), - root(ui_res, window), + root(ui_res, &window, &keyboard, &mouse), base_object(0), cur_route(0), cur_zone(0), @@ -107,9 +106,9 @@ Designer::Designer(int argc, char **argv): pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit"); // Setup UI - keyboard.signal_button_press.connect(sigc::mem_fun(this, &Designer::key_press)); - mouse.signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press)); - mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Designer::axis_motion)); + 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)); toolbars.push_back(new Layoutbar(*this)); @@ -138,6 +137,7 @@ Designer::Designer(int argc, char **argv): pipeline->add_renderable_for_pass(*track_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)); @@ -198,7 +198,7 @@ void Designer::erase_tracks() if(mode!=SELECT) return; - set tracks = selection.get_tracks(); + set tracks = selection.get_objects(); selection.clear(); for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) { @@ -278,7 +278,7 @@ void Designer::add_selection_to_route() try { - cur_route->add_tracks(selection.get_tracks()); + cur_route->add_tracks(selection.get_objects()); } catch(const exception &e) { @@ -317,7 +317,7 @@ void Designer::add_selection_to_zone() try { - cur_zone->add_tracks(selection.get_tracks()); + cur_zone->add_tracks(selection.get_objects()); } catch(const exception &e) { @@ -412,7 +412,7 @@ void Designer::key_press(unsigned key) erase_tracks(); else if(key==Msp::Input::KEY_F && shift) { - const set &tracks = selection.get_tracks(); + const set &tracks = selection.get_objects(); const set <racks = layout->get_tracks(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { @@ -457,14 +457,14 @@ void Designer::button_press(unsigned btn) { if(btn==1) { - Track *ctrack = pick_track(pointer); - if(ctrack) + Object *cobj = pick_object(pointer); + if(cobj) { - Track *track = new Track(*layout, ctrack->get_type()); - track->set_position(ground); + Object *obj = cobj->clone(layout); + obj->set_position(ground); selection.clear(); - selection.add_track(track); + selection.add_object(obj); mode = SELECT; } @@ -476,12 +476,12 @@ void Designer::button_press(unsigned btn) { if(btn==1) { - Track *track = pick_track(pointer); - if(track) + Object *obj = pick_object(pointer); + if(obj) { if(!shift) selection.clear(); - selection.toggle_track(track); + selection.toggle_object(obj); } } } @@ -508,11 +508,6 @@ void Designer::render() View3D *view = (mode==CATALOGUE ? cat_view : main_view); view->render(); - if(mode==MEASURE) - { - GL::Bind bind_depth(GL::DepthTest::lequal()); - measure.render(); - } root.render(); // XXX Should fix GLtk so this would not be needed @@ -531,13 +526,13 @@ void Designer::track_removed(Track &trk) new_tracks.erase(i); } -Track *Designer::pick_track(const Vector &pointer) +Object *Designer::pick_object(const Vector &pointer) { View3D &view = *(mode==CATALOGUE ? cat_view : main_view); const GL::Vector3 &cpos = view.get_camera().get_position(); GL::Vector4 cray = view.get_camera().unproject(GL::Vector4(pointer.x, pointer.y, 0, 0)); - return view.get_layout().get_layout().pick_track(Vector(cpos.x, cpos.y, cpos.z), Vector(cray.x, cray.y, cray.z)); + return view.get_layout().get_layout().pick_object(Vector(cpos.x, cpos.y, cpos.z), Vector(cray.x, cray.y, cray.z)); } void Designer::update_track_icon(Track3D &track) @@ -564,7 +559,7 @@ void Designer::update_track_icon(Track3D &track) void Designer::selection_changed() { - const set &tracks = selection.get_tracks(); + const set &tracks = selection.get_objects(); if(tracks.empty()) lbl_status->set_text(string()); else @@ -616,7 +611,7 @@ void Designer::arrange_toolbars() void Designer::track_properties_response(int) { - const set &tracks = selection.get_tracks(); + 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)); } @@ -635,17 +630,20 @@ void Designer::svg_export_accept(const string &text) string Designer::tooltip(int x, int y) { - if(Track *track = pick_track(Vector(x*2.0f/window.get_width()-1.0f, y*2.0f/window.get_height()-1.0f, 0))) + if(Object *obj = pick_object(Vector(x*2.0f/window.get_width()-1.0f, y*2.0f/window.get_height()-1.0f, 0))) { - 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()); - + const ObjectType &otype = obj->get_type(); + string info = format("%d %s", otype.get_article_number(), otype.get_description()); + if(Track *track = dynamic_cast(obj)) + { + const TrackType &ttype = track->get_type(); + 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; }