X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=471bfc709d7b7ea3568e78c8fcee305ed4b24250;hb=c06f3dde10411cd34aae026d8bf22b7771bdc3e0;hp=e8d0d7605784c93a2b6af7714e389472b6f8fcb0;hpb=c6b9a38300cc2ecfc0df66af162620b9ea5a1e3e;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index e8d0d76..471bfc7 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,16 +1,9 @@
-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef DESIGNER_H_
 #define DESIGNER_H_
 
 #include <string>
 #include <msp/core/application.h>
-#include <msp/gbase/simplewindow.h>
+#include <msp/graphics/simplewindow.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/font.h>
 #include <msp/gl/light.h>
@@ -26,6 +19,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 +49,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;
 
@@ -89,20 +83,29 @@ 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; }
 
 	void new_track();
+	void erase_tracks();
 	void track_properties();
-	void rename_route();
+	void extend_track();
+	void connect_tracks();
+	void flatten_tracks();
 	void svg_export();
 
 	void edit_route(R2C2::Route *);
+	void rename_route();
 	R2C2::Route *get_current_route() const { return cur_route; }
 	void add_selection_to_route();
 
-	R2C2::Point map_pointer_to_ground(int, int);
+	void edit_zone(R2C2::Zone *);
+	void zone_properties();
+	R2C2::Zone *get_current_zone() const { return cur_zone; }
+	void add_selection_to_zone();
+
+	R2C2::Vector map_pointer_to_ground(int, int);
 private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
@@ -112,7 +115,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 &);
@@ -124,7 +127,9 @@ private:
 	void route_name_accept(const std::string &);
 	void svg_export_accept(const std::string &);
 	std::string tooltip(int, int);
-	void show_route(const R2C2::Route *);
+	void clear_paths();
+	void show_route(const R2C2::Route &);
+	void show_zone(const R2C2::Zone &);
 };
 
 #endif