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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index f22b25c..02649cb 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -11,6 +11,7 @@
 #include <msp/gl/object.h>
 #include <msp/gl/pipeline.h>
 #include <msp/gltk/label.h>
+#include <msp/gltk/layout.h>
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
@@ -24,7 +25,7 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
-#include "trackwrap.h"
+#include "selectionwrap.h"
 
 class Toolbar;
 
@@ -45,6 +46,7 @@ private:
 	Msp::Input::Mouse mouse;
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root root;
+	Msp::GLtk::Layout *root_layout;
 
 	std::vector<Toolbar *> toolbars;
 	Msp::GLtk::Label *lbl_status;
@@ -61,14 +63,14 @@ private:
 	Msp::GL::Object *base_object;
 	R2C2::Route *cur_route;
 	R2C2::Zone *cur_zone;
-	std::list<R2C2::Track *> new_tracks;
+	std::list<R2C2::Path3D *> highlight_paths;
 
 	Mode mode;
 	Selection selection;
+	SelectionWrap sel_wrap;
 	Manipulator manipulator;
 	Measure measure;
 	CameraController *camera_ctl;
-	TrackWrap *track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
 
@@ -84,8 +86,6 @@ public:
 	R2C2::Layout &get_layout() { return *layout; }
 	R2C2::Layout3D &get_layout_3d() { return *layout_3d; }
 	const CameraController &get_camera_controller() const { return *camera_ctl; }
-	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-	Msp::GLtk::Root &get_root() { return root; }
 
 	void new_track();
 	void erase_tracks();
@@ -113,16 +113,13 @@ 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 &);
+	R2C2::Object *pick_object(const R2C2::Vector &);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();
 	void manipulation_status(const std::string &);
 	void manipulation_done(bool);
 	void measure_changed();
 	void measure_done();
-	void arrange_toolbars();
 	void track_properties_response(int);
 	void route_name_accept(const std::string &);
 	void svg_export_accept(const std::string &);