X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=1e189bd1ce0eedd88a0541672e9d58f60e6f6efc;hb=a993f204ba2cd282637814caec3ab115040fc0cc;hp=2e56ea63bd0195ea8ede83b3219f6f8dde1392f3;hpb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 2e56ea6..1e189bd 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,58 +1,75 @@
-/* $Id$
+#ifndef R2C2_3D_LAYOUT_H_
+#define R2C2_3D_LAYOUT_H_
 
-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_
-
-#include <msp/gl/scene.h>
-#include "libmarklin/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"
-#include "track.h"
-#include "train.h"
 
-namespace Marklin {
+namespace R2C2 {
+
+class Signal3D;
+class Track3D;
+class Vehicle3D;
 
-class Layout3D
+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;
-	std::list<Track3D *> tracks;
-	std::list<Train3D *> trains;
-	Msp::GL::Scene scene;
-	Msp::GL::Scene ep_scene;
+	TrackMap tracks;
+	VehicleMap vehicles;
+	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 std::list<Track3D *> &get_tracks() const { return tracks; }
-	Track3D &get_track(const Track &) const;
-	Track3D *pick_track(float, float, float) const;
+	const TrackMap &get_tracks() const { return tracks; }
+	Track3D &get_track(Track &) const;
+
+	void add_vehicle(Vehicle3D &);
+	void remove_vehicle(Vehicle3D &);
+	Vehicle3D &get_vehicle(Vehicle &) const;
 
-	void set_traffic_manager(TrafficManager &);
-	void add_train(Train3D &);
-	void remove_train(Train3D &);
-	Train3D &get_train(const Train &) 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 train_added(Train &);
+	void vehicle_added(Vehicle &);
+	void vehicle_removed(Vehicle &);
+	void signal_added(Signal &);
+	void signal_removed(Signal &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif