X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=68533bc11520114862acfed734c50cd07c91010b;hb=f74a48e60ff2e818ada3bbbfcb200e5cd2b633d6;hp=19e515c2d2074a291b0ec0cf731e30f5a7eb676b;hpb=4d91e3e8374cd7ad927ce0d77a60498903b6e02a;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 19e515c..68533bc 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -40,12 +40,13 @@ Engineer::Engineer(int argc, char **argv):
 	window(options.screen_w, options.screen_h, options.fullscreen),
 	keyboard(window),
 	mouse(window),
-	ui_res("r2c2.res"),
+	ui_res("data/r2c2.res"),
 	import_active(false),
 	layout(catalogue, (options.driver.empty() ? 0 : Driver::create(options.driver))),
 	layout_3d(layout),
 	server(0),
-	main_view(layout_3d, window.get_width(), window.get_height())
+	main_view(layout_3d, window.get_width(), window.get_height()),
+	emergency_blink_state(0)
 {
 	// Setup GUI
 	window.set_title("Railroad Engineer");
@@ -68,16 +69,17 @@ Engineer::Engineer(int argc, char **argv):
 	overlay = new Overlay3D(ui_res.get_default_font());
 
 	// Setup railroad control
-	DataFile::load(catalogue, "tracks.dat");
-	DataFile::load(catalogue, "locos.dat");
-	DataFile::load(catalogue, "wagons.dat");
-	DataFile::load(catalogue, "terrain.dat");
+	catalogue.add_source("data/Märklin/H0");
 	DataFile::load(layout, options.layout_fn);
 
 	if(layout.has_driver())
-		layout.get_driver().signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected));
+	{
+		Driver &driver = layout.get_driver();
+		driver.signal_locomotive_detected.connect(sigc::mem_fun(this, &Engineer::locomotive_detected));
+		driver.signal_halt.connect(sigc::mem_fun(this, &Engineer::halt_event));
+	}
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
-	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
+	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::emergency));
 	const set<Block *> &blocks = layout.get_all<Block>();
 	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
 		if(TrackCircuit *tc = (*i)->get_sensor())
@@ -169,16 +171,26 @@ void Engineer::tick()
 	new_trains.clear();
 
 	layout.tick();
+	layout_3d.tick();
 	event_disp.tick(Time::zero);
 
 	for(list<TrainView *>::iterator i=train_views.begin(); i!=train_views.end(); ++i)
 		(*i)->prepare();
 
-	if(status_timeout && Time::now()>status_timeout)
+	Time::TimeStamp t = Time::now();
+	if(status_timeout && t>status_timeout)
 	{
 		main_wnd->set_status_text(string());
 		status_timeout = Time::TimeStamp();
 	}
+	if(!emergencies.empty() && t>emergency_blink_timeout)
+	{
+		emergency_blink_state = (emergency_blink_state+1)%2;
+		GL::Color color(1.0f/(1+emergency_blink_state), 0.0f, 0.0f);
+		for(list<TrackChain3D *>::iterator i=emergencies.begin(); i!=emergencies.end(); ++i)
+			(*i)->set_color(color);
+		emergency_blink_timeout = t+0.5*Time::sec;
+	}
 
 	GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
 
@@ -196,7 +208,7 @@ void Engineer::button_press(unsigned btn)
 		Object *obj = pick_object(pointer);
 		if(Track *track = dynamic_cast<Track *>(obj))
 		{
-			if(track->get_turnout_address())
+			if(track->get_type().is_turnout())
 			{
 				Block &block = track->get_block();
 				if(block.get_train() && block.get_train()->is_block_critical(block))
@@ -294,9 +306,31 @@ Object *Engineer::pick_object(const Vector &p)
 	GL::Vector4 ray = main_view.get_camera().unproject(GL::Vector4(p.x, p.y, 0, 0));
 
 	// XXX Do this better; make this function a template?
-	if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, Vector(ray))))
+	if(Vehicle *veh = layout.pick<Vehicle>(Ray(start, ray.slice<3>(0))))
 		return veh;
-	return layout.pick<Track>(Ray(start, Vector(ray)));
+	return layout.pick<Track>(Ray(start, ray.slice<3>(0)));
+}
+
+void Engineer::emergency(Block *block, const string &msg)
+{
+	set_status(msg);
+	if(block)
+	{
+		TrackChain3D *tch3d = new TrackChain3D(layout_3d, *block);
+		tch3d->set_color(GL::Color(1.0f, 0.0f, 0.0f));
+		tch3d->set_layer(2);
+		emergencies.push_back(tch3d);
+	}
+}
+
+void Engineer::halt_event(bool h)
+{
+	if(!h)
+	{
+		for(list<TrackChain3D *>::iterator i=emergencies.begin(); i!=emergencies.end(); ++i)
+			delete *i;
+		emergencies.clear();
+	}
 }
 
 void Engineer::locomotive_detected(const Driver::DetectedLocomotive &loco)
@@ -365,9 +399,7 @@ void Engineer::sighandler(int sig)
 	{
 		signal(sig, SIG_DFL);
 		IO::print(IO::cerr, "Fatal signal received, terminating\n");
-		const map<unsigned, Train *> &trains = layout.get_trains();
-		for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-			layout.get_driver().set_loco_speed(i->first, 0);
+		layout.get_driver().halt(true);
 		layout.get_driver().flush();
 		raise(sig);
 	}