]> git.tdb.fi Git - r2c2.git/blobdiff - source/designer/designer.cpp
New approach for displaying track state
[r2c2.git] / source / designer / designer.cpp
index 23185cf3252e6d15418a563395795b2de3caf41d..3c3f83c903bb4592a712af1f039c957c63b91e8a 100644 (file)
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <signal.h>
 #include <algorithm>
 #include <cmath>
@@ -13,47 +6,50 @@ Distributed under the GPL
 #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/stringcodec/codec.h>
+#include <msp/stringcodec/utf8.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/route.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 "toolbar.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):
        window(1280, 960),
-       ui_res("marklin.res"),
-       root(ui_res, window),
+       keyboard(window),
+       mouse(window),
+       ui_res("r2c2.res"),
+       root(ui_res, &window, &keyboard, &mouse),
        base_object(0),
        cur_route(0),
+       cur_zone(0),
        mode(SELECT),
-       manipulator(*this, root, selection),
-       measure(*this),
-       camera_ctl(*this, root, camera),
-       track_wrap(*this, selection)
+       sel_wrap(selection),
+       manipulator(*this, mouse, selection),
+       measure(*this)
 {
        window.set_title("Railway Designer");
        window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
@@ -72,9 +68,6 @@ 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];
@@ -88,72 +81,92 @@ Designer::Designer(int argc, char **argv):
        }
 
        // Setup OpenGL
-       GL::enable(GL_CULL_FACE);
-
-       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");
+       cat_view = new View3D(*cat_layout_3d, window.get_width(), window.get_height());
 
-       light.set_position(0, -0.259, 0.966, 0);
-       lighting.attach(0, light);
+       main_view = new View3D(*layout_3d, window.get_width(), window.get_height());
+       GL::Pipeline *pipeline = &main_view->get_pipeline();
 
-       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();
+       GL::Pipeline::Pass *pass = &pipeline->add_pass("unlit");
+       pass->set_depth_test(&GL::DepthTest::lequal());
+       pass->set_blend(&GL::Blend::alpha());
 
        pass = &pipeline->add_pass("blended");
-       pass->lighting = &lighting;
-       pass->depth_test = &GL::DepthTest::lequal();
-       pass->blend = &GL::Blend::alpha();
+       pass->set_lighting(&layout_3d->get_lighting());
+       pass->set_depth_test(&GL::DepthTest::lequal());
+       pass->set_blend(&GL::Blend::alpha());
 
-       camera.set_up_direction(GL::Vector3(0, 0, 1));
-       camera.set_look_direction(GL::Vector3(0, 0.5, -0.866));
+       pass = &pipeline->add_pass("overlay");
+       pass->set_blend(&GL::Blend::alpha());
+
+       if(base_object)
+               pipeline->add_renderable(*base_object);
+       pipeline->add_renderable_for_pass(layout_3d->get_path_scene(), "unlit");
+       pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit");
 
        // 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));
+       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));
-
-       toolbar = new Toolbar(*this);
-       root.add(*toolbar);
-       toolbar->set_position(0, window.get_height()-toolbar->get_geometry().h);
-       toolbar->set_focusable(false);
+       root_layout = new GLtk::Layout;
+       root_layout->set_margin(0);
+       root.set_layout(root_layout);
+
+       toolbars.push_back(new Layoutbar(*this));
+       toolbars.push_back(new Trackbar(*this));
+       toolbars.push_back(new Routebar(*this));
+       toolbars.push_back(new Zonebar(*this));
+       Toolbar *prev = 0;
+       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(root_layout, &GLtk::Layout::update)));
+               if(prev)
+               {
+                       root_layout->add_constraint(**i, GLtk::Layout::RIGHT_OF, *prev, 0);
+                       root_layout->add_constraint(**i, GLtk::Layout::COPY_HEIGHT, *prev);
+               }
+               prev = *i;
+       }
 
        GLtk::Panel *statusbar = new GLtk::Panel;
        root.add(*statusbar);
