Use generic objects in Layout3D

[r2c2.git] / source / 3d / object.cpp

diff --git a/source/3d/object.cpp b/source/3d/object.cpp
index fcbf2136e7158a98c2dbf7bfc00cd1529549a1cc..b901a7294f9f38c775621f69ecc7e0f469333ee6 100644 (file)
--- a/source/3d/object.cpp
+++ b/source/3d/object.cpp
@@ -1,13 +1,22 @@
+#include "layout.h"
 #include "object.h"
 
 using namespace Msp;
 
 namespace R2C2 {
 
-Object3D::Object3D(Object &o):
+Object3D::Object3D(Layout3D &l, Object &o):
+       layout(l),
        object(o)
 {
        object.signal_moved.connect(sigc::mem_fun(this, &Object3D::moved));
+
+       layout.add(*this);
+}
+
+Object3D::~Object3D()
+{
+       layout.remove(*this);
 }
 
 void Object3D::moved()