X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fsignal.cpp;h=2e4a1120b217930288f21ed2c60b7459c89eae40;hb=32cf18ff4306b36f2ce59d41056f888638a85578;hp=8e0fea841aee940b62687bf03c1749fadbc807d8;hpb=f23c8d8cbc4e72b45e3a719b2cf974ce35d054e9;p=r2c2.git diff --git a/source/3d/signal.cpp b/source/3d/signal.cpp index 8e0fea8..2e4a112 100644 --- 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), - GL::ObjectInstance(l.get_catalogue().get_signal(s.get_type()).get_object()), - layout(l), + Object3D(l, s), + GL::ObjectInstance(l.get_catalogue().get_3d(s.get_type()).get_object()), signal(s) { - layout.add_signal(*this); layout.get_scene().add(*this); } Signal3D::~Signal3D() { - layout.remove_signal(*this); layout.get_scene().remove(*this); }