Add basic support for signals

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

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 54269bc8b42e1d43e32bb56a9e41591a5d313a89..1e189bd1ce0eedd88a0541672e9d58f60e6f6efc 100644 (file)
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,20 +1,17 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-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/light.h>
+#include <msp/gl/lighting.h>
+#include <msp/gl/simplescene.h>
+#include "libr2c2/layout.h"
 #include "catalogue.h"
 
-namespace Marklin {
+namespace R2C2 {
 
+class Signal3D;
 class Track3D;
 class Vehicle3D;
 
@@ -23,44 +20,56 @@ class Layout3D: public sigc::trackable
 public:
        typedef std::map<Track *, Track3D *> TrackMap;
        typedef std::map<Vehicle *, Vehicle3D *> VehicleMap;
+       typedef std::map<Signal *, Signal3D *> SignalMap;
 
 private:
        Layout &layout;
        Catalogue3D catalogue;
        TrackMap tracks;
        VehicleMap vehicles;
-       Msp::GL::Scene scene;
-       Msp::GL::Scene ep_scene;
-       Msp::GL::Scene path_scene;
+       SignalMap signals;
+       Msp::GL::InstanceScene scene;
+       Msp::GL::SimpleScene ep_scene;
+       Msp::GL::InstanceScene path_scene;
+       Msp::GL::Light sun;
+       Msp::GL::Lighting lighting;
 
 public:
        Layout3D(Layout &);
        ~Layout3D();
 
+       Layout &get_layout() const { return layout; }
        const Catalogue3D &get_catalogue() const { return catalogue; }
+       void get_bounds(Vector &, Vector &) const;
 
        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;
 
+       void add_signal(Signal3D &);
+       void remove_signal(Signal3D &);
+       Signal3D &get_signal(Signal &) 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; }
+       const Msp::GL::Lighting &get_lighting() const { return lighting; }
 
 private:
        void track_added(Track &);
        void track_removed(Track &);
        void vehicle_added(Vehicle &);
        void vehicle_removed(Vehicle &);
+       void signal_added(Signal &);
+       void signal_removed(Signal &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif