]> git.tdb.fi Git - r2c2.git/blobdiff - source/designer/designer.cpp
A couple of minor temporary fixes
[r2c2.git] / source / designer / designer.cpp
index 180ed50ff1fb55ebd933302e74cfd4b9d0bdcf75..2002bd987910a7d28893ba32b1efd15db0671e39 100644 (file)
 /* $Id$
 
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+This file is part of R²C²
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <signal.h>
+#include <algorithm>
 #include <cmath>
-#include <iostream>
-#include <GL/gl.h>
+#include <msp/fs/utils.h>
+#include <msp/gl/blend.h>
+#include <msp/gl/framebuffer.h>
+#include <msp/gl/matrix.h>
+#include <msp/gl/misc.h>
+#include <msp/gl/projection.h>
 #include <msp/gl/rendermode.h>
 #include <msp/gl/select.h>
+#include <msp/gl/tests.h>
 #include <msp/gl/texture2d.h>
 #include <msp/input/keys.h>
+#include <msp/io/print.h>
 #include <msp/strings/codec.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utf8.h>
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.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 "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> Designer::reg;
+
 Designer::Designer(int argc, char **argv):
-       screen_w(1280),
-       screen_h(960),
-       input(0),
+       window(1280, 960),
+       ui_res("r2c2.res"),
+       root(ui_res, window),
+       base_object(0),
+       cur_route(0),
+       cur_zone(0),
        mode(SELECT),
-       cam_yaw(M_PI/2),
-       cam_pitch(-M_PI/4),
-       cam_pos(0, -0.5, 0.5),
-       shift(false),
-       move_x(0),
-       move_y(0),
-       zoom(0),
-       rotate(0),
-       pitch(0)
-{
-       catalogue.load("tracks.dat");
-
-       cat_layout=new Layout(catalogue);
-       cat_layout_3d=new Layout3D(*cat_layout);
-
-       const map<unsigned, TrackType *> &ctracks=catalogue.get_tracks();
-       unsigned n=0;
-       for(map<unsigned, TrackType *>::const_iterator i=ctracks.begin(); i!=ctracks.end(); ++i, ++n)
-       {
-               Track *track=new Track(*i->second);
-               track->set_position(Point((n%11)*0.1-0.5, 0.2-n/11*0.3, 0));
-               track->set_rotation(M_PI/2);
-               cat_layout->add_track(*track);
-       }
+       manipulator(*this, root, selection),
+       measure(*this),
+       camera_ctl(*this, root, camera),
+       track_wrap(*this, selection)
+{
+       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));
 
-       manipulator=new Manipulator(*this);
-       manipulator->signal_status.connect(sigc::mem_fun(this, &Designer::manipulation_status));
-       manipulator->signal_done.connect(sigc::mem_fun(this, &Designer::manipulation_done));
+       // Setup catalogue and layout
+       DataFile::load(catalogue, "tracks.dat");
 
-       layout=new Layout(catalogue);
-       layout_3d=new Layout3D(*layout);
+       cat_layout_3d = new Layout3D(catalogue.get_layout());
+
+       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)
        {
-               layout->load(argv[1]);
-               const list<Track3D *> &ltracks=layout_3d->get_tracks();
-               for(list<Track3D *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+               filename = argv[1];
+               DataFile::load(*layout, argv[1]);
+
+               if(!layout->get_base().empty())
                {
-                       if((*i)->get_track().get_sensor_id())
-                               (*i)->set_color(GL::Color(1, 1, 0.5));
-                       else if((*i)->get_track().get_turnout_id())
-                               (*i)->set_color(GL::Color(0.5, 1, 1));
-                       else if((*i)->get_track().get_flex())
-                               (*i)->set_color(GL::Color(1, 0.5, 1));
+                       base_object = new GL::Object;
+                       DataFile::load(*base_object, layout->get_base());
                }
        }
 
-       selection=new Selection;
-       manipulator->set_selection(selection);
+       // Setup OpenGL
+       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);
+       if(base_object)
+               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");
+
+       light.set_position(0, -0.259, 0.966, 0);
+       lighting.attach(0, light);
+
+       GL::PipelinePass *pass = &pipeline->add_pass(0);
+       pass->lighting = &lighting;
+       pass->depth_test = &GL::DepthTest::lequal();
+
+       pass = &pipeline->add_pass("unlit");
+       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));
+       camera.set_look_direction(GL::Vector3(0, 0.5, -0.866));
+
+       // Setup UI
+       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<Toolbar *>::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;
+       statusbar->add(*lbl_status);
+       lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16));
+
+       overlay = new Overlay3D(window, camera, ui_res.get_default_font());
 
-       measure=new Measure(*this);
-       measure->signal_changed.connect(sigc::mem_fun(this, &Designer::measure_changed));
-       measure->signal_done.connect(sigc::mem_fun(this, &Designer::measure_done));
+       camera_ctl.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);
 }
 
 Designer::~Designer()
 {
-       delete manipulator;
-       delete selection;
-       delete layout;
+       for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
+               delete *i;
+       delete overlay;
+       delete pipeline;
+       delete base_object;
        delete layout_3d;
-       delete cat_layout;
+       delete layout;
        delete cat_layout_3d;
-       delete measure;
 }
 
 int Designer::main()
 {
-       dpy=new Graphics::Display;
-       wnd=new Graphics::Window(*dpy, screen_w, screen_h);
-       glc=new Graphics::GLContext(*wnd);
+       window.show();
 
-       wnd->signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
-       wnd->signal_key_press.connect(sigc::mem_fun(this, &Designer::key_press));
-       wnd->signal_key_release.connect(sigc::mem_fun(this, &Designer::key_release));
-       wnd->signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press));
-       wnd->signal_pointer_motion.connect(sigc::mem_fun(this, &Designer::pointer_motion));
+       mode = SELECT;
 
-       wnd->show();
+       return Application::main();
+}
 
-       glEnableClientState(GL_VERTEX_ARRAY);
-       glEnable(GL_DEPTH_TEST);
-       glEnable(GL_BLEND);
-       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-       glEnable(GL_CULL_FACE);
+void Designer::save()
+{
+       InputDialog *input = new InputDialog(*this, "Save layout", filename);
+       input->signal_accept.connect(sigc::mem_fun(layout, &Layout::save));
+}
 
-       GL::Texture2D *font_tex=new GL::Texture2D;
-       font_tex->set_min_filter(GL::LINEAR);
-       font_tex->load_image("dejavu-20.png");
-       font=new GL::Font();
-       font->set_texture(*font_tex);
-       DataFile::load(*font, "dejavu-20.font");
+void Designer::quit()
+{
+       exit(0);
+}
 
-       mode=SELECT;
+void Designer::new_track()
+{
+       if(mode!=SELECT)
+               return;
 
-       Application::main();
+       mode = CATALOGUE;
+       lbl_status->set_text("Select new track or press Esc to cancel");
+}
 
-       delete font;
-       delete font_tex;
-       delete input;
+void Designer::erase_tracks()
+{
+       if(mode!=SELECT)
+               return;
 
-       delete glc;
-       delete wnd;
-       delete dpy;
+       set<Track *> tracks = selection.get_tracks();
+       selection.clear();
+       for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       {
+               overlay->clear(layout_3d->get_track(**i));
+               delete *i;
+       }
+}
+
+void Designer::track_properties()
+{
+       if(mode!=SELECT || selection.empty())
+               return;
 
-       return exit_code;
+       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::map_pointer_coords(int x, int y, float &gx, float &gy)
+void Designer::extend_track()
 {
-       float cos_pitch=cos(cam_pitch);
-       float sin_pitch=sin(cam_pitch);
-       float cos_yaw=cos(cam_yaw);
-       float sin_yaw=sin(cam_yaw);
+       if(mode!=SELECT)
+               return;
 
-       float rx=sin_yaw*0.55228;
-       float ry=-cos_yaw*0.55228;
+       if(manipulator.start_extend())
+               mode = MANIPULATE;
+}
 
-       float ux=cos_yaw*-sin_pitch*0.41421;
-       float uy=sin_yaw*-sin_pitch*0.41421;
-       float uz=cos_pitch*0.41421;
+void Designer::connect_tracks()
+{
+       if(mode!=SELECT)
+               return;
 
-       float xf=static_cast<float>(x)*2/screen_w-1;
-       float yf=1-static_cast<float>(y)*2/screen_h;
+       manipulator.connect();
+}
 
-       float vx=cos_yaw*cos_pitch + xf*rx + yf*ux;
-       float vy=sin_yaw*cos_pitch + xf*ry + yf*uy;
-       float vz=sin_pitch + yf*uz;
+void Designer::flatten_tracks()
+{
+       if(mode!=SELECT)
+               return;
 
-       gx=cam_pos.x-vx*cam_pos.z/vz;
-       gy=cam_pos.y-vy*cam_pos.z/vz;
+       manipulator.flatten();
 }
 
-void Designer::tick()
+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)
 {
-       const Msp::Time::TimeStamp t=Msp::Time::now();
-       float dt=(t-last_tick)/Msp::Time::sec;
-       last_tick=t;
+       cur_route = r;
+       cur_zone = 0;
+       if(cur_route)
+               show_route(*cur_route);
+       else
+               clear_paths();
+}
 
-       dpy->tick();
+void Designer::rename_route()
+{
+       if(mode!=SELECT || !cur_route)
+               return;
 
-       if(move_y)
-       {
-               cam_pos.x+=cos(cam_yaw)*dt*move_y;
-               cam_pos.y+=sin(cam_yaw)*dt*move_y;
-       }
-       if(move_x)
+       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()
+{
+       if(!cur_route)
+               return;
+
+       try
        {
-               cam_pos.x+=sin(cam_yaw)*dt*move_x;
-               cam_pos.y+=-cos(cam_yaw)*dt*move_x;
+               cur_route->add_tracks(selection.get_tracks());
        }
-       if(zoom)
+       catch(const Exception &e)
        {
-               cam_pos.x+=cos(cam_yaw)*cos(cam_pitch)*dt*zoom;
-               cam_pos.y+=sin(cam_yaw)*cos(cam_pitch)*dt*zoom;
-               cam_pos.z+=sin(cam_pitch)*dt*zoom;
+               lbl_status->set_text(e.what());
        }
-       if(rotate)
+
+       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);
+}
+
+void Designer::add_selection_to_zone()
+{
+       if(!cur_zone)
+               return;
+
+       try
        {
-               float vx=cos(cam_yaw)*cos(cam_pitch);
-               float vy=sin(cam_yaw)*cos(cam_pitch);
-               float vz=sin(cam_pitch);
-
-               float gx=cam_pos.x-vx*cam_pos.z/vz;
-               float gy=cam_pos.y-vy*cam_pos.z/vz;
-               float d=sqrt(vx*vx+vy*vy)*cam_pos.z/vz;
-
-               cam_yaw+=M_PI*dt*rotate;
-               if(cam_yaw>M_PI*2)
-                       cam_yaw-=M_PI*2;
-               else if(cam_yaw<0)
-                       cam_yaw+=M_PI*2;
-
-               cam_pos.x=gx+cos(cam_yaw)*d;
-               cam_pos.y=gy+sin(cam_yaw)*d;
+               cur_zone->add_tracks(selection.get_tracks());
        }
-       if(pitch)
+       catch(const Exception &e)
        {
-               cam_pitch+=M_PI/2*dt*pitch;
-               if(cam_pitch>M_PI/12)
-                       cam_pitch=M_PI/12;
-               else if(cam_pitch<-M_PI/2)
-                       cam_pitch=-M_PI/2;
+               lbl_status->set_text(e.what());
        }
 
-       if(tooltip_timeout && t>tooltip_timeout)
-       {
-               Track3D *t3d=0;
+       show_zone(*cur_zone);
+}
 
-               if(mode==CATALOGUE)
-                       t3d=pick_track(pointer_x, pointer_y);
-               else
-                       t3d=pick_track(pointer_x, pointer_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;
+       GL::Vector4 vec = camera.unproject(GL::Vector4(xf, yf, 0, 0));
+       const GL::Vector3 &pos = camera.get_position();
 
-               if(t3d)
-               {
-                       const Track &track=t3d->get_track();
-                       const TrackType &ttype=track.get_type();
-                       ostringstream ss;
-                       ss.precision(2);
-                       ss<<ttype.get_article_number()<<' '<<ttype.get_description();
-                       if(mode!=CATALOGUE)
-                               ss<<" (slope "<<track.get_slope()/ttype.get_total_length()*100<<"%)";
-                       if(track.get_turnout_id())
-                               ss<<" (turnout "<<track.get_turnout_id()<<')';
-                       else if(track.get_sensor_id())
-                               ss<<" (sensor "<<track.get_sensor_id()<<')';
-                       tooltip=ss.str();
-
-                       move_tooltip(pointer_x, pointer_y);
-               }
-               else
-                       tooltip="";
+       return Point(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z);
+}
 
-               tooltip_timeout=Msp::Time::TimeStamp();
-       }
+void Designer::tick()
+{
+       const Msp::Time::TimeStamp t = Msp::Time::now();
+       float dt = (t-last_tick)/Msp::Time::sec;
+       last_tick = t;
 
-       render();
+       if(mode==MANIPULATE_DONE)
+               mode = SELECT;
 
-       glc->swap_buffers();
-}
+       window.tick();
+       root.tick();
+       camera_ctl.tick(dt);
 
-/*** private ***/
+       for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
+               layout_3d->get_track(**i).get_path().set_mask(0);
+       new_tracks.clear();
 