-       statusbar->set_size(window.get_width(), 20);
        statusbar->set_focusable(false);
+       root_layout->set_gravity(*statusbar, -1, -1);
+       root_layout->set_expand(*statusbar, true, 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());
+       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.view_all();
+       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<Track *> &tracks = layout->get_all<Track>();
+       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               update_track_icon(layout_3d->get<Track3D>(**i));
 }
 
 Designer::~Designer()
 {
+       for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
+               delete *i;
+       delete camera_ctl;
        delete overlay;
-       delete pipeline;
+       delete main_view;
        delete base_object;
        delete layout_3d;
        delete layout;
+       delete cat_view;
        delete cat_layout_3d;
 }
 
@@ -170,6 +183,8 @@ void Designer::save()
 {
        InputDialog *input = new InputDialog(*this, "Save layout", filename);
        input->signal_accept.connect(sigc::mem_fun(layout, &Layout::save));
+       root.add(*input);
+       root_layout->set_gravity(*input, 0, 0);
 }
 
 void Designer::quit()
@@ -179,63 +194,91 @@ void Designer::quit()
 
 void Designer::new_track()
 {
+       if(mode!=SELECT)
+               return;
+
        mode = CATALOGUE;
+       lbl_status->set_text("Select new track or press Esc to cancel");
 }
 
-void Designer::set_turnout_id()
+void Designer::erase_tracks()
 {
-       Track *track = selection.get_track();
-       if(selection.size()==1 && track->get_type().is_turnout())
+       if(mode!=SELECT)
+               return;
+
+       set<Track *> tracks = selection.get_objects<Track>();
+       selection.clear();
+       for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               InputDialog *input = new InputDialog(*this, "Turnout ID", lexical_cast(track->get_turnout_id()));
-               input->signal_accept.connect(sigc::mem_fun(this, &Designer::turnout_id_accept));
+               overlay->clear(layout_3d->get<Track3D>(**i));
+               delete *i;
        }
 }
 
-void Designer::set_sensor_id()
+void Designer::track_properties()
 {
-       const set<Track *> &tracks = selection.get_tracks();
-       bool ok = false;
-       int id = -1;
-       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-       {
-               if(!(*i)->get_type().is_turnout())
-                       ok = true;
-               if(static_cast<int>((*i)->get_sensor_id())!=id)
-               {
-                       if(id==-1)
-                               id = (*i)->get_sensor_id();
-                       else
-                               id = -2;
-               }
-       }
+       if(mode!=SELECT || selection.empty())
+               return;
 
-       if(ok)
-       {
-               InputDialog *input = new InputDialog(*this, "Sensor ID", (id>=0 ? lexical_cast(id) : string()));
-               input->signal_accept.connect(sigc::mem_fun(this, &Designer::sensor_id_accept));
-       }
+       TrackProperties *track_prop = new TrackProperties(selection);
+       root.add(*track_prop);
+       root_layout->set_gravity(*track_prop, 0, 0);
+
+       track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
 }
 
-void Designer::rename_route()
+void Designer::extend_track()
 {
-       if(!cur_route)
+       if(mode!=SELECT)
                return;
 
-       InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name());
-       input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept));
+       if(manipulator.start_extend())
+               mode = MANIPULATE;
+}
+
+void Designer::connect_tracks()
+{
+       if(mode!=SELECT)
+               return;
+
+       manipulator.connect();
+}
+
+void Designer::flatten_tracks()
+{
+       if(mode!=SELECT)
+               return;
+
+       manipulator.flatten();
 }
 
 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));
+       root.add(*input);
+       root_layout->set_gravity(*input, 0, 0);
 }
 
 void Designer::edit_route(Route *r)
 {
        cur_route = r;
-       show_route(r);
+       cur_zone = 0;
+       if(cur_route)
+               show_route(*cur_route);
+       else
+               clear_paths();
+}
+
+void Designer::rename_route()
+{
+       if(mode!=SELECT || !cur_route)
+               return;
+
+       InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name());
+       input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept));
+       root.add(*input);
+       root_layout->set_gravity(*input, 0, 0);
 }
 
 void Designer::add_selection_to_route()
