X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Ftrackwrap.cpp;h=1f620f3ff6be452e5c1ac617ab2e0fe06b64039a;hb=c06f3dde10411cd34aae026d8bf22b7771bdc3e0;hp=45ec19c85a8c1a33ac4b0bdfb1dbaac9c8c1ffe3;hpb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;p=r2c2.git

diff --git a/source/designer/trackwrap.cpp b/source/designer/trackwrap.cpp
index 45ec19c..1f620f3 100644
--- a/source/designer/trackwrap.cpp
+++ b/source/designer/trackwrap.cpp
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/gl/matrix.h>
 #include <msp/gl/meshbuilder.h>
 #include "3d/tracktype.h"
-#include "designer.h"
 #include "selection.h"
 #include "trackwrap.h"
 
@@ -16,8 +8,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 +52,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;