-void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
-{
-       unsigned key=Msp::Input::key_from_sys(code);
+       render();
 
-       if(mode==INPUT)
-       {
-               input->key_press(key, mod, ch);
-               return;
-       }
+       window.swap_buffers();
+}
 
-       if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
-               shift=true;
+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)
-               mode=CATALOGUE;
+       if(key==Msp::Input::KEY_N && (mod&Input::MOD_SHIFT))
+               extend_track();
+       else if(key==Msp::Input::KEY_N)
+               new_track();
        else if(key==Msp::Input::KEY_G)
        {
-               manipulator->start_move();
-               mode=MANIPULATE;
+               manipulator.start_move();
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_R)
        {
-               manipulator->start_rotate();
-               mode=MANIPULATE;
+               manipulator.start_rotate();
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_D)
        {
-               manipulator->duplicate();
-               manipulator->start_move();
-               mode=MANIPULATE;
+               manipulator.duplicate();
+               manipulator.start_move();
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_W)
-       {
-               input=new ::Input(*this, "Filename");
-               input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
-               input->signal_accept.connect(sigc::mem_fun(this, &Designer::save_accept));
-               mode=INPUT;
-       }
+               save();
        else if(key==Msp::Input::KEY_PLUS)
-               selection->select_more();
-       else if(key==Msp::Input::KEY_L && (mod&1))
-       {
-               const set<Track *> &tracks=layout->get_tracks();
-               float len=0;
-               for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-                       len+=(*i)->get_type().get_total_length();
-               cout<<"Total length: "<<len<<"m\n";
-       }
+               selection.select_more();
+       else if(key==Msp::Input::KEY_L && (mod&Input::MOD_SHIFT))
+               selection.select_blocks();
        else if(key==Msp::Input::KEY_L)
-               selection->select_linked();
+               selection.select_linked();
        else if(key==Msp::Input::KEY_M)
        {
-               measure->start();
-               mode=MEASURE;
+               measure.start();
+               mode = MEASURE;
        }
        else if(key==Msp::Input::KEY_Z)
        {
-               manipulator->start_elevate();
-               mode=MANIPULATE;
+               manipulator.start_elevate();
+               mode = MANIPULATE;
        }
        else if(key==Msp::Input::KEY_ESC)
        {
                if(mode==MANIPULATE)
-                       manipulator->cancel();
+                       manipulator.cancel();
                else if(mode==CATALOGUE)
-                       mode=SELECT;
+                       mode = SELECT;
                else
-                       selection->clear();
+                       selection.clear();
        }
        else if(key==Msp::Input::KEY_X)
+               erase_tracks();
+       else if(key==Msp::Input::KEY_F && (mod&Input::MOD_SHIFT))
        {
-               set<Track *> tracks=selection->get_tracks();
-               selection->clear();
-               for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               {
-                       layout->remove_track(**i);
-                       delete *i;
-               }
-       }
-       else if(key==Msp::Input::KEY_F && (mod&1))
-       {
-               const set<Track *> &tracks=selection->get_tracks();
-               const set<Track *> &ltracks=layout->get_tracks();
+               const set<Track *> &tracks = selection.get_tracks();
+               const set<Track *> &ltracks = layout->get_tracks();
                for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
                        (*i)->set_flex(!(*i)->get_flex());
@@ -350,316 +433,312 @@ void Designer::key_press(unsigned code, unsigned mod, wchar_t ch)
                                if(*j!=*i)
                                        (*i)->snap_to(**j, true);
 
-                       Track3D &t3d=layout_3d->get_track(**i);
-                       if((*i)->get_flex())
-                               t3d.set_color(GL::Color(1, 0.5, 1));
-                       else
-                               t3d.set_color(GL::Color(1, 1, 1));
+                       update_track_icon(layout_3d->get_track(**i));
                }
        }
        else if(key==Msp::Input::KEY_F)
