Render tracks through GL::Objects

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

diff --git a/source/3d/layout.h b/source/3d/layout.h
index ba590dd37e2d8482d5180138f2ab6f663a7a6554..c64386fcc1ca91e57f6a6f7d0478c3bdb37c70dc 100644 (file)
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,31 +1,38 @@
 /* $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"
-#include "track.h"
-#include "train.h"
 
-namespace Marklin {
+namespace R2C2 {
+
+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;
-       Msp::GL::Scene scene;
-       Msp::GL::Scene ep_scene;
+       TrackMap tracks;
+       VehicleMap vehicles;
+       Msp::GL::InstanceScene scene;
+       Msp::GL::SimpleScene ep_scene;
+       Msp::GL::SimpleScene path_scene;
 
 public:
        Layout3D(Layout &);
@@ -35,24 +42,26 @@ 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; }
+       Msp::GL::Scene &get_path_scene() { return path_scene; }
 
 private:
        void track_added(Track &);
        void track_removed(Track &);
-       void train_added(Train &);
+       void vehicle_added(Vehicle &);
+       void vehicle_removed(Vehicle &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif