X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=b6651342f2137bd24a58b94b5de0e0da21c913b2;hb=cc0ee0a5e71590960bc8cb7baee7a10ef09ce3f0;hp=4c9360c54fee891de134c92f29f3373e1cb177de;hpb=a277834b140eb5987419e2c335032c534a7184cd;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 4c9360c..b665134 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -50,7 +50,10 @@ Engineer::Engineer(int argc, char **argv):
 	picking(false),
 	picking_track(0),
 	picking_entry(0),
-	picking_path(0)
+	picking_path(0),
+	pointer_x(0),
+	pointer_y(0),
+	pointer_moved(false)
 {
 	// Setup GUI
 	window.set_title("Railroad Engineer");
@@ -77,6 +80,7 @@ Engineer::Engineer(int argc, char **argv):
 
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Engineer::block_reserved));
+	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
 	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Engineer::sensor_event));
 	if(FS::exists("engineer.state"))
 		DataFile::load(layout, "engineer.state");
@@ -160,7 +164,7 @@ void Engineer::tick()
 		status_timeout = Time::TimeStamp();
 	}
 
-	GL::clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
+	GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
 
 	pipeline.render_all();
 	{
@@ -172,6 +176,31 @@ void Engineer::tick()
 		overlay->render(0);
 	}
 
+	if(pointer_moved)
+	{
+		pointer_moved = false;
+
+		if(picking)
+		{
+			Track3D *track = pick_track(pointer_x, window.get_height()-pointer_y-1);
+			if(track && &track->get_track()!=picking_track)
+			{
+				picking_track = &track->get_track();
+				if(picking_entry>=0)
+					picking_entry = 0;
+
+				delete picking_path;
+				picking_path = new Path3D(*track);
+				if(picking_entry>=0)
+					picking_path->set_mask(picking_track->get_type().get_endpoints()[picking_entry].paths);
+				else
+					picking_path->set_mask(picking_track->get_type().get_paths());
+				picking_path->set_color(GL::Color(0));
+				picking_path->set_layer(1);
+			}
+		}
+	}
+
 	if(picking && picking_track && picking_entry>=0)
 	{
 		GL::PushMatrix push_mat;
@@ -241,12 +270,14 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
 							++i;
 					}
 					track.set_active_path(i);
+					set_status(format("Turnout %d", track.get_turnout_id()));
 				}
 			}
-			else if(options.simulate)
+			if(unsigned sid = track.get_sensor_id())
 			{
-				if(unsigned sid=track.get_sensor_id())
+				if(options.simulate)
 					layout.get_driver().set_sensor(sid, !layout.get_driver().get_sensor(sid));
+				set_status(format("Sensor %d", sid));
 			}
 		}
 	}
@@ -254,25 +285,9 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
 
 void Engineer::pointer_motion(int x, int y)
 {
-	if(picking)
-	{
-		Track3D *track = pick_track(x, window.get_height()-y-1);
-		if(track && &track->get_track()!=picking_track)
-		{
-			picking_track = &track->get_track();
-			if(picking_entry>=0)
-				picking_entry = 0;
-
-			delete picking_path;
-			picking_path = new Path3D(*track);
-			if(picking_entry>=0)
-				picking_path->set_mask(picking_track->get_type().get_endpoints()[picking_entry].paths);
-			else
-				picking_path->set_mask(picking_track->get_type().get_paths());
-			picking_path->set_color(GL::Color(0));
-			picking_path->set_layer(1);
-		}
-	}
+	pointer_x = x;
+	pointer_y = y;
+	pointer_moved = true;
 }
 
 void Engineer::view_all()