X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=c5169bd6f07ae4c201ff45e25c68a4b9121b0de3;hb=d84f187ca34a6ab2f8c37d85fa13d5c113714344;hp=21686de5f9c8bbc4a19e1fdc21acffd2276b4267;hpb=7e382cc3cad8c4f6945b0c9d89e2ca917b42b740;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 21686de..c5169bd 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -1,43 +1,70 @@
-/* $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 "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 "typemap.h"
+
+namespace R2C2 {
 
-namespace Marklin {
+class Object3D;
+class Utility3D;
 
-class Layout3D
+class Layout3D: public sigc::trackable
 {
+public:
+	typedef std::map<Object *, Object3D *> ObjectMap;
+
 private:
 	Layout &layout;
 	Catalogue3D catalogue;
-	std::list<Track3D *> tracks;
-	unsigned quality;
+	ObjectMap objects;
+	std::set<Utility3D *> utilities;
+	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; }
+	Catalogue3D &get_catalogue() { return catalogue; }
 	const Catalogue3D &get_catalogue() const { return catalogue; }
-	void set_quality(unsigned);
-	const std::list<Track3D *> &get_tracks() const { return tracks; }
-	void render(bool =false) const;
-	Track3D &get_track(const Track &) const;
-	Track3D *pick_track(float, float, float) const;
+
+	void add(Object3D &);
+	Object3D &get_3d(Object &) const;
+	const ObjectMap &get_all() const { return objects; }
+	void remove(Object3D &);
+
+	template<typename T>
+	typename TypeMap3D<T>::Type3D &get_3d(T &o) const
+	{ return dynamic_cast<typename TypeMap3D<T>::Type3D &>(get_3d(static_cast<Object &>(o))); }
+
+	void add(Utility3D &);
+	void remove(Utility3D &);
+
+	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::Light &get_sun() const { return sun; }
+	const Msp::GL::Lighting &get_lighting() const { return lighting; }
+
+	void tick();
+
 private:
-	void track_added(Track &);
-	void track_removed(Track &);
+	void object_added(Object &);
+	void object_removed(Object &);
 };
 
-} // namespace Marklin
+} // namespace R2C2
 
 #endif