X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=511c901b5d5b3c70aa9ef086f775ff4ca72cf302;hb=b86f4adf319881697e6ecb46aaeaffe01d7b0a0a;hp=d640073427c5c936ce2ceb53ced27d9a0472775f;hpb=e214fd389b9819eac0379cfb78e0f446e267b839;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index d640073..511c901 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -17,19 +17,27 @@
 #include <msp/time/units.h>
 #include <msp/time/utils.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 "slopetool.h"
 #include "svgexporter.h"
+#include "terraintool.h"
 #include "trackbar.h"
-#include "trackproperties.h"
 #include "zonebar.h"
 #include "zoneproperties.h"
 
@@ -41,35 +49,28 @@ Designer::Designer(int argc, char **argv):
 	window(1280, 960),
 	keyboard(window),
 	mouse(window),
-	ui_res("r2c2.res"),
+	ui_res("data/r2c2.res"),
 	root(ui_res, &window, &keyboard, &mouse),
 	base_object(0),
 	cur_route(0),
 	cur_zone(0),
-	mode(SELECT),
+	mode(TOOL),
 	sel_wrap(selection),
-	manipulator(*this, mouse, selection),
-	measure(*this)
+	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_object_added.connect(sigc::mem_fun(this, &Designer::object_added));
-	layout->signal_object_removed.connect(sigc::mem_fun(this, &Designer::object_removed));
+	layout_3d->tick();
 
 	if(argc>1)
 	{
@@ -109,26 +110,35 @@ Designer::Designer(int argc, char **argv):
 	// Setup UI
 	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));
+	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(this, &Designer::arrange_toolbars)));
+		(*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;
 	}
-	arrange_toolbars();
 
 	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);
@@ -137,16 +147,15 @@ Designer::Designer(int argc, char **argv):
 	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 = 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()
@@ -167,7 +176,7 @@ int Designer::main()
 {
 	window.show();
 
-	mode = SELECT;
+	use_select_tool();
 
 	return Application::main();
 }
@@ -176,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()
@@ -183,72 +194,61 @@ void Designer::quit()
 	exit(0);
 }
 
-void Designer::new_track()
+void Designer::new_object()
 {
-	if(mode!=SELECT)
-		return;
+	use_select_tool();
 
 	mode = CATALOGUE;
-	lbl_status->set_text("Select new track or press Esc to cancel");
+	lbl_status->set_text("Select new object or press Esc to cancel");
 }
 
-void Designer::erase_tracks()
+void Designer::erase_objects()
 {
-	if(mode!=SELECT)
-		return;
+	use_select_tool();
 
-	set<Track *> tracks = selection.get_objects<Track>();
+	set<Object *> objects = selection.get_objects();
 	selection.clear();
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(set<Object *>::iterator i=objects.begin(); i!=objects.end(); ++i)
 	{
-		overlay->clear(layout_3d->get_track(**i));
+		overlay->clear(layout_3d->get_3d(**i));
 		delete *i;
 	}
 }
 
-void Designer::track_properties()
+void Designer::object_properties()
 {
-	if(mode!=SELECT || selection.empty())
+	use_select_tool();
+	if(selection.empty())
 		return;
 
-	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);
+	ObjectProperties *dlg = new ObjectProperties(selection);
+	root.add(*dlg);
+	root_layout->set_gravity(*dlg, 0, 0);
 
-	track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response));
+	dlg->signal_response.connect(sigc::mem_fun(this, &Designer::object_properties_response));
 }
 
 void Designer::extend_track()
 {
-	if(mode!=SELECT)
-		return;
-
-	if(manipulator.start_extend())
-		mode = MANIPULATE;
+	use_tool_with_selected_objects<ExtendTool>();
 }
 
 void Designer::connect_tracks()
 {
-	if(mode!=SELECT)
-		return;
-
-	manipulator.connect();
+	use_tool_with_selected_objects<ExtendTool>()->connect();
 }
 
 void Designer::flatten_tracks()
 {
-	if(mode!=SELECT)
-		return;
-
-	manipulator.flatten();
+	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)
@@ -263,11 +263,14 @@ void Designer::edit_route(Route *r)
 
 void Designer::rename_route()
 {
-	if(mode!=SELECT || !cur_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::add_selection_to_route()
@@ -340,17 +343,17 @@ void Designer::tick()
 	float dt = (t-last_tick)/Msp::Time::sec;
 	last_tick = t;
 
-	if(mode==MANIPULATE_DONE)
-		mode = SELECT;
+	if(cur_tool && cur_tool->is_done())
+	{
+		cur_tool->update_selection(selection);
+		use_select_tool();
+	}
+	keep_status = 0;
 
 	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();
-
 	render();
 
 	window.swap_buffers();
@@ -361,54 +364,42 @@ void Designer::key_press(unsigned key)
 	bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R);
 
 	if(key==Msp::Input::KEY_N && shift)
-		extend_track();
+		use_tool_with_selected_objects<ExtendTool>();
 	else if(key==Msp::Input::KEY_N)
-		new_track();
+		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 && 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_tracks();
+		erase_objects();
 	else if(key==Msp::Input::KEY_F && shift)
 	{
 		const set<Track *> &tracks = selection.get_objects<Track>();
@@ -421,15 +412,15 @@ void Designer::key_press(unsigned key)
 				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)
-		flatten_tracks();
+		use_tool_with_selected_objects<SlopeTool>()->flatten();
 	else if(key==Msp::Input::KEY_E && shift)
-		manipulator.even_slope(true);
+		use_tool_with_selected_objects<SlopeTool>()->even_slope(true);
 	else if(key==Msp::Input::KEY_E)
-		manipulator.even_slope();
+		use_tool_with_selected_objects<SlopeTool>()->even_slope();
 	else if(key==Msp::Input::KEY_A)
 	{
 		if(cur_route)
@@ -438,66 +429,78 @@ void Designer::key_press(unsigned key)
 			add_selection_to_zone();
 	}
 	else if(key==Msp::Input::KEY_C)
-		connect_tracks();
+		use_tool_with_selected_objects<ExtendTool>()->connect();
 	else if(key==Msp::Input::KEY_V)
 		svg_export();
 	else if(key==Msp::Input::KEY_P)
-		track_properties();
+		object_properties();
+	else if(key==Msp::Input::KEY_TAB)
+	{
+		Object *obj = selection.get_object();
+		if(Terrain *terrain = dynamic_cast<Terrain *>(obj))
+			use_tool(new TerrainTool(*this, keyboard, mouse, *terrain));
+	}
 }
 
-void Designer::button_press(unsigned btn)
+template<typename T>
+T *Designer::use_tool_with_selected_objects()
 {
-	bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R);
+	T *tool = new T(*this, keyboard, mouse, selection.get_objects());
+	use_tool(tool);
+	return tool;
+}
 
-	Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0);
-	Vector ground = map_pointer_to_ground(pointer);
+template<typename T>
+T *Designer::use_tool()
+{
+	T *tool = new T(*this, keyboard, mouse);
+	use_tool(tool);
+	return tool;
+}
 
-	if(mode==CATALOGUE)
+void Designer::use_tool(Tool *tool)
+{
+	if(cur_tool)
 	{
-		if(btn==1)
-		{
-			Object *cobj = pick_object(pointer);
-			if(cobj)
-			{
-				Object *obj = cobj->clone(layout);
-				obj->set_position(ground);
+		delete cur_tool;
+		cur_tool = 0;
+	}
 
-				selection.clear();
-				selection.add_object(obj);
+	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;
+}
 
-				mode = SELECT;
-			}
-		}
-		else
-			mode = SELECT;
-	}
-	else if(mode==SELECT)
-	{
-		if(btn==1)
-		{
-			Object *obj = pick_object(pointer);
-			if(obj)
-			{
-				if(!shift)
-					selection.clear();
-				selection.toggle_object(obj);
-			}
-		}
-	}
-	else if(mode==MEASURE)
-		measure.button_press(ground.x, ground.y, btn);
+void Designer::use_select_tool()
+{
+	use_tool(new ObjectSelectTool(*this, keyboard, mouse, selection));
 }
 
-void Designer::axis_motion(unsigned, float, float)
+void Designer::button_press(unsigned btn)
 {
 	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();
+	Vector ground = map_pointer_to_ground(pointer);
 
-	if(!root.get_child_at(wx, wy))
+	if(mode==CATALOGUE)
 	{
-		Vector ground = map_pointer_to_ground(pointer);
-		measure.pointer_motion(ground.x, ground.y);
+		Object *obj = 0;
+		if(btn==1)
+			obj = pick_object(pointer);
+
+		if(obj)
+		{
+			obj = obj->clone(layout);
+			obj->set_position(ground);
+
+			selection.clear();
+			selection.add_object(obj);
+		}
+
+		if(obj || btn==3)
+			use_select_tool();
 	}
 }
 
@@ -509,24 +512,6 @@ void Designer::render()
 	view->render();
 
 	root.render();
-	// XXX Should fix GLtk so this would not be needed
-	glColor3f(1.0, 1.0, 1.0);
-}
-
-void Designer::object_added(Object &obj)
-{
-	if(Track *trk = dynamic_cast<Track *>(&obj))
-		new_tracks.push_back(trk);
-}
-
-void Designer::object_removed(Object &obj)
-{
-	if(Track *trk = dynamic_cast<Track *>(&obj))
-	{
-		list<Track *>::iterator i = find(new_tracks.begin(), new_tracks.end(), trk);
-		if(i!=new_tracks.end())
-			new_tracks.erase(i);
-	}
 }
 
 Object *Designer::pick_object(const Vector &pointer)
@@ -535,88 +520,58 @@ Object *Designer::pick_object(const Vector &pointer)
 	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 view.get_layout().get_layout().pick<Object>(Ray(cpos, Vector(cray)));
+	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<string>(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(track, "turnout");
-			overlay->set_label(track, lexical_cast<string>(tid));
+			overlay->add_graphic(obj3d, "trackcircuit");
+			overlay->set_label(obj3d, lexical_cast<string>(saddr));
+		}
+		else if(track->get_type().is_turnout())
+		{
+			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_objects<Track>();
-	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 = 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);
-	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);
-}
-
-void Designer::measure_done()
-{
-	mode = SELECT;
-	selection_changed();
-}
-
-void Designer::arrange_toolbars()
-{
-	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::track_properties_response(int)
+void Designer::object_properties_response(int)
 {
-	const set<Track *> &tracks = selection.get_objects<Track>();
-	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		update_track_icon(layout_3d->get_track(**i));
+	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::route_name_accept(const string &text)
@@ -633,19 +588,28 @@ void Designer::svg_export_accept(const string &text)
 
 string Designer::tooltip(int x, int y)
 {
-	if(Object *obj = pick_object(Vector(x*2.0f/window.get_width()-1.0f, y*2.0f/window.get_height()-1.0f, 0)))
+	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 ObjectType &otype = obj->get_type();
-		string info = format("%d %s", otype.get_article_number(), otype.get_description());
+		string info = format("%d %s", otype.get_article_number(), otype.get_name());
 		if(Track *track = dynamic_cast<Track *>(obj))
 		{
-			const TrackType &ttype = track->get_type();
-			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());
+			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;
 	}
@@ -655,12 +619,9 @@ string Designer::tooltip(int x, int y)
 
 void Designer::clear_paths()
 {
-	const set<Track *> &ltracks = layout->get_all<Track>();
-	for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-	{
-		Track3D &t3d = layout_3d->get_track(**i);
-		t3d.get_path().set_mask(0);
-	}
+	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)
@@ -670,15 +631,12 @@ void Designer::show_route(const Route &route)
 	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());
+		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);
 	}
 }
 
@@ -689,8 +647,9 @@ void Designer::show_zone(const Zone &zone)
 	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());
+		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);
 	}
 }