X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=83164b5da169ba05aaf98876754208deec54b5b6;hb=283542ae424b94786652fbf0c67b883b63a8e7a0;hp=c60ae8e8688b5c318262d71e40a48d48aebacfb4;hpb=e9653dffd0026fb3c02c91a4c0feca688a86c721;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index c60ae8e..83164b5 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -6,6 +6,7 @@ Distributed under the GPL */ #include +#include #include #include #include @@ -48,7 +49,7 @@ Designer::Designer(int argc, char **argv): mode(SELECT), manipulator(*this, selection), measure(*this), - camera_ctl(window, camera) + track_wrap(*this, selection) { window.set_title("Railway Designer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); @@ -67,6 +68,9 @@ 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)); + layout->signal_track_removed.connect(sigc::mem_fun(this, &Designer::track_removed)); + if(argc>1) { filename = argv[1]; @@ -86,7 +90,8 @@ Designer::Designer(int argc, char **argv): pipeline->set_camera(&camera); pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0); if(base_object) - pipeline->add_renderable_for_pass(*base_object, 0); + 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"); @@ -101,8 +106,13 @@ Designer::Designer(int argc, char **argv): 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(); + camera.set_look_direction(GL::Vector3(0, 0.5, -0.866)); // Setup UI DataFile::load(ui_res, "marklin.res"); @@ -128,15 +138,17 @@ Designer::Designer(int argc, char **argv): 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); + camera_ctl = new CameraController(*this, *root, camera); + camera_ctl->view_all(); - edit_route(0); + 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; @@ -232,7 +244,7 @@ void Designer::add_selection_to_route() } catch(const Exception &e) { - IO::print("%s\n", e.what()); + lbl_status->set_text(e.what()); } show_route(cur_route); @@ -256,7 +268,11 @@ void Designer::tick() window.get_display().tick(); root->tick(); - camera_ctl.tick(dt); + 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(); @@ -268,7 +284,12 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) key = Input::key_from_sys(key); mod = Input::mod_from_sys(mod); - if(key==Msp::Input::KEY_N) + 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) { @@ -351,6 +372,8 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) set_sensor_id(); else if(key==Msp::Input::KEY_A) add_selection_to_route(); + else if(key==Msp::Input::KEY_C) + manipulator.connect(); } void Designer::button_press(int x, int y, unsigned btn, unsigned mod) @@ -444,7 +467,6 @@ void Designer::render() } GL::Bind bind_depth(GL::DepthTest::lequal()); - manipulator.render(); if(mode==MEASURE) measure.render(); } @@ -462,6 +484,18 @@ void Designer::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) { Layout3D *l = layout_3d; @@ -567,31 +601,6 @@ void Designer::route_name_accept(const string &text) cur_route->set_name(text); } -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) - { - Point tmin; - Point tmax; - (*i)->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); - maxp.y = max(maxp.y, tmax.y); - } - - float t = tan(camera.get_field_of_view()/2)*2; - float size = max((maxp.y-minp.y+0.1), (maxp.x-minp.x+0.1)/camera.get_aspect()); - float cam_dist = size/t+size*0.25; - Point center((minp.x+maxp.x)/2, (minp.y+maxp.y)/2); - 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))