X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=76f1b91d7a3c21ee577c183c732f28151415df5e;hb=51779f52d3f1fe23e2bdb8864c88b5edd49c57ed;hp=d1ec7c49f457b472b52adc1359f776ac8a156423;hpb=949b13aae247fa53579ec1cda9142ccc8755acde;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index d1ec7c4..76f1b91 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,21 +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;
 
@@ -33,18 +29,21 @@ private:
 	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 &);
@@ -53,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 &);