Fix some GL function calls

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

diff --git a/source/3d/layout.h b/source/3d/layout.h
index c2faa46344f1869f45be94c7f4ecbda65a4824de..f2de127a0cc19d96117b4a63f3fb3be8c042921c 100644 (file)
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,37 +1,62 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #ifndef MARKLIN3D_LAYOUT_H_
 #define MARKLIN3D_LAYOUT_H_
 
+#include <sigc++/trackable.h>
+#include <msp/gl/scene.h>
 #include "libmarklin/layout.h"
-#include "track.h"
+#include "catalogue.h"
 
 namespace Marklin {
 
-class Layout3D
+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;
-       std::list<Track3D *> tracks;
-       unsigned   quality;
+       Layout &layout;
+       Catalogue3D catalogue;
+       TrackMap tracks;
+       VehicleMap vehicles;
+       Msp::GL::Scene scene;
+       Msp::GL::Scene ep_scene;
+       Msp::GL::Scene path_scene;
 
 public:
        Layout3D(Layout &);
        ~Layout3D();
 
-       void set_quality(unsigned);
-       const std::list<Track3D *> &get_tracks() const { return tracks; }
-       void  render(bool =false) const;
-       Track3D &get_track(const Track &) const;
+       const Catalogue3D &get_catalogue() const { return catalogue; }
+
+       void add_track(Track3D &);
+       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 &);
+       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 vehicle_added(Vehicle &);
 };
 
 } // namespace Marklin