Determine the border of tracktypes with custom object

[r2c2.git] / source / 3d / layout.h

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 5964a04ed4ce0b1d8a6b43dc47170215ca146f8f..bb9d4277d775babf066c8e3b3ccecf64eaa414ec 100644 (file)
--- 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,6 +9,7 @@ Distributed under the GPL
 #define R2C2_3D_LAYOUT_H_
 
 #include <sigc++/trackable.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::SimpleScene scene;
+       Msp::GL::InstanceScene scene;
        Msp::GL::SimpleScene ep_scene;
-       Msp::GL::SimpleScene path_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 &);