X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fengineer%2Fengineer.cpp;h=f0999d91cd9ffaddd1736f0c6fd6493e36077084;hb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;hp=61dd49a1c72d86136baa9fd462e05b2458b398e5;hpb=b261812f040caed52bc3de783e8bcb86b222a9ed;p=r2c2.git

diff --git a/source/engineer/engineer.cpp b/source/engineer/engineer.cpp
index 61dd49a..f0999d9 100644
--- a/source/engineer/engineer.cpp
+++ b/source/engineer/engineer.cpp
@@ -19,8 +19,10 @@
 #include "libr2c2/driver.h"
 #include "libr2c2/trackcircuit.h"
 #include "libr2c2/tracktype.h"
+#include "3d/allocation.h"
 #include "3d/path.h"
 #include "3d/track.h"
+#include "3d/trackcircuit.h"
 #include "3d/vehicle.h"
 #include "engineer.h"
 #include "mainwindow.h"
@@ -70,11 +72,16 @@ Engineer::Engineer(int argc, char **argv):
 	DataFile::load(layout, options.layout_fn);
 
 	layout.signal_train_added.connect(sigc::mem_fun(this, &Engineer::train_added));
-	layout.signal_block_reserved.connect(sigc::hide<1>(sigc::mem_fun(this, &Engineer::reset_block_color)));
 	layout.signal_emergency.connect(sigc::mem_fun(this, &Engineer::set_status));
 	const set<Block *> &blocks = layout.get_all<Block>();
 	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
-		(*i)->get_sensor().signal_state_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &Engineer::reset_block_color), sigc::ref(**i))));
+		if(TrackCircuit *tc = (*i)->get_sensor())
+			new TrackCircuit3D(layout_3d, *tc);
+
+	const set<Track *> &tracks = layout.get_all<Track>();
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if((*i)->get_type().is_turnout())
+			new Path3D(layout_3d.get<Track3D>(**i));
 
 	if(FS::exists(options.state_fn))
 		DataFile::load(layout, options.state_fn);
@@ -206,13 +213,9 @@ void Engineer::tick()
 					picking_entry = 0;
 
 				delete picking_path;
-				picking_path = new Path3D(layout_3d.get_track(*track));
-				if(picking_entry>=0)
-					picking_path->set_mask(picking_track->get_type().get_endpoint(picking_entry).paths);
-				else
-					picking_path->set_mask(picking_track->get_type().get_paths());
+				picking_path = new Path3D(layout_3d.get<Track3D>(*track));
 				picking_path->set_color(GL::Color(0));
-				picking_path->set_layer(1);
+				picking_path->set_layer(2);
 			}
 		}
 	}
@@ -249,7 +252,6 @@ void Engineer::button_press(unsigned btn)
 		else if(btn==3 && picking_entry>=0)
 		{
 			picking_entry = (picking_entry+1)%picking_track->get_type().get_endpoints().size();
-			picking_path->set_mask(picking_track->get_type().get_endpoint(picking_entry).paths);
 		}
 	}
 	else
@@ -304,7 +306,7 @@ void Engineer::axis_motion(unsigned axis, float value, float)
 
 void Engineer::view_all()
 {
-	const Layout3D::TrackMap &tracks = layout_3d.get_tracks();
+	const Layout3D::ObjectMap &objects = layout_3d.get_all();
 
 	float view_aspect = float(window.get_width())/window.get_height();
 	float view_height = tan(camera.get_field_of_view()/2.0f)*2.0f;
@@ -315,8 +317,8 @@ void Engineer::view_all()
 	{
 		Transform trans = Transform::rotation(-angle, Vector(0, 0, 1));
 		BoundingBox bbox;
-		for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-			bbox = bbox|trans.transform(i->second->get_track().get_bounding_box());
+		for(Layout3D::ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+			bbox = bbox|trans.transform(i->second->get_object().get_bounding_box());
 
 		const Vector &minp = bbox.get_minimum_point();
 		const Vector &maxp = bbox.get_maximum_point();
@@ -349,35 +351,6 @@ void Engineer::view_all()
 	camera.set_depth_clip(pos.z*0.5, pos.z*1.5);
 }
 
-void Engineer::set_block_color(const Block &block, const GL::Color &color)
-{
-	const set<Track *> &tracks = block.get_tracks();
-	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		layout_3d.get_track(**i).get_path().set_color(color);
-}
-
-void Engineer::reset_block_color(const Block &block)
-{
-	bool active = block.get_sensor().get_state()>Sensor::INACTIVE;
-
-	if(block.get_train())
-	{
-		GL::Color color;
-		map<Train *, GL::Color>::iterator i = train_colors.find(block.get_train());
-		if(i!=train_colors.end())
-			color = i->second;
-
-		if(active)
-			set_block_color(block, color*0.6);
-		else
-			set_block_color(block, color*0.5+0.5);
-	}
-	else if(active)
-		set_block_color(block, GL::Color(0.6));
-	else
-		set_block_color(block, GL::Color(1));
-}
-
 Object *Engineer::pick_object(const Vector &p)
 {
 	const GL::Vector3 &start = camera.get_position();
@@ -391,7 +364,7 @@ Object *Engineer::pick_object(const Vector &p)
 
 void Engineer::process_new_train(Train &train)
 {
-	Vehicle3D &loco3d = layout_3d.get_vehicle(train.get_vehicle(0));
+	Vehicle3D &loco3d = layout_3d.get<Vehicle3D>(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)));
 }
@@ -427,6 +400,9 @@ void Engineer::train_added(Train &train)
 		}
 	}
 	train_colors[&train] = best_color;
+
+	Allocation3D *alloc = new Allocation3D(layout_3d, train);
+	alloc->set_color(best_color);
 }
 
 void Engineer::sighandler(int sig)