X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=72e5052e6689c5f2058b83b5d9e03c75098bf895;hb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;hp=1bbbed825bb68f493547046fa8051a60fbdb8b1b;hpb=7fac28fcb5afb17eff7c459474e4cf884a02719c;p=r2c2.git diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp index 1bbbed8..72e5052 100644 --- a/source/3d/layout.cpp +++ b/source/3d/layout.cpp @@ -2,6 +2,7 @@ #include "layout.h" #include "signal.h" #include "track.h" +#include "utility.h" #include "vehicle.h" using namespace std; @@ -27,6 +28,8 @@ Layout3D::Layout3D(Layout &l): Layout3D::~Layout3D() { + while(!utilities.empty()) + delete *utilities.begin(); while(!objects.empty()) delete objects.begin()->second; } @@ -57,6 +60,16 @@ void Layout3D::remove(Object3D &o) objects.erase(&o.get_object()); } +void Layout3D::add(Utility3D &u) +{ + utilities.insert(&u); +} + +void Layout3D::remove(Utility3D &u) +{ + utilities.erase(&u); +} + void Layout3D::object_added(Object &o) { if(Track *t = dynamic_cast(&o))