X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=418c0cdf730d9f4cfcee5e1bbd48320f69d581b1;hb=aada4cd3c335e6cf55d64200b9d92e8f9310fa1d;hp=d7fb2b859ed61408abb4bff097db1642ab096674;hpb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index d7fb2b8..418c0cd 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -14,6 +14,7 @@
 #include "3d/layout.h"
 #include "3d/overlay.h"
 #include "3d/path.h"
+#include "3d/view.h"
 #include "network/server.h"
 #include "options.h"
 
@@ -22,9 +23,6 @@ class TrainView;
 
 class Engineer: public Msp::RegisteredApplication<Engineer>
 {
-public:
-	sigc::signal<void, R2C2::Track *, int> signal_pick_done;
-
 private:
 	Options options;
 
@@ -33,6 +31,7 @@ private:
 	Msp::Input::Mouse mouse;
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root *root;
+	Msp::GLtk::Arrangement *root_arrangement;
 
 	R2C2::Catalogue catalogue;
 	R2C2::Layout layout;
@@ -42,22 +41,13 @@ private:
 	R2C2::Overlay3D *overlay;
 	std::map<R2C2::Train *, Msp::GL::Color> train_colors;
 
-	Msp::GL::Camera camera;
-	Msp::GL::Lighting lighting;
-	Msp::GL::Light light;
-	Msp::GL::Pipeline pipeline;
-	Msp::GL::Mesh arrow_mesh;
+	R2C2::View3D main_view;
 
 	MainWindow *main_wnd;
 	std::list<R2C2::Train *> new_trains;
 	std::list<TrainView *> train_views;
 	Msp::Time::TimeStamp status_timeout;
-	bool picking;
-	R2C2::Track *picking_track;
-	int picking_entry;
-	R2C2::Path3D *picking_path;
 	R2C2::Vector pointer;
-	bool pointer_moved;
 
 public:
 	Engineer(int argc, char **argv);
@@ -68,11 +58,10 @@ public:
 	const R2C2::Catalogue &get_catalogue() const { return catalogue; }
 	R2C2::Layout &get_layout() { return layout; }
 	R2C2::Layout3D &get_layout_3d() { return layout_3d; }
-	const Msp::GL::Lighting &get_lighting() const { return lighting; }
+	R2C2::View3D &get_main_view() { return main_view; }
 	void set_status(const std::string &);
 	void add_train_view(TrainView &);
 	void remove_train_view(TrainView &);
-	void pick(bool);
 	int main();
 	void quit() { exit(0); }
 private: