X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=fd70358c56698b0ee923a478d1902becdce06e35;hb=d2dfed1a38c5e8487532e9055fad464cf54efd83;hp=f22b25c181e161462e2dfd27a560824def6094e7;hpb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index f22b25c..fd70358 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -24,7 +24,7 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
-#include "trackwrap.h"
+#include "selectionwrap.h"
 
 class Toolbar;
 
@@ -65,10 +65,10 @@ private:
 
 	Mode mode;
 	Selection selection;
+	SelectionWrap sel_wrap;
 	Manipulator manipulator;
 	Measure measure;
 	CameraController *camera_ctl;
-	TrackWrap *track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
 
@@ -113,9 +113,9 @@ private:
 	void axis_motion(unsigned, float, float);
 	void apply_camera();
 	void render();
-	void track_added(R2C2::Track &);
-	void track_removed(R2C2::Track &);
-	R2C2::Track *pick_track(const R2C2::Vector &);
+	void object_added(R2C2::Object &);
+	void object_removed(R2C2::Object &);
+	R2C2::Object *pick_object(const R2C2::Vector &);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();
 	void manipulation_status(const std::string &);