Use generic objects in Layout3D

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

diff --git a/source/3d/signal.cpp b/source/3d/signal.cpp
index 8e0fea841aee940b62687bf03c1749fadbc807d8..5872dc850785c6f87294272898b934c7ec188fb1 100644 (file)
--- a/source/3d/signal.cpp
+++ b/source/3d/signal.cpp
@@ -9,18 +9,15 @@ using namespace Msp;
 namespace R2C2 {
 
 Signal3D::Signal3D(Layout3D &l, Signal &s):
-       Object3D(s),
+       Object3D(l, s),
        GL::ObjectInstance(l.get_catalogue().get_signal(s.get_type()).get_object()),
-       layout(l),
        signal(s)
 {
-       layout.add_signal(*this);
        layout.get_scene().add(*this);
 }
 
 Signal3D::~Signal3D()
 {
-       layout.remove_signal(*this);
        layout.get_scene().remove(*this);
 }