Strip Id tags and copyright notices from files

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

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 5964a04ed4ce0b1d8a6b43dc47170215ca146f8f..76f1b91d7a3c21ee577c183c732f28151415df5e 100644 (file)
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,20 +1,17 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef R2C2_3D_LAYOUT_H_
 #define R2C2_3D_LAYOUT_H_
 
 #include <sigc++/trackable.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 R2C2 {
 
+class Object3D;
 class Track3D;
 class Vehicle3D;
 
@@ -29,21 +26,24 @@ 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;
+       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 &);
@@ -52,6 +52,7 @@ public:
        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 &);