X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=63d2591959ab152aee38b74dd706c1c7b027a1cc;hb=b3a73308d67de22a2d65cc56b14edeab25537eba;hp=a43906043da391e681622a11d98b26b7b9fa9240;hpb=e9653dffd0026fb3c02c91a4c0feca688a86c721;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index a439060..63d2591 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -30,6 +30,7 @@ Distributed under the GPL
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
+#include "trackwrap.h"
 
 class Toolbar;
 
@@ -59,6 +60,7 @@ private:
 	Marklin::Overlay3D *overlay;
 	Msp::GL::Object *base_object;
 	Marklin::Route *cur_route;
+	std::list<Marklin::Track *> new_tracks;
 	Msp::GL::Pipeline *pipeline;
 	Msp::GL::Camera camera;
 	Msp::GL::Lighting lighting;
@@ -69,6 +71,7 @@ private:
 	Manipulator manipulator;
 	Measure measure;
 	CameraController camera_ctl;
+	TrackWrap track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
 
@@ -82,8 +85,9 @@ public:
 	void save();
 	void quit();
 
-	Marklin::Layout *get_layout() { return layout; }
-	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+	const Marklin::Catalogue &get_catalogue() const { return catalogue; }
+	Marklin::Layout &get_layout() { return *layout; }
+	Marklin::Layout3D &get_layout_3d() { return *layout_3d; }
 	const Msp::GL::Camera &get_camera() const { return camera; }
 	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
 	Msp::GLtk::Root &get_root() const { return *root; }
@@ -105,6 +109,7 @@ private:
 	void pointer_motion(int, int);
 	void apply_camera();
 	void render();
+	void track_added(Marklin::Track &);
 	Marklin::Track3D *pick_track(int, int);
 	void update_track_icon(Marklin::Track3D &);
 	void selection_changed();