X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=7c100db390172cdbfe76cd90e84844725d3b40c8;hb=9b5a6a6f032863fe525623420c8086a62188b771;hp=3db5d502d12f985928260077962a9c74bdaa9ffa;hpb=4049f5bdacfdb61247f3c74fc5f748990be7bd4d;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 3db5d50..7c100db 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -21,12 +21,17 @@
 #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 "rotatetool.h"
 #include "routebar.h"
 #include "selection.h"
+#include "slopetool.h"
 #include "svgexporter.h"
 #include "trackbar.h"
 #include "trackproperties.h"
@@ -48,17 +53,12 @@ Designer::Designer(int argc, char **argv):
 	cur_zone(0),
 	mode(SELECT),
 	sel_wrap(selection),
-	manipulator(*this, mouse, selection),
-	measure(*this)
+	cur_tool(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");
@@ -68,9 +68,6 @@ Designer::Designer(int argc, char **argv):
 	layout = new Layout(catalogue);
 	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));
-
 	if(argc>1)
 	{
 		filename = argv[1];
@@ -109,7 +106,6 @@ 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);
@@ -147,7 +143,6 @@ 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));
@@ -232,27 +227,17 @@ void Designer::track_properties()
 
 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()
@@ -354,17 +339,18 @@ void Designer::tick()
 	float dt = (t-last_tick)/Msp::Time::sec;
 	last_tick = t;
 
-	if(mode==MANIPULATE_DONE)
+	if(cur_tool && cur_tool->is_done())
+	{
+		cur_tool->update_selection(selection);
+		delete cur_tool;
+		cur_tool = 0;
 		mode = SELECT;
+	}
 
 	window.tick();
 	root.tick();
 	camera_ctl->tick(dt);
 
-	for(list<Track *>::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i)
-		layout_3d->get<Track3D>(**i).get_path().set_mask(0);
-	new_tracks.clear();
-
 	render();
 
 	window.swap_buffers();
@@ -375,24 +361,28 @@ 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();
 	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();
@@ -403,22 +393,14 @@ void Designer::key_press(unsigned key)
 	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)
+		if(mode==CATALOGUE)
 			mode = SELECT;
-		else
+		else if(mode==SELECT)
 			selection.clear();
 	}
 	else if(key==Msp::Input::KEY_X)
@@ -439,11 +421,11 @@ void Designer::key_press(unsigned key)
 		}
 	}
 	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)
@@ -452,13 +434,43 @@ 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();
 }
 
+template<typename T>
+T *Designer::use_tool_with_selected_objects()
+{
+	T *tool = new T(*this, keyboard, mouse, selection.get_objects());
+	use_tool(tool);
+	return tool;
+}
+
+template<typename T>
+T *Designer::use_tool()
+{
+	T *tool = new T(*this, keyboard, mouse);
+	use_tool(tool);
+	return tool;
+}
+
+void Designer::use_tool(Tool *tool)
+{
+	if(cur_tool)
+	{
+		delete cur_tool;
+		cur_tool = 0;
+	}
+
+	cur_tool = tool;
+	cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status));
+	tool_status(cur_tool->get_status());
+	mode = TOOL;
+}
+
 void Designer::button_press(unsigned btn)
 {
 	bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R);
@@ -498,21 +510,6 @@ void Designer::button_press(unsigned btn)
 			}
 		}
 	}
-	else if(mode==MEASURE)
-		measure.button_press(ground.x, ground.y, btn);
-}
-
-void Designer::axis_motion(unsigned, float, float)
-{
-	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(wx, wy))
-	{
-		Vector ground = map_pointer_to_ground(pointer);
-		measure.pointer_motion(ground.x, ground.y);
-	}
 }
 
 void Designer::render()
@@ -523,24 +520,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)
@@ -588,33 +567,11 @@ void Designer::selection_changed()
 	}
 }
 
-void Designer::manipulation_status(const string &status)
+void Designer::tool_status(const string &status)
 {
 	lbl_status->set_text(status);
 }
 
-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::track_properties_response(int)
 {
 	const set<Track *> &tracks = selection.get_objects<Track>();
@@ -658,12 +615,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<Track3D>(**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)
@@ -674,14 +628,10 @@ void Designer::show_route(const Route &route)
 	for(set<Track *>::iterator i=rtracks.begin(); i!=rtracks.end(); ++i)
 	{
 		Track3D &t3d = layout_3d->get<Track3D>(**i);
-		t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0));
-		int path = -1;
+		Path3D *path = new Path3D(t3d);
+		path->set_color(GL::Color(0.5, 0.8, 1.0));
 		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());
+			path->set_path(route.get_turnout(tid));
 	}
 }
 
@@ -693,7 +643,7 @@ void Designer::show_zone(const Zone &zone)
 	for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i)
 	{
 		Track3D &t3d = layout_3d->get<Track3D>(**i);
-		t3d.get_path().set_color(GL::Color(0.8, 1.0, 0.5));
-		t3d.get_path().set_mask((*i)->get_type().get_paths());
+		Path3D *path = new Path3D(t3d);
+		path->set_color(GL::Color(0.8, 1.0, 0.5));
 	}
 }