X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Ftrackwrap.cpp;h=47225e3904af04c39f6ae2afcd49efce68083b4a;hb=a72309e64614bb1e230f9842d94dc261be1301e6;hp=45ec19c85a8c1a33ac4b0bdfb1dbaac9c8c1ffe3;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git diff --git a/source/designer/trackwrap.cpp b/source/designer/trackwrap.cpp index 45ec19c..47225e3 100644 --- a/source/designer/trackwrap.cpp +++ b/source/designer/trackwrap.cpp @@ -8,7 +8,6 @@ Distributed under the GPL #include #include #include "3d/tracktype.h" -#include "designer.h" #include "selection.h" #include "trackwrap.h" @@ -16,8 +15,8 @@ using namespace std; using namespace Msp; using namespace R2C2; -TrackWrap::TrackWrap(Designer &d, Selection &s): - designer(d), +TrackWrap::TrackWrap(Layout3D &l, Selection &s): + layout(l), selection(s) { selection.signal_changed.connect(sigc::mem_fun(this, &TrackWrap::selection_changed)); @@ -60,7 +59,7 @@ GL::Mesh &TrackWrap::get_mesh(const TrackType &type) if(j!=meshes.end()) return *j->second; - const TrackType3D &type3d = designer.get_layout_3d().get_catalogue().get_track(type); + const TrackType3D &type3d = layout.get_catalogue().get_track(type); float min_area = -1; float angle = 0;