@@ -245,24 +288,61 @@ void Designer::add_selection_to_route()
 
        try
        {
-               cur_route->add_tracks(selection.get_tracks());
+               cur_route->add_tracks(selection.get_objects<Track>());
+       }
+       catch(const exception &e)
+       {
+               lbl_status->set_text(e.what());
+       }
+
+       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
+       {
+               cur_zone->add_tracks(selection.get_objects<Track>());
        }
-       catch(const Exception &e)
+       catch(const exception &e)
        {
                lbl_status->set_text(e.what());
        }
 
-       show_route(cur_route);
+       show_zone(*cur_zone);
 }
 
-Point Designer::map_pointer_to_ground(int x, int y)
+Vector Designer::map_pointer_to_ground(const Vector &p)
 {
-       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();
+       GL::Vector4 vec = main_view->get_camera().unproject(GL::Vector4(p.x, p.y, 0, 0));
+       const GL::Vector3 &pos = main_view->get_camera().get_position();
 
-       return Point(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z);
+       return pos-GL::Vector3(vec.x, vec.y, vec.z)*(pos.z/vec.z);
 }
 
 void Designer::tick()
@@ -276,27 +356,19 @@ void Designer::tick()
 
        window.tick();
        root.tick();
-       camera_ctl.tick(dt);
-
-       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();
+       camera_ctl->tick(dt);
 
        render();
 
        window.swap_buffers();
 }
 
-void Designer::key_press(unsigned key, unsigned mod, wchar_t)
+void Designer::key_press(unsigned key)
 {
-       key = Input::key_from_sys(key);
-       mod = Input::mod_from_sys(mod);
+       bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R);
 
-       if(key==Msp::Input::KEY_N && (mod&Input::MOD_SHIFT))
-       {
-               manipulator.start_extend();
-               mode = MANIPULATE;
-       }
+       if(key==Msp::Input::KEY_N && shift)
+               extend_track();
        else if(key==Msp::Input::KEY_N)
                new_track();
        else if(key==Msp::Input::KEY_G)
@@ -319,7 +391,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t)
                save();
        else if(key==Msp::Input::KEY_PLUS)
                selection.select_more();
-       else if(key==Msp::Input::KEY_L && (mod&Input::MOD_SHIFT))
+       else if(key==Msp::Input::KEY_L && shift)
                selection.select_blocks();
        else if(key==Msp::Input::KEY_L)
                selection.select_linked();
@@ -343,20 +415,11 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t)
                        selection.clear();
        }
        else if(key==Msp::Input::KEY_X)
+               erase_tracks();
+       else if(key==Msp::Input::KEY_F && shift)
        {
-               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));
-                       layout->remove_track(**i);
-                       delete *i;
-               }
-       }
-       else if(key==Msp::Input::KEY_F && (mod&Input::MOD_SHIFT))
-       {
-               const set<Track *> &tracks = selection.get_tracks();
-               const set<Track *> &ltracks = layout->get_tracks();
+               const set<Track *> &tracks = selection.get_objects<Track>();
+               const set<Track *> &ltracks = layout->get_all<Track>();
                for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
                        (*i)->set_flex(!(*i)->get_flex());
@@ -365,46 +428,49 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t)
                                if(*j!=*i)
                                        (*i)->snap_to(**j, true);
 
-                       update_track_icon(layout_3d->get_track(**i));
+                       update_track_icon(layout_3d->get<Track3D>(**i));
                }
        }
        else if(key==Msp::Input::KEY_F)
