X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=c8092872c4dc0e0b3314115329fabd8562d6b017;hb=dc3b2bce73df40ea885a1960a825e5cd3a33c045;hp=ea5139d5b2e9d9e94cc7ebbdd2455bf72f959c2d;hpb=d27edb207810f0b4e44be8c3632d421faa5fed80;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index ea5139d..c809287 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -27,6 +27,8 @@ Distributed under the GPL
 #include "libmarklin/driver.h"
 #include "libmarklin/tracktype.h"
 #include "3d/path.h"
+#include "3d/track.h"
+#include "3d/vehicle.h"
 #include "engineer.h"
 #include "mainpanel.h"
 #include "trainpanel.h"
@@ -48,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");
@@ -70,10 +75,13 @@ Engineer::Engineer(int argc, char **argv):
 	// Setup railroad control
 	DataFile::load(catalogue, "tracks.dat");
 	DataFile::load(catalogue, "locos.dat");
+	DataFile::load(catalogue, "wagons.dat");
 	DataFile::load(layout, options.layout_fn);
 
 	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");
 
@@ -83,8 +91,6 @@ Engineer::Engineer(int argc, char **argv):
 		server->use_event_dispatcher(event_disp);
 	}
 
-	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Engineer::sensor_event));
-
 	// Setup 3D view
 	DataFile::load(arrow_mesh, "arrow.mesh");
 
@@ -113,7 +119,7 @@ Engineer::~Engineer()
 {
 	const map<unsigned, Train *> &trains = layout.get_trains();
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-		i->second->set_speed(0);
+		layout.get_driver().set_loco_speed(i->first, 0);
 	layout.get_driver().flush();
 
 	if(!options.simulate)
@@ -170,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,39 +272,20 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
 					track.set_active_path(i);
 				}
 			}
-			/*else if(simulate)
+			else if(options.simulate)
 			{
-				if(unsigned sid=track->get_track().get_sensor_id())
-				{
-					Sensor &sensor = control.get_sensor(sid);
-					control.signal_sensor_event.emit(sid, !sensor.get_state());
-				}
-			}*/
+				if(unsigned sid=track.get_sensor_id())
+					layout.get_driver().set_sensor(sid, !layout.get_driver().get_sensor(sid));
+			}
 		}
 	}
 }
 
 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()
@@ -325,6 +337,7 @@ void Engineer::view_all()
 	camera.set_position(pos);
 	camera.set_up_direction(up);
 	camera.set_look_direction(GL::Vector3(0, 0, -1));
+	camera.set_aspect(float(window.get_width())/window.get_height());
 	camera.set_depth_clip(pos.z*0.5, pos.z*1.5);
 }
 
@@ -395,9 +408,9 @@ void Engineer::train_added(Train &train)
 	train_panels.push_back(tpanel);
 	tpanel->set_visible(true);
 
-	Train3D &t3d = layout_3d.get_train(train);
-	overlay->set_label(t3d, train.get_name());
-	train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(t3d)));
+	Vehicle3D &loco3d = layout_3d.get_vehicle(train.get_vehicle(0));
+	overlay->set_label(loco3d, train.get_name());
+	train.signal_name_changed.connect(sigc::bind<0>(sigc::mem_fun(overlay, &Overlay3D::set_label), sigc::ref(loco3d)));
 
 	GL::Color best_color;
 	float best_d_sq = 0;
@@ -435,7 +448,7 @@ void Engineer::sighandler(int sig)
 		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)
-			i->second->set_speed(0);
+			layout.get_driver().set_loco_speed(i->first, 0);
 		layout.get_driver().flush();
 		raise(sig);
 	}