]> git.tdb.fi Git - r2c2.git/blobdiff - source/designer/designer.cpp
Adapt to changes in vector slicing and composing API
[r2c2.git] / source / designer / designer.cpp
index 92c2f25564b177918a80129fdd1a9b6a26778f88..511c901b5d5b3c70aa9ef086f775ff4ca72cf302 100644 (file)
@@ -1,74 +1,76 @@
-/* $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>
-#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/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/terrain.h"
+#include "libr2c2/tracktype.h"
+#include "libr2c2/zone.h"
 #include "3d/path.h"
 #include "designer.h"
+#include "elevatetool.h"
+#include "extendtool.h"
 #include "input.h"
+#include "layoutbar.h"
 #include "manipulator.h"
 #include "measure.h"
+#include "movetool.h"
+#include "objectproperties.h"
+#include "objectselecttool.h"
+#include "rotatetool.h"
+#include "routebar.h"
 #include "selection.h"
-#include "toolbar.h"
+#include "slopetool.h"
+#include "svgexporter.h"
+#include "terraintool.h"
+#include "trackbar.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),
+       keyboard(window),
+       mouse(window),
+       ui_res("data/r2c2.res"),
+       root(ui_res, &window, &keyboard, &mouse),
        base_object(0),
        cur_route(0),
-       mode(SELECT),
-       manipulator(*this, selection),
-       measure(*this),
-       camera_ctl(window, camera),
-       track_wrap(*this, selection)
+       cur_zone(0),
+       mode(TOOL),
+       sel_wrap(selection),
+       cur_tool(0),
+       keep_status(0)
 {
        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));
-
        // Setup catalogue and layout
-       DataFile::load(catalogue, "tracks.dat");
+       catalogue.add_source("data/Märklin/H0");
 
        cat_layout_3d = new Layout3D(catalogue.get_layout());
 
        layout = new Layout(catalogue);
+       layout->get_clock().set_current_time(12*Time::hour);
        layout_3d = new Layout3D(*layout);
-
-       layout->signal_track_added.connect(sigc::mem_fun(this, &Designer::track_added));
+       layout_3d->tick();
 
        if(argc>1)
        {
@@ -83,73 +85,90 @@ Designer::Designer(int argc, char **argv):
        }
 
        // Setup OpenGL
-       GL::enable(GL_CULL_FACE);
+       cat_view = new View3D(*cat_layout_3d, window.get_width(), window.get_height());
 
-       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);
+       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));
-       view_all();
+       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
-       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));
-
-       toolbar = new Toolbar(*this);
-       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);
-       statusbar->set_size(window.get_width(), 20);
+       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));
+       root.signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip));
+       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_focusable(false);
+       root_layout->set_gravity(*statusbar, -1, -1);
+       root_layout->set_expand(*statusbar, true, false);
 
-       lbl_status = new GLtk::Label(ui_res);
+       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");
+
+       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<Object *> &objects = layout->get_all<Object>();
+       for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               update_object_icon(**i);
 }
 
 Designer::~Designer()
 {
+       for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
+               delete *i;
+       delete camera_ctl;
        delete overlay;
-       delete root;
-       delete pipeline;
+       delete main_view;
        delete base_object;
        delete layout_3d;
        delete layout;
+       delete cat_view;
        delete cat_layout_3d;
 }
 
@@ -157,7 +176,7 @@ int Designer::main()
 {
        window.show();
 
-       mode = SELECT;
+       use_select_tool();
 
        return Application::main();
 }
@@ -166,6 +185,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()
@@ -173,86 +194,147 @@ void Designer::quit()
        exit(0);
 }
 
-void Designer::new_track()
+void Designer::new_object()
 {
+       use_select_tool();
+
        mode = CATALOGUE;
+       lbl_status->set_text("Select new object or press Esc to cancel");
 }
 
-void Designer::set_turnout_id()
+void Designer::erase_objects()
 {
-       Track *track = selection.get_track();
-       if(selection.size()==1 && track->get_type().is_turnout())
+       use_select_tool();
+
+       set<Object *> objects = selection.get_objects();
+       selection.clear();
+       for(set<Object *>::iterator i=objects.begin(); i!=objects.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_3d(**i));
+               delete *i;
        }
 }
 
-void Designer::set_sensor_id()
+void Designer::object_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;
-               }
-       }
+       use_select_tool();
+       if(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));
-       }
+       ObjectProperties *dlg = new ObjectProperties(selection);
+       root.add(*dlg);
+       root_layout->set_gravity(*dlg, 0, 0);
+
+       dlg->signal_response.connect(sigc::mem_fun(this, &Designer::object_properties_response));
+}
+
+void Designer::extend_track()
+{
+       use_tool_with_selected_objects<ExtendTool>();
+}
+
+void Designer::connect_tracks()
+{
+       use_tool_with_selected_objects<ExtendTool>()->connect();
+}
+
+void Designer::flatten_tracks()
+{
+       use_tool_with_selected_objects<SlopeTool>()->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;
+       cur_zone = 0;
+       if(cur_route)
+               show_route(*cur_route);
+       else
+               clear_paths();
 }
 
 void Designer::rename_route()
 {
+       use_select_tool();
        if(!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::edit_route(Route *r)
+void Designer::add_selection_to_route()
 {
-       cur_route = r;
-       show_route(r);
+       if(!cur_route)
+               return;
+
+       try
+       {
+               cur_route->add_tracks(selection.get_objects<Track>());
+       }
+       catch(const exception &e)
+       {
+               lbl_status->set_text(e.what());
+       }
+
+       show_route(*cur_route);
 }
 
-void Designer::add_selection_to_route()
+void Designer::edit_zone(Zone *z)
 {
-       if(!cur_route)
+       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_route->add_tracks(selection.get_tracks());
+               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_coords(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()
@@ -261,84 +343,67 @@ void Designer::tick()
        float dt = (t-last_tick)/Msp::Time::sec;
        last_tick = t;
 
-       window.get_display().tick();
-       root->tick();
-       camera_ctl.tick(dt);
+       if(cur_tool && cur_tool->is_done())
+       {
+               cur_tool->update_selection(selection);
+               use_select_tool();
+       }
+       keep_status = 0;
 
-       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();
+       window.tick();
+       root.tick();
+       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)
-               new_track();
+       if(key==Msp::Input::KEY_N && shift)
+               use_tool_with_selected_objects<ExtendTool>();
+       else if(key==Msp::Input::KEY_N)
+               new_object();
        else if(key==Msp::Input::KEY_G)
-       {
-               manipulator.start_move();
-               mode = MANIPULATE;
-       }
+               use_tool_with_selected_objects<MoveTool>();
        else if(key==Msp::Input::KEY_R)
-       {
-               manipulator.start_rotate();
-               mode = MANIPULATE;
-       }
+               use_tool_with_selected_objects<RotateTool>();
        else if(key==Msp::Input::KEY_D)
        {
-               manipulator.duplicate();
-               manipulator.start_move();
-               mode = MANIPULATE;
+               const set<Object *> &sel_objs = selection.get_objects();
+               list<Object *> new_objs;
+               for(set<Object *>::iterator i=sel_objs.begin(); i!=sel_objs.end(); ++i)
+               {
+                       Object *obj = (*i)->clone(layout);
+                       for(list<Object *>::iterator j=new_objs.begin(); j!=new_objs.end(); ++j)
+                               obj->link_to(**j);
+                       new_objs.push_back(obj);
+               }
+
+               selection.replace(new_objs.begin(), new_objs.end());
+
+               use_tool_with_selected_objects<MoveTool>();
        }
        else if(key==Msp::Input::KEY_W)
                save();
-       else if(key==Msp::Input::KEY_PLUS)
-               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();
        else if(key==Msp::Input::KEY_M)
-       {
-               measure.start();
-               mode = MEASURE;
-       }
+               use_tool<Measure>();
        else if(key==Msp::Input::KEY_Z)
-       {
-               manipulator.start_elevate();
-               mode = MANIPULATE;
-       }
+               use_tool_with_selected_objects<ElevateTool>();
        else if(key==Msp::Input::KEY_ESC)
        {
-               if(mode==MANIPULATE)
-                       manipulator.cancel();
-               else if(mode==CATALOGUE)
-                       mode = SELECT;
-               else
-                       selection.clear();
+               if(mode==CATALOGUE)
+                       use_select_tool();
        }
        else if(key==Msp::Input::KEY_X)
+               erase_objects();
+       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());
@@ -347,310 +412,244 @@ 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_object_icon(**i);
                }
        }
        else if(key==Msp::Input::KEY_F)
-               manipulator.flatten();
-       else if(key==Msp::Input::KEY_E && (mod&Input::MOD_SHIFT))
-               manipulator.even_slope(true);
+               use_tool_with_selected_objects<SlopeTool>()->flatten();
+       else if(key==Msp::Input::KEY_E && shift)
+               use_tool_with_selected_objects<SlopeTool>()->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();
+               use_tool_with_selected_objects<SlopeTool>()->even_slope();
        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)
-{
-       y = window.get_height()-y-1;
-       mod = Input::mod_from_sys(mod);
-
-       Point ground = map_pointer_coords(x, y);
-
-       if(mode==CATALOGUE)
        {
-               if(btn==1)
-               {
-                       Track3D *ctrack = pick_track(x, y);
-                       if(ctrack)
-                       {
-                               Track *track = new Track(*layout, ctrack->get_track().get_type());
-                               track->set_position(ground);
-
-                               selection.clear();
-                               selection.add_track(track);
-
-                               mode = SELECT;
-                       }
-               }
-               else
-                       mode = SELECT;
+               if(cur_route)
+                       add_selection_to_route();
+               else if(cur_zone)
+                       add_selection_to_zone();
        }
-       else if(mode==SELECT)
+       else if(key==Msp::Input::KEY_C)
+               use_tool_with_selected_objects<ExtendTool>()->connect();
+       else if(key==Msp::Input::KEY_V)
+               svg_export();
+       else if(key==Msp::Input::KEY_P)
+               object_properties();
+       else if(key==Msp::Input::KEY_TAB)
        {
-               if(btn==1)
-               {
-                       Track3D *track = pick_track(x, y);
-                       if(track)
-                       {
-                               if(!(mod&Input::MOD_SHIFT))
-                                       selection.clear();
-                               selection.toggle_track(&track->get_track());
-                       }
-               }
+               Object *obj = selection.get_object();
+               if(Terrain *terrain = dynamic_cast<Terrain *>(obj))
+                       use_tool(new TerrainTool(*this, keyboard, mouse, *terrain));
        }
-       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);
 }
 
-void Designer::pointer_motion(int x, int y)
+template<typename T>
+T *Designer::use_tool_with_selected_objects()
 {
-       y = window.get_height()-y-1;
+       T *tool = new T(*this, keyboard, mouse, selection.get_objects());
+       use_tool(tool);
+       return tool;
+}
 
-       if(!root->get_child_at(x, y))
-       {
-               Point ground = map_pointer_coords(x, y);
-               manipulator.pointer_motion(x, y, ground.x, ground.y);
-               measure.pointer_motion(x, y, ground.x, ground.y);
-       }
+template<typename T>
+T *Designer::use_tool()
+{
+       T *tool = new T(*this, keyboard, mouse);
+       use_tool(tool);
+       return tool;
 }
 
-void Designer::apply_camera()
+void Designer::use_tool(Tool *tool)
 {
-       if(mode==CATALOGUE)
+       if(cur_tool)
        {
-               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);
+               delete cur_tool;
+               cur_tool = 0;
        }
-       else
-               camera.apply();
+
+       cur_tool = tool;
+       cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status));
+       if(keep_status<2)
+               tool_status(tool->get_status());
+       mode = TOOL;
+       keep_status = 1;
 }
 
-void Designer::render()
+void Designer::use_select_tool()
 {
-       GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
+       use_tool(new ObjectSelectTool(*this, keyboard, mouse, selection));
+}
+
+void Designer::button_press(unsigned btn)
+{
+       Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0);
+       Vector ground = map_pointer_to_ground(pointer);
 
        if(mode==CATALOGUE)
        {
-               apply_camera();
-               cat_layout_3d->get_scene().render();
-       }
-       else
-       {
-               pipeline->render_all();
-               GL::enable(GL_CULL_FACE);
+               Object *obj = 0;
+               if(btn==1)
+                       obj = pick_object(pointer);
+
+               if(obj)
                {
-                       GL::Bind bind_blend(GL::Blend::alpha());
-                       overlay->render(0);
+                       obj = obj->clone(layout);
+                       obj->set_position(ground);
+
+                       selection.clear();
+                       selection.add_object(obj);
                }
 
-               GL::Bind bind_depth(GL::DepthTest::lequal());
-               if(mode==MEASURE)
-                       measure.render();
+               if(obj || btn==3)
+                       use_select_tool();
        }
-
-       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::disable(GL::DEPTH_TEST);
-
-       GL::Bind bind_blend(GL::Blend::alpha());
-       root->render();
-       GL::Texture::unbind();
 }
 
-void Designer::track_added(Track &trk)
+void Designer::render()
 {
-       new_tracks.push_back(&trk);
-}
+       GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
 
-Track3D *Designer::pick_track(int x, int y)
-{
-       Layout3D *l = layout_3d;
-       if(mode==CATALOGUE)
-               l = cat_layout_3d;
+       View3D *view = (mode==CATALOGUE ? cat_view : main_view);
+       view->render();
 
-       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;
+       root.render();
+}
 
-       apply_camera();
+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 l->pick_track(xx, yy, size);
+       return view.get_layout().get_layout().pick<Object>(Ray(cpos, cray.slice<3>(0)));
 }
 
-void Designer::update_track_icon(Track3D &track)
+void Designer::update_object_icon(Object &obj)
 {
-       overlay->clear(track);
-
-       if(track.get_track().get_flex())
-               overlay->add_graphic(track, "flex");
+       Object3D &obj3d = layout_3d->get_3d(obj);
+       overlay->clear(obj3d);
 
-       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(Track *track = dynamic_cast<Track *>(&obj))
        {
-               if(tid<0x800)
+               if(track->get_flex())
+                       overlay->add_graphic(obj3d, "flex");
+
+               if(unsigned saddr = track->get_sensor_address())
+               {
+                       overlay->add_graphic(obj3d, "trackcircuit");
+                       overlay->set_label(obj3d, lexical_cast<string>(saddr));
+               }
+               else if(track->get_type().is_turnout())
                {
-                       overlay->add_graphic(track, "turnout");
-                       overlay->set_label(track, lexical_cast(tid));
+                       unsigned taddr = track->get_turnout_address();
+                       if(taddr<0x800)
+                       {
+                               overlay->add_graphic(obj3d, "turnout");
+                               overlay->set_label(obj3d, lexical_cast<string>(taddr));
+                       }
                }
        }
-}
-
-void Designer::selection_changed()
-{
-       const set<Track *> &tracks = selection.get_tracks();
-       if(tracks.empty())
-               lbl_status->set_text(string());
-       else
+       else if(Signal *signal = dynamic_cast<Signal *>(&obj))
        {
-               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));
+               overlay->add_graphic(obj3d, "signal");
+               overlay->set_label(obj3d, lexical_cast<string>(signal->get_address()));
+       }
+       else if(BeamGate *gate = dynamic_cast<BeamGate *>(&obj))
+       {
+               overlay->add_graphic(obj3d, "beamgate");
+               overlay->set_label(obj3d, lexical_cast<string>(gate->get_address()));
        }
 }
 
-void Designer::manipulation_status(const string &status)
+void Designer::tool_status(const string &status)
 {
        lbl_status->set_text(status);
+       if(keep_status==1)
+               keep_status = 2;
 }
 
-void Designer::manipulation_done(bool)
-{
-       mode = SELECT;
-       selection_changed();
-}
-
-void Designer::measure_changed()
+void Designer::object_properties_response(int)
 {
-       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);
+       const set<Object *> &objects = selection.get_objects();
+       for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               update_object_icon(**i);
 }
 
-void Designer::measure_done()
+void Designer::route_name_accept(const string &text)
 {
-       mode = SELECT;
-       selection_changed();
+       if(cur_route)
+               cur_route->set_name(text);
 }
 
-void Designer::turnout_id_accept(const string &text)
+void Designer::svg_export_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));
+       SvgExporter svg_exp(*layout);
+       svg_exp.save(text);
 }
 
-void Designer::sensor_id_accept(const string &text)
+string Designer::tooltip(int x, int y)
 {
-       const set<Track *> &tracks = selection.get_tracks();
-       unsigned id = (text.empty() ? 0 : lexical_cast<unsigned>(text));
-       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       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)))
        {
-               (*i)->set_sensor_id(id);
-
-               update_track_icon(layout_3d->get_track(**i));
+               const ObjectType &otype = obj->get_type();
+               string info = format("%d %s", otype.get_article_number(), otype.get_name());
+               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_type().is_turnout())
+                               info += format(" (turnout %d)", track->get_turnout_address());
+                       else if(track->get_sensor_address())
+                               info += format(" (sensor %d)", track->get_sensor_address());
+               }
+               if(mode==CATALOGUE)
+               {
+                       const string &descr = otype.get_description();
+                       if(!descr.empty())
+                       {
+                               info += '\n';
+                               info += otype.get_description();
+                       }
+               }
+               return info;
        }
+
+       return string();
 }
 
-void Designer::route_name_accept(const string &text)
+void Designer::clear_paths()
 {
-       if(cur_route)
-               cur_route->set_name(text);
+       for(list<Path3D *>::iterator i=highlight_paths.begin(); i!=highlight_paths.end(); ++i)
+               delete *i;
+       highlight_paths.clear();
 }
 
-void Designer::view_all()
+void Designer::show_route(const Route &route)
 {
-       Point minp;
-       Point maxp;
+       clear_paths();
 
-       const Layout3D::TrackMap &tracks = layout_3d->get_tracks();
-       for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+       const set<Track *> &rtracks = route.get_tracks();
+       for(set<Track *>::iterator i=rtracks.begin(); i!=rtracks.end(); ++i)
        {
-               Point tmin;
-               Point tmax;
-               i->second->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);
+               Track3D &t3d = layout_3d->get_3d(**i);
+               Path3D *path = new Path3D(t3d);
+               path->set_color(GL::Color(0.5, 0.8, 1.0));
+               if((*i)->get_type().is_turnout())
+                       path->set_path(route.get_turnout((*i)->get_turnout_address()));
+               highlight_paths.push_back(path);
        }
-
-       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)
+void Designer::show_zone(const Zone &zone)
 {
-       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;
-       }
-
-       return string();
-}
+       clear_paths();
 
-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)
+       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);
-               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_3d(**i);
+               Path3D *path = new Path3D(t3d);
+               path->set_color(GL::Color(0.8, 1.0, 0.5));
+               highlight_paths.push_back(path);
        }
 }