X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=bb9d4277d775babf066c8e3b3ccecf64eaa414ec;hb=26e741a3e8f1c83e717318f69ff02eed9b0ef6de;hp=e7f3c33c752d09e821bc5532355ff582f2d4bc7f;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index e7f3c33..bb9d427 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -9,7 +9,8 @@ Distributed under the GPL
 #define R2C2_3D_LAYOUT_H_
 
 #include <sigc++/trackable.h>
-#include <msp/gl/scene.h>
+#include <msp/gl/instancescene.h>
+#include <msp/gl/simplescene.h>
 #include "libr2c2/layout.h"
 #include "catalogue.h"
 
@@ -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 &);
@@ -43,7 +44,6 @@ public:
 	void remove_track(Track3D &);
 	const TrackMap &get_tracks() const { return tracks; }
 	Track3D &get_track(Track &) const;
-	Track3D *pick_track(float, float, float) const;
 
 	void add_vehicle(Vehicle3D &);
 	void remove_vehicle(Vehicle3D &);