X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=a0c77868ae58bc68a3c804843622996d119d2263;hb=1f9af43b6ab300693c044b431e95b25422b36507;hp=a7fbdb98b9dbc7b7751ce2e26470403dd647c85d;hpb=47341c72a70e6cf9d8e963705a50197bbc20a87d;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index a7fbdb9..a0c7786 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -8,29 +8,32 @@ Distributed under the GPL
 #ifndef MARKLIN3D_LAYOUT_H_
 #define MARKLIN3D_LAYOUT_H_
 
+#include <sigc++/trackable.h>
 #include <msp/gl/scene.h>
 #include "libmarklin/layout.h"
 #include "catalogue.h"
-#include "track.h"
 
 namespace Marklin {
 
-class Layout3D
+class Track3D;
+class Vehicle3D;
+
+class Layout3D: public sigc::trackable
 {
 private:
 	Layout &layout;
 	Catalogue3D catalogue;
 	std::list<Track3D *> tracks;
+	std::list<Vehicle3D *> vehicles;
 	Msp::GL::Scene scene;
 	Msp::GL::Scene ep_scene;
-	unsigned quality;
+	Msp::GL::Scene path_scene;
 
 public:
 	Layout3D(Layout &);
 	~Layout3D();
 
 	const Catalogue3D &get_catalogue() const { return catalogue; }
-	void set_quality(unsigned);
 
 	void add_track(Track3D &);
 	void remove_track(Track3D &);
@@ -38,12 +41,18 @@ public:
 	Track3D &get_track(const Track &) const;
 	Track3D *pick_track(float, float, float) const;
 
+	void add_vehicle(Vehicle3D &);
+	void remove_vehicle(Vehicle3D &);
+	Vehicle3D &get_vehicle(const Vehicle &) const;
+
 	Msp::GL::Scene &get_scene() { return scene; }
 	Msp::GL::Scene &get_endpoint_scene() { return ep_scene; }
+	Msp::GL::Scene &get_path_scene() { return path_scene; }
 
 private:
 	void track_added(Track &);
 	void track_removed(Track &);
+	void vehicle_added(Vehicle &);
 };
 
 } // namespace Marklin