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

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index d7fb2b8..612fe66 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"
 
@@ -42,10 +43,7 @@ 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;
+	R2C2::View3D main_view;
 	Msp::GL::Mesh arrow_mesh;
 
 	MainWindow *main_wnd;
@@ -68,7 +66,7 @@ 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 &);