X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=51dad8f1a6ee4d42b3bcab4bbae1667952e5953e;hb=9abaa89f495307c7e90cbef51ae0fedbaff001db;hp=a31d244f9389ca9056039fc7a29c6231db384600;hpb=61da962442ae528bba9c66fa0c09427b53a4cbe0;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index a31d244..51dad8f 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -6,6 +6,7 @@ Distributed under the GPL */ #include +#include #include #include #include @@ -43,11 +44,14 @@ Application::RegApp Designer::reg; Designer::Designer(int argc, char **argv): window(1280, 960), + ui_res("marklin.res"), + root(ui_res, window), base_object(0), cur_route(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"); @@ -68,6 +72,7 @@ Designer::Designer(int argc, char **argv): 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) { @@ -113,20 +118,18 @@ Designer::Designer(int argc, char **argv): 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)); + 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); + 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.add(*statusbar); statusbar->set_size(window.get_width(), 20); statusbar->set_focusable(false); @@ -136,8 +139,7 @@ Designer::Designer(int argc, char **argv): overlay = new Overlay3D(window, camera, ui_res.get_default_font()); - 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) @@ -146,9 +148,7 @@ Designer::Designer(int argc, char **argv): Designer::~Designer() { - delete camera_ctl; delete overlay; - delete root; delete pipeline; delete base_object; delete layout_3d; @@ -248,7 +248,7 @@ void Designer::add_selection_to_route() show_route(cur_route); } -Point Designer::map_pointer_coords(int x, int y) +Point 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; @@ -264,9 +264,9 @@ void Designer::tick() float dt = (t-last_tick)/Msp::Time::sec; last_tick = t; - window.get_display().tick(); - root->tick(); - camera_ctl->tick(dt); + 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); @@ -282,7 +282,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) { @@ -374,7 +379,7 @@ 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); + Point ground = map_pointer_to_ground(x, y); if(mode==CATALOGUE) { @@ -408,8 +413,6 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned mod) } } } - 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); } @@ -418,10 +421,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); + Point ground = map_pointer_to_ground(x, y); measure.pointer_motion(x, y, ground.x, ground.y); } } @@ -473,7 +475,7 @@ void Designer::render() GL::disable(GL::DEPTH_TEST); GL::Bind bind_blend(GL::Blend::alpha()); - root->render(); + root.render(); GL::Texture::unbind(); } @@ -482,6 +484,13 @@ 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;