X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.cpp;h=68b85aa04cf3c3acdc8c89bd438b3ffcc75a5400;hb=6e5d36dbc3f1e4a221d424fa7d57b07998df67a8;hp=b6651342f2137bd24a58b94b5de0e0da21c913b2;hpb=0a09ce2f652314e221b88c5202795be1120c7229;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index b665134..68b85aa 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <limits>
@@ -33,6 +34,7 @@ Distributed under the GPL
 #include "mainpanel.h"
 #include "trainpanel.h"
 #include "trainproperties.h"
+#include "trainview.h"
 
 using namespace std;
 using namespace Marklin;
@@ -82,8 +84,8 @@ Engineer::Engineer(int argc, char **argv):
 	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");
+	if(FS::exists(options.state_fn))
+		DataFile::load(layout, options.state_fn);
 
 	if(options.network)
 	{
@@ -95,14 +97,20 @@ Engineer::Engineer(int argc, char **argv):
 	DataFile::load(arrow_mesh, "arrow.mesh");
 
 	pipeline.set_camera(&camera);
-	pipeline.add_renderable(layout_3d.get_scene());
+	pipeline.add_renderable_for_pass(layout_3d.get_scene(), 0);
+	pipeline.add_renderable_for_pass(layout_3d.get_path_scene(), "unlit");
 
-	light.set_position(0, -0.259, 0.966, 0);
+	light.set_position(GL::Vector4(0, -0.259, 0.966, 0));
+	light.set_diffuse(GL::Color(0.9));
+	lighting.set_ambient(GL::Color(0.4));
 	lighting.attach(0, light);
 
-	GL::PipelinePass &pass = pipeline.add_pass(0);
-	pass.depth_test = &GL::DepthTest::lequal();
-	pass.lighting = &lighting;
+	GL::PipelinePass *pass = &pipeline.add_pass(0);
+	pass->depth_test = &GL::DepthTest::lequal();
+	pass->lighting = &lighting;
+
+	pass = &pipeline.add_pass("unlit");
+	pass->depth_test = &GL::DepthTest::lequal();
 
 	view_all();
 
@@ -123,7 +131,7 @@ Engineer::~Engineer()
 	layout.get_driver().flush();
 
 	if(!options.simulate)
-		layout.save_trains("engineer.state");
+		layout.save_trains(options.state_fn);
 
 	delete overlay;
 	delete root;
@@ -137,6 +145,26 @@ void Engineer::set_status(const string &text)
 	status_timeout = Time::now()+10*Time::sec;
 }
 
+void Engineer::rearrange_panels()
+{
+	int y = main_panel->get_geometry().y;
+	for(list<TrainPanel *>::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
+	{
+		y -= (*i)->get_geometry().h;
+		(*i)->set_position(0, y);
+	}
+}
+
+void Engineer::add_train_view(TrainView &tv)
+{
+	train_views.push_back(&tv);
+}
+
+void Engineer::remove_train_view(TrainView &tv)
+{
+	train_views.erase(remove(train_views.begin(), train_views.end(), &tv), train_views.end());
+}
+
 void Engineer::pick(bool with_ep)
 {
 	picking = true;
@@ -158,6 +186,9 @@ void Engineer::tick()
 	layout.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)
 	{
 		main_panel->set_status_text(string());
@@ -167,10 +198,6 @@ void Engineer::tick()
 	GL::Framebuffer::system().clear(GL::COLOR_BUFFER_BIT|GL::DEPTH_BUFFER_BIT);
 
 	pipeline.render_all();
-	{
-		GL::Bind depth(GL::DepthTest::lequal());
-		layout_3d.get_path_scene().render();
-	}
 	{
 		GL::Bind blend(GL::Blend::alpha());
 		overlay->render(0);
@@ -255,7 +282,7 @@ void Engineer::button_press(int x, int y, unsigned btn, unsigned)
 			Track &track = t3d->get_track();
 			if(track.get_turnout_id())
 			{
-				Block &block = layout.get_block_by_track(track);
+				Block &block = track.get_block();
 				if(block.get_train() && !block.get_train()->free_block(block))
 					set_status("Turnout is busy");
 				else
@@ -292,7 +319,7 @@ void Engineer::pointer_motion(int x, int y)
 
 void Engineer::view_all()
 {
-	const list<Track3D *> &tracks = layout_3d.get_tracks();
+	const Layout3D::TrackMap &tracks = layout_3d.get_tracks();
 
 	float view_aspect = float(window.get_width()-200)/window.get_height();
 	float view_height = tan(camera.get_field_of_view()/2)*2;
@@ -305,10 +332,10 @@ void Engineer::view_all()
 		float max_x = 0;
 		float min_y = 0;
 		float max_y = 0;
-		for(list<Track3D *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		{
 			Point minp, maxp;
-			(*i)->get_bounds(angle, minp, maxp);
+			i->second->get_bounds(angle, minp, maxp);
 			min_x = min(min_x, minp.x);
 			max_x = max(max_x, maxp.x);
 			min_y = min(min_y, minp.y);
@@ -403,12 +430,8 @@ void Engineer::train_added(Train &train)
 {
 	TrainPanel *tpanel = new TrainPanel(*this, ui_res, train);
 	root->add(*tpanel);
-	int y = main_panel->get_geometry().y;
-	for(list<TrainPanel *>::iterator i=train_panels.begin(); i!=train_panels.end(); ++i)
-		y -= (*i)->get_geometry().h;
-	tpanel->set_position(0, y-tpanel->get_geometry().h);
 	train_panels.push_back(tpanel);
-	tpanel->set_visible(true);
+	rearrange_panels();
 
 	Vehicle3D &loco3d = layout_3d.get_vehicle(train.get_vehicle(0));
 	overlay->set_label(loco3d, train.get_name());