X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=8fcd713a2c7be76c3b7a9ef247075f7d2f08feae;hb=43638fd7170c5c8290212c38c3eaf623b8c1b415;hp=9120af6356b2320018e05b7dadfaf3d1da5fedcd;hpb=48dff17ed3144d944965e7cb534e1f8fb92bd620;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 9120af6..8fcd713 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -8,21 +8,25 @@ 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"
+#include "train.h"
 
 namespace Marklin {
 
-class Layout3D
+class Layout3D: public sigc::trackable
 {
 private:
 	Layout &layout;
 	Catalogue3D catalogue;
 	std::list<Track3D *> tracks;
+	std::list<Train3D *> trains;
 	Msp::GL::Scene scene;
 	Msp::GL::Scene ep_scene;
+	Msp::GL::Scene path_scene;
 
 public:
 	Layout3D(Layout &);
@@ -36,12 +40,18 @@ public:
 	Track3D &get_track(const Track &) const;
 	Track3D *pick_track(float, float, float) const;
 
+	void add_train(Train3D &);
+	void remove_train(Train3D &);
+	Train3D &get_train(const Train &) 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 train_added(Train &);
 };
 
 } // namespace Marklin