-               manipulator.flatten();
-       else if(key==Msp::Input::KEY_E && (mod&Input::MOD_SHIFT))
+               flatten_tracks();
+       else if(key==Msp::Input::KEY_E && shift)
                manipulator.even_slope(true);
        else if(key==Msp::Input::KEY_E)
                manipulator.even_slope();
-       else if(key==Msp::Input::KEY_T)
-               set_turnout_id();
-       else if(key==Msp::Input::KEY_S)
-               set_sensor_id();
        else if(key==Msp::Input::KEY_A)
-               add_selection_to_route();
+       {
+               if(cur_route)
+                       add_selection_to_route();
+               else if(cur_zone)
+                       add_selection_to_zone();
+       }
        else if(key==Msp::Input::KEY_C)
-               manipulator.connect();
+               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 mod)
+void Designer::button_press(unsigned btn)
 {
-       y = window.get_height()-y-1;
-       mod = Input::mod_from_sys(mod);
+       bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R);
 
-       Point ground = map_pointer_to_ground(x, y);
+       Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0);
+       Vector ground = map_pointer_to_ground(pointer);
 
        if(mode==CATALOGUE)
        {
                if(btn==1)
                {
-                       Track3D *ctrack = pick_track(x, y);
-                       if(ctrack)
+                       Object *cobj = pick_object(pointer);
+                       if(cobj)
                        {
-                               Track *track = new Track(*layout, ctrack->get_track().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;
                        }
@@ -416,106 +482,49 @@ void Designer::button_press(int x, int y, unsigned btn, unsigned mod)
        {
                if(btn==1)
                {
-                       Track3D *track = pick_track(x, y);
-                       if(track)
+                       Object *obj = pick_object(pointer);
+                       if(obj)
                        {
-                               if(!(mod&Input::MOD_SHIFT))
+                               if(!shift)
                                        selection.clear();
-                               selection.toggle_track(&track->get_track());
+                               selection.toggle_object(obj);
                        }
                }
        }
        else if(mode==MEASURE)
-               measure.button_press(x, y, ground.x, ground.y, btn);
+               measure.button_press(ground.x, ground.y, btn);
 }
 
-void Designer::pointer_motion(int x, int y)
+void Designer::axis_motion(unsigned, float, float)
 {
-       y = window.get_height()-y-1;
+       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();
 
-       if(!root.get_child_at(x, y))
+       if(!root.get_child_at(wx, wy))
        {
-               Point ground = map_pointer_to_ground(x, y);
-               measure.pointer_motion(x, y, ground.x, ground.y);
+               Vector ground = map_pointer_to_ground(pointer);
+               measure.pointer_motion(ground.x, ground.y);
        }
 }
 
-void Designer::apply_camera()
-{
-       if(mode==CATALOGUE)
-       {
-               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()
 {
        GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
 
-       if(mode==CATALOGUE)
-       {
-               apply_camera();
-               cat_layout_3d->get_scene().render();
-       }
-       else
-       {
-               pipeline->render_all();
-               GL::enable(GL_CULL_FACE);
-               {
-                       GL::Bind bind_blend(GL::Blend::alpha());
-                       overlay->render(0);
-               }
-
-               GL::Bind bind_depth(GL::DepthTest::lequal());
-               if(mode==MEASURE)
-                       measure.render();
-       }
-
-       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();
+       View3D *view = (mode==CATALOGUE ? cat_view : main_view);
+       view->render();
 
-       GL::disable(GL::DEPTH_TEST);
-
-       GL::Bind bind_blend(GL::Blend::alpha());
        root.render();
-       GL::Texture::unbind();
 }
 
-void Designer::track_added(Track &trk)
+Object *Designer::pick_object(const Vector &pointer)
 {
-       new_tracks.push_back(&trk);
-}
-
-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;
-       if(mode==CATALOGUE)
-               l = cat_layout_3d;
-
-       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;
+       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));
 
-       apply_camera();
-
-       return l->pick_track(xx, yy, size);
+       return view.get_layout().get_layout().pick<Object>(Ray(cpos, Vector(cray)));
 }
 
 void Designer::update_track_icon(Track3D &track)
@@ -528,21 +537,21 @@ void Designer::update_track_icon(Track3D &track)
        if(unsigned sid = track.get_track().get_sensor_id())
        {
                overlay->add_graphic(track, "sensor");
-               overlay->set_label(track, lexical_cast(sid));
+               overlay->set_label(track, lexical_cast<string>(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));
+                       overlay->set_label(track, lexical_cast<string>(tid));
                }
        }
 }
 
 void Designer::selection_changed()
 {
-       const set<Track *> &tracks = selection.get_tracks();
+       const set<Track *> &tracks = selection.get_objects<Track>();
        if(tracks.empty())
                lbl_status->set_text(string());
        else
@@ -570,8 +579,8 @@ 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;
-       string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff);
+       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);
 }
 
@@ -581,25 +590,11 @@ void Designer::measure_done()
        selection_changed();
 }
 
-void Designer::turnout_id_accept(const string &text)
-{
-       Track *track = selection.get_track();
-       unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
-       track->set_turnout_id(id);
-
-       update_track_icon(layout_3d->get_track(*track));
-}
-
-void Designer::sensor_id_accept(const string &text)
+void Designer::track_properties_response(int)
 {
-       const set<Track *> &tracks = selection.get_tracks();
-       unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
+       const set<Track *> &tracks = selection.get_objects<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-       {
-               (*i)->set_sensor_id(id);
-
-               update_track_icon(layout_3d->get_track(**i));
-       }
+               update_track_icon(layout_3d->get<Track3D>(**i));
 }
 
 void Designer::route_name_accept(const string &text)
@@ -616,46 +611,57 @@ void Designer::svg_export_accept(const string &text)
 
 string Designer::tooltip(int x, int y)
 {
-       if(Track3D *t3d = pick_track(x, y))
+       const GLtk::Geometry &rgeom = root.get_geometry();
+       if(Object *obj = pick_object(Vector(x*2.0f/rgeom.w-1.0f, y*2.0f/rgeom.h-1.0f, 0)))
        {
-               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());
-
+               const ObjectType &otype = obj->get_type();
+               string info = format("%d %s", otype.get_article_number(), otype.get_description());
+               if(Track *track = dynamic_cast<Track *>(obj))
+               {
+                       if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4)
+                               info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*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;
        }
 
        return string();
 }
 
-void Designer::show_route(const Route *route)
+void Designer::clear_paths()
+{
+       for(list<Path3D *>::iterator i=highlight_paths.begin(); i!=highlight_paths.end(); ++i)
+               delete *i;
+       highlight_paths.clear();
+}
+
+void Designer::show_route(const Route &route)
 {
-       const set<Track *> &ltracks = layout->get_tracks();
-       for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+       clear_paths();
+
+       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);
-               if(route && route->has_track(**i))
-               {
-                       t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0));
-                       if((*i)->get_type().is_turnout())
-                       {
-                               unsigned tid = (*i)->get_turnout_id();
-                               int path = (tid ? route->get_turnout(tid) : -1);
-                               if(path>=0)
-                                       t3d.get_path().set_path(path);
-                               else
-                                       t3d.get_path().set_mask((*i)->get_type().get_paths());
-                       }
-                       else
-                               t3d.get_path().set_path(0);
-               }
-               else
-                       t3d.get_path().set_mask(0);
+               Track3D &t3d = layout_3d->get<Track3D>(**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->set_path(route.get_turnout(tid));
+       }
+}
+
+void Designer::show_zone(const Zone &zone)
+{
+       clear_paths();
+
+       const Zone::TrackSet &ztracks = zone.get_tracks();
+       for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i)
+       {
+               Track3D &t3d = layout_3d->get<Track3D>(**i);
+               Path3D *path = new Path3D(t3d);
+               path->set_color(GL::Color(0.8, 1.0, 0.5));
        }
 }