X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=cbf01d040a07b82808893fdd305f8732ade02080;hb=495c54e187ddbb7514c983e1829a69d82ccad5f3;hp=a50c5b8202c90e3c440046ca7e6e7690de6c31fc;hpb=6c2b29fb45402ee86b010f05367dad20972d25ed;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index a50c5b8..cbf01d0 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -26,6 +26,7 @@ Distributed under the GPL
 #include "3d/layout.h"
 #include "3d/overlay.h"
 #include "3d/track.h"
+#include "3d/view.h"
 #include "cameracontroller.h"
 #include "manipulator.h"
 #include "measure.h"
@@ -55,24 +56,23 @@ private:
 
 	R2C2::Catalogue catalogue;
 	R2C2::Layout3D *cat_layout_3d;
+	R2C2::View3D *cat_view;
+
 	std::string filename;
 	R2C2::Layout *layout;
 	R2C2::Layout3D *layout_3d;
+	R2C2::View3D *main_view;
 	R2C2::Overlay3D *overlay;
 	Msp::GL::Object *base_object;
 	R2C2::Route *cur_route;
 	R2C2::Zone *cur_zone;
 	std::list<R2C2::Track *> new_tracks;
-	Msp::GL::Pipeline *pipeline;
-	Msp::GL::Camera camera;
-	Msp::GL::Lighting lighting;
-	Msp::GL::Light light;
 
 	Mode mode;
 	Selection selection;
 	Manipulator manipulator;
 	Measure measure;
-	CameraController camera_ctl;
+	CameraController *camera_ctl;
 	TrackWrap *track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
@@ -90,7 +90,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 CameraController &get_camera_controller() const { return camera_ctl; }
+	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; }