X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=d1ec7c49f457b472b52adc1359f776ac8a156423;hb=baa096deb2108fe7f692172602ec2d047b68c068;hp=f2de127a0cc19d96117b4a63f3fb3be8c042921c;hpb=6e5d36dbc3f1e4a221d424fa7d57b07998df67a8;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index f2de127..d1ec7c4 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,19 +1,20 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
-#ifndef MARKLIN3D_LAYOUT_H_
-#define MARKLIN3D_LAYOUT_H_
+#ifndef R2C2_3D_LAYOUT_H_
+#define R2C2_3D_LAYOUT_H_
 
 #include <sigc++/trackable.h>
-#include <msp/gl/scene.h>
-#include "libmarklin/layout.h"
+#include <msp/gl/instancescene.h>
+#include <msp/gl/simplescene.h>
+#include "libr2c2/layout.h"
 #include "catalogue.h"
 
-namespace Marklin {
+namespace R2C2 {
 
 class Track3D;
 class Vehicle3D;
@@ -29,9 +30,9 @@ private:
 	Catalogue3D catalogue;
 	TrackMap tracks;
 	VehicleMap vehicles;
-	Msp::GL::Scene scene;
-	Msp::GL::Scene ep_scene;
-	Msp::GL::Scene path_scene;
+	Msp::GL::InstanceScene scene;
+	Msp::GL::SimpleScene ep_scene;
+	Msp::GL::InstanceScene path_scene;
 
 public:
 	Layout3D(Layout &);
@@ -57,9 +58,10 @@ private:
 	void track_added(Track &);
 	void track_removed(Track &);
 	void vehicle_added(Vehicle &);
+	void vehicle_removed(Vehicle &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif