Fix some GL function calls

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

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 8fcd713a2c7be76c3b7a9ef247075f7d2f08feae..f2de127a0cc19d96117b4a63f3fb3be8c042921c 100644 (file)
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -12,18 +12,23 @@ Distributed under the GPL
 #include <msp/gl/scene.h>
 #include "libmarklin/layout.h"
 #include "catalogue.h"
-#include "track.h"
-#include "train.h"
 
 namespace Marklin {
 
+class Track3D;
+class Vehicle3D;
+
 class Layout3D: public sigc::trackable
 {
+public:
+       typedef std::map<Track *, Track3D *> TrackMap;
+       typedef std::map<Vehicle *, Vehicle3D *> VehicleMap;
+
 private:
        Layout &layout;
        Catalogue3D catalogue;
-       std::list<Track3D *> tracks;
-       std::list<Train3D *> trains;
+       TrackMap tracks;
+       VehicleMap vehicles;
        Msp::GL::Scene scene;
        Msp::GL::Scene ep_scene;
        Msp::GL::Scene path_scene;
@@ -36,13 +41,13 @@ public:
 
        void add_track(Track3D &);
        void remove_track(Track3D &);
-       const std::list<Track3D *> &get_tracks() const { return tracks; }
-       Track3D &get_track(const Track &) const;
+       const TrackMap &get_tracks() const { return tracks; }
+       Track3D &get_track(Track &) const;
        Track3D *pick_track(float, float, float) const;
 
-       void add_train(Train3D &);
-       void remove_train(Train3D &);
-       Train3D &get_train(const Train &) const;
+       void add_vehicle(Vehicle3D &);
+       void remove_vehicle(Vehicle3D &);
+       Vehicle3D &get_vehicle(Vehicle &) const;
 
        Msp::GL::Scene &get_scene() { return scene; }
        Msp::GL::Scene &get_endpoint_scene() { return ep_scene; }
@@ -51,7 +56,7 @@ public:
 private:
        void track_added(Track &);
        void track_removed(Track &);
-       void train_added(Train &);
+       void vehicle_added(Vehicle &);
 };
 
 } // namespace Marklin