X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.h;h=d5aad2634fbbe2343f4f2d38027347b531957f2b;hb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;hp=908751a27be6cafa29584c2d7982e290fbd512e6;hpb=4049f5bdacfdb61247f3c74fc5f748990be7bd4d;p=r2c2.git

diff --git a/source/3d/layout.h b/source/3d/layout.h
index 908751a..d5aad26 100644
--- a/source/3d/layout.h
+++ b/source/3d/layout.h
@@ -12,6 +12,7 @@
 namespace R2C2 {
 
 class Object3D;
+class Utility3D;
 
 class Layout3D: public sigc::trackable
 {
@@ -22,6 +23,7 @@ private:
 	Layout &layout;
 	Catalogue3D catalogue;
 	ObjectMap objects;
+	std::set<Utility3D *> utilities;
 	Msp::GL::InstanceScene scene;
 	Msp::GL::SimpleScene ep_scene;
 	Msp::GL::InstanceScene path_scene;
@@ -33,6 +35,7 @@ public:
 	~Layout3D();
 
 	Layout &get_layout() const { return layout; }
+	Catalogue3D &get_catalogue() { return catalogue; }
 	const Catalogue3D &get_catalogue() const { return catalogue; }
 	void get_bounds(Vector &, Vector &) const;
 
@@ -45,6 +48,9 @@ public:
 	T &get(Object &o) const
 	{ return dynamic_cast<T &>(get(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; }