-               manipulator->flatten();
-       else if(key==Msp::Input::KEY_E && (mod&1))
-               manipulator->even_slope(true);
+               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)
+               manipulator.even_slope();
+       else if(key==Msp::Input::KEY_A)
        {
-               Track *track=selection->get_track();
-               if(selection->size()==1 && track->get_type().get_n_routes()>1)
-               {
-                       ostringstream ss;
-                       ss<<track->get_turnout_id();
-                       input=new ::Input(*this, "Turnout ID", ss.str());
-                       input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
-                       input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
-                       mode=INPUT;
-               }
+               if(cur_route)
+                       add_selection_to_route();
+               else if(cur_zone)
+                       add_selection_to_zone();
        }
-       else if(key==Msp::Input::KEY_S)
-       {
-               Track *track=selection->get_track();
-               if(selection->size()==1 && track->get_type().get_n_routes()==1)
-               {
-                       ostringstream ss;
-                       ss<<track->get_sensor_id();
-                       input=new ::Input(*this, "Sensor ID", ss.str());
-                       input->signal_cancel.connect(sigc::mem_fun(this, &Designer::input_dismiss));
-                       input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
-                       mode=INPUT;
-               }
-       }
-       else if(key==Msp::Input::KEY_RIGHT)
-               rotate=-1;
-       else if(key==Msp::Input::KEY_LEFT)
-               rotate=1;
-       else if(key==Msp::Input::KEY_UP)
-               move_y=1;
-       else if(key==Msp::Input::KEY_DOWN)
-               move_y=-1;
-       else if(key==Msp::Input::KEY_INSERT)
-               zoom=-1;
-       else if(key==Msp::Input::KEY_PGUP)
-               zoom=1;
-       else if(key==Msp::Input::KEY_HOME)
-               pitch=1;
-       else if(key==Msp::Input::KEY_END)
-               pitch=-1;
-       else if(key==Msp::Input::KEY_DELETE)
-               move_x=-1;
-       else if(key==Msp::Input::KEY_PGDN)
-               move_x=1;
-}
-
-void Designer::key_release(unsigned code, unsigned)
-{
-       unsigned key=Msp::Input::key_from_sys(code);
-
-       if(mode==INPUT)
-               return;
-
-       if(key==Msp::Input::KEY_SHIFT_L || key==Msp::Input::KEY_SHIFT_R)
-               shift=false;
-       else if(key==Msp::Input::KEY_RIGHT || key==Msp::Input::KEY_LEFT)
-               rotate=0;
-       else if(key==Msp::Input::KEY_UP || key==Msp::Input::KEY_DOWN)
-               move_y=0;
-       else if(key==Msp::Input::KEY_INSERT || key==Msp::Input::KEY_PGUP)
-               zoom=0;
-       else if(key==Msp::Input::KEY_HOME || key==Msp::Input::KEY_END)
-               pitch=0;
-       else if(key==Msp::Input::KEY_DELETE || key==Msp::Input::KEY_PGDN)
-               move_x=0;
+       else if(key==Msp::Input::KEY_C)
+               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)
+void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
 {
-       y=screen_h-y-1;
+       y = window.get_height()-y-1;
+       mod = Input::mod_from_sys(mod);
 
-       float gx, gy;
-       map_pointer_coords(x, y, gx, gy);
+       Point ground = map_pointer_to_ground(x, y);
 
        if(mode==CATALOGUE)
        {
                if(btn==1)
                {
-                       Track3D *ctrack=pick_track(x, y);
+                       Track3D *ctrack = pick_track(x, y);
                        if(ctrack)
                        {
-                               Track *track=ctrack->get_track().copy();
-                               track->set_position(Point(gx, gy, 0));
-                               layout->add_track(*track);
+                               Track *track = new Track(*layout, ctrack->get_track().get_type());
+                               track->set_position(ground);
 
-                               selection->clear();
-                               selection->add_track(track);
+                               selection.clear();
+                               selection.add_track(track);
 
-                               mode=SELECT;
+                               mode = SELECT;
                        }
                }
                else
-                       mode=SELECT;
+                       mode = SELECT;
        }
        else if(mode==SELECT)
        {
                if(btn==1)
                {
-                       Track3D *track=pick_track(x, y);
+                       Track3D *track = pick_track(x, y);
                        if(track)
                        {
-                               if(!shift)
-                                       selection->clear();
-                               selection->toggle_track(&track->get_track());
+                               if(!(mod&Input::MOD_SHIFT))
+                                       selection.clear();
+                               selection.toggle_track(&track->get_track());
                        }
                }
        }
-       else if(mode==MANIPULATE)
-               manipulator->button_press(x, y, gx, gy, btn);
        else if(mode==MEASURE)
-               measure->button_press(x, y, gx, gy, btn);
+               measure.button_press(x, y, ground.x, ground.y, btn);
 }
 
 void Designer::pointer_motion(int x, int y)
 {
-       y=screen_h-y-1;
+       y = window.get_height()-y-1;
 
-       float gx, gy;
-       map_pointer_coords(x, y, gx, gy);
-
-       if(mode==SELECT || mode==CATALOGUE)
-       {
-               pointer_x=x;
-               pointer_y=y;
-               tooltip_timeout=Msp::Time::now()+100*Msp::Time::msec;
-       }
-
-       if(mode!=INPUT)
+       if(!root.get_child_at(x, y))
        {
-               manipulator->pointer_motion(x, y, gx, gy);
-               measure->pointer_motion(x, y, gx, gy);
+               Point ground = map_pointer_to_ground(x, y);
+               measure.pointer_motion(x, y, ground.x, ground.y);
        }
-
-       if(mode==MEASURE || mode==MANIPULATE)
-               move_tooltip(x, y);
-}
-
-void Designer::project_3d()
-{
-       glMatrixMode(GL_PROJECTION);
-       glLoadIdentity();
-       glFrustum(-0.055228, 0.055228, -0.041421, 0.041421, 0.1, 10);
-       glMatrixMode(GL_MODELVIEW);
 }
 
 void Designer::apply_camera()
 {
-       glLoadIdentity();
        if(mode==CATALOGUE)
-               glTranslatef(0, 0, -1);
-       else
        {
-               glRotatef(-cam_pitch*180/M_PI-90, 1, 0, 0);
-               glRotatef(90-cam_yaw*180/M_PI, 0, 0, 1);
-               glTranslatef(-cam_pos.x, -cam_pos.y, -cam_pos.z);
+               GL::matrix_mode(GL::PROJECTION);
+               GL::load_identity();
+               GL::frustum_centered(0.11046, 0.082843, 0.1, 10);
+               GL::matrix_mode(GL::MODELVIEW);
+               GL::load_identity();
+               GL::translate(0, 0, -1);
        }
+       else
+               camera.apply();
 }
 
 void Designer::render()
 {
-       glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-       glEnable(GL_DEPTH_TEST);
+       GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
 
-       project_3d();
-       apply_camera();
        if(mode==CATALOGUE)
-               cat_layout_3d->render();
+       {
+               apply_camera();
+               cat_layout_3d->get_scene().render();
+       }
        else
        {
-               layout_3d->render(true);
-               manipulator->render();
+               pipeline->render_all();
+               {
+                       GL::Bind bind_blend(GL::Blend::alpha());
+                       overlay->render(0);
+               }
+
+               GL::Bind bind_depth(GL::DepthTest::lequal());
                if(mode==MEASURE)
-                       measure->render();
+                       measure.render();
        }
 
-       glMatrixMode(GL_PROJECTION);
-       glLoadIdentity();
-       glOrtho(0, screen_w, 0, screen_h, 0, 1);
-       glMatrixMode(GL_MODELVIEW);
-       glLoadIdentity();
-
-       glDisable(GL_DEPTH_TEST);
+       GL::matrix_mode(GL::PROJECTION);
+       GL::load_identity();
+       GL::ortho_bottomleft(window.get_width(), window.get_height());
+       GL::matrix_mode(GL::MODELVIEW);
+       GL::load_identity();
+
+       GL::Bind bind_blend(GL::Blend::alpha());
+       root.render();
+       // XXX Should fix GLtk so these would not be needed
+       GL::Texture::unbind();
+       glColor3f(1.0, 1.0, 1.0);
+}
 
-       if(!tooltip.empty())
-       {
-               glTranslatef(tooltip_x, tooltip_y, 0);
-               glScalef(20, 20, 20);
-               float width=font->get_string_width(tooltip);
-               glColor4f(0, 0, 0, 0.5);
-               glBegin(GL_QUADS);
-               glVertex2f(0, 0);
-               glVertex2f(width, 0);
-               glVertex2f(width, 1);
-               glVertex2f(0, 1);
-               glEnd();
-               glColor4f(1, 1, 1, 1);
-               font->draw_string(tooltip);
-       }
+void Designer::track_added(Track &trk)
+{
+       new_tracks.push_back(&trk);
+}
 
-       if(mode==INPUT)
-               input->render();
+void Designer::track_removed(Track &trk)
+{
+       list<Track *>::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;
+       Layout3D *l = layout_3d;
        if(mode==CATALOGUE)
-               l=cat_layout_3d;
+               l = cat_layout_3d;
 
-       float xx=(static_cast<float>(x-static_cast<int>(screen_w)/2)/screen_h)*0.82843;
-       float yy=(static_cast<float>(y)/screen_h-0.5)*0.82843;
-       float size=4.0/screen_h*0.82843;
+       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;
 
-       project_3d();
        apply_camera();
 
        return l->pick_track(xx, yy, size);
 }
 
+void Designer::update_track_icon(Track3D &track)
+{
+       overlay->clear(track);
+
+       if(track.get_track().get_flex())
+               overlay->add_graphic(track, "flex");
+
+       if(unsigned sid = track.get_track().get_sensor_id())
+       {
+               overlay->add_graphic(track, "sensor");
+               overlay->set_label(track, lexical_cast(sid));
+       }
+       else if(unsigned tid = track.get_track().get_turnout_id())
+       {
+               if(tid<0x800)
+               {
+                       overlay->add_graphic(track, "turnout");
+                       overlay->set_label(track, lexical_cast(tid));
+               }
+       }
+}
+
+void Designer::selection_changed()
+{
+       const set<Track *> &tracks = selection.get_tracks();
+       if(tracks.empty())
+               lbl_status->set_text(string());
+       else
+       {
+               float len = 0;
+               for(set<Track *>::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)
 {
-       tooltip=status;
+       lbl_status->set_text(status);
 }
 
 void Designer::manipulation_done(bool)
 {
-       mode=SELECT;
+       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);
-       float adiff=measure->get_angle_difference()*180/M_PI;
-       ostringstream ss;
-       ss.precision(3);
-       ss<<"Par "<<pard<<"mm - Perp "<<perpd<<"mm - Total "<<d<<"mm - Angle "<<adiff<<"°";
-       tooltip=ss.str();
+       float pard = measure.get_parallel_distance()*1000;
+       float perpd = measure.get_perpendicular_distance()*1000;
+       float d = sqrt(pard*pard+perpd*perpd);
+       float adiff = measure.get_angle_difference()*180/M_PI;
+       string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff);
+       lbl_status->set_text(info);
 }
 
 void Designer::measure_done()
 {
-       mode=SELECT;
+       mode = SELECT;
+       selection_changed();
 }
 
-void Designer::move_tooltip(int x, int y)
+void Designer::arrange_toolbars()
 {
-       int w=static_cast<int>(font->get_string_width(tooltip)*20);
-       tooltip_x=max(min(static_cast<int>(screen_w)-w, x), 0);
-       tooltip_y=max(min(static_cast<int>(screen_h)-20, y), 0);
+       unsigned x = 0;
+       for(vector<Toolbar *>::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::save_accept()
+void Designer::track_properties_response(int)
 {
-       layout->save(input->get_text());
+       const set<Track *> &tracks = selection.get_tracks();
+       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               update_track_icon(layout_3d->get_track(**i));
+}
 
-       input_dismiss();
+void Designer::route_name_accept(const string &text)
+{
+       if(cur_route)
+               cur_route->set_name(text);
 }
 
-void Designer::turnout_id_accept()
+void Designer::svg_export_accept(const string &text)
 {
-       Track *track=selection->get_track();
-       unsigned id=lexical_cast<unsigned>(input->get_text());
-       track->set_turnout_id(id);
+       SvgExporter svg_exp(*layout);
+       svg_exp.save(text);
+}
 
-       Track3D &t3d=layout_3d->get_track(*track);
-       if(id)
-               t3d.set_color(GL::Color(0.5, 1, 1));
-       else
-               t3d.set_color(GL::Color(1, 1, 1));
+string Designer::tooltip(int x, int y)
+{
+       if(Track3D *t3d = pick_track(x, y))
+       {
+               const Track &track = t3d->get_track();
+               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());
+
+               return info;
+       }
 
-       input_dismiss();
+       return string();
 }
 
-void Designer::sensor_id_accept()
+void Designer::clear_paths()
 {
-       Track *track=selection->get_track();
-       unsigned id=lexical_cast<unsigned>(input->get_text());
-       track->set_sensor_id(id);
+       const set<Track *> &ltracks = layout->get_tracks();
+       for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+       {
+               Track3D &t3d = layout_3d->get_track(**i);
+               t3d.get_path().set_mask(0);
+       }
+}
 
-       Track3D &t3d=layout_3d->get_track(*track);
-       if(id)
-               t3d.set_color(GL::Color(1, 1, 0.5));
-       else
-               t3d.set_color(GL::Color(1, 1, 1));
+void Designer::show_route(const Route &route)
+{
+       clear_paths();
 
-       input_dismiss();
+       const set<Track *> &rtracks = route.get_tracks();
+       for(set<Track *>::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((*i)->get_type().get_paths());
+       }
 }
 
-void Designer::input_dismiss()
+void Designer::show_zone(const Zone &zone)
 {
-       delete input;
-       input=0;
-       mode=SELECT;
-}
+       clear_paths();
 
-Application::RegApp<Designer> Designer::reg;
+       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());
+       }
+}