X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=3d068d0ad42d4252adb1561f45874e46bb6790ee;hb=ab0cffffb161d8d76e77e7444eb6141312059bfb;hp=6ae9c0726c45701a5915adc9f852d9fdc1b75e66;hpb=a34ddfcc90e80188545fdd2c6bbca8dfba7f1ad0;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 6ae9c07..3d068d0 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -17,6 +17,7 @@
 #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"
@@ -35,6 +36,7 @@
 #include "selection.h"
 #include "slopetool.h"
 #include "svgexporter.h"
+#include "terraintool.h"
 #include "trackbar.h"
 #include "zonebar.h"
 #include "zoneproperties.h"
@@ -54,13 +56,15 @@ Designer::Designer(int argc, char **argv):
 	cur_zone(0),
 	mode(TOOL),
 	sel_wrap(selection),
-	cur_tool(0)
+	cur_tool(0),
+	keep_status(0)
 {
 	window.set_title("Railway Designer");
 	window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0));
 
 	// Setup catalogue and layout
 	DataFile::load(catalogue, "tracks.dat");
+	DataFile::load(catalogue, "terrain.dat");
 
 	cat_layout_3d = new Layout3D(catalogue.get_layout());
 
@@ -343,6 +347,7 @@ void Designer::tick()
 		cur_tool->update_selection(selection);
 		use_select_tool();
 	}
+	keep_status = 0;
 
 	window.tick();
 	root.tick();
@@ -428,6 +433,12 @@ void Designer::key_press(unsigned key)
 		svg_export();
 	else if(key==Msp::Input::KEY_P)
 		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));
+	}
 }
 
 template<typename T>
@@ -456,8 +467,10 @@ void Designer::use_tool(Tool *tool)
 
 	cur_tool = tool;
 	cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status));
-	tool_status(cur_tool->get_status());
+	if(keep_status<2)
+		tool_status(tool->get_status());
 	mode = TOOL;
+	keep_status = 1;
 }
 
 void Designer::use_select_tool()
@@ -472,7 +485,7 @@ void Designer::button_press(unsigned btn)
 
 	if(mode==CATALOGUE)
 	{
-		Object *obj;
+		Object *obj = 0;
 		if(btn==1)
 			obj = pick_object(pointer);
 
@@ -548,6 +561,8 @@ void Designer::update_object_icon(Object &obj)
 void Designer::tool_status(const string &status)
 {
 	lbl_status->set_text(status);
+	if(keep_status==1)
+		keep_status = 2;
 }
 
 void Designer::object_properties_response(int)
@@ -610,6 +625,7 @@ void Designer::show_route(const Route &route)
 		path->set_color(GL::Color(0.5, 0.8, 1.0));
 		if(unsigned taddr = (*i)->get_turnout_address())
 			path->set_path(route.get_turnout(taddr));
+		highlight_paths.push_back(path);
 	}
 }
 
@@ -623,5 +639,6 @@ void Designer::show_zone(const Zone &zone)
 		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);
 	}
 }