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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 52904e4..cbf01d0 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -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,25 +56,24 @@ 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;
-	TrackWrap track_wrap;
+	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; }
 
@@ -112,7 +112,7 @@ public:
 	R2C2::Zone *get_current_zone() const { return cur_zone; }
 	void add_selection_to_zone();
 
-	R2C2::Point map_pointer_to_ground(int, int);
+	R2C2::Vector map_pointer_to_ground(int, int);
 private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
@@ -122,7 +122,7 @@ private:
 	void render();
 	void track_added(R2C2::Track &);
 	void track_removed(R2C2::Track &);
-	R2C2::Track3D *pick_track(int, int);
+	R2C2::Track *pick_track(int, int);
 	void update_track_icon(R2C2::Track3D &);
 	void selection_changed();
 	void manipulation_status(const std::string &);