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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index a50c5b8..a132b47 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-2011 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>
@@ -18,6 +11,7 @@ Distributed under the GPL
 #include <msp/gl/object.h>
 #include <msp/gl/pipeline.h>
 #include <msp/gltk/label.h>
+#include <msp/gltk/layout.h>
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
@@ -26,59 +20,57 @@ 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"
 #include "selection.h"
-#include "trackwrap.h"
+#include "selectionwrap.h"
 
 class Toolbar;
 
-class Designer: public Msp::Application
+class Designer: public Msp::RegisteredApplication<Designer>
 {
 private:
 	enum Mode
 	{
-		SELECT,
 		CATALOGUE,
-		MANIPULATE,
-		MANIPULATE_DONE,
-		MEASURE
+		TOOL
 	};
 
 	Msp::Graphics::SimpleGLWindow window;
+	Msp::Input::Keyboard keyboard;
+	Msp::Input::Mouse mouse;
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root root;
+	Msp::GLtk::Layout *root_layout;
 
 	std::vector<Toolbar *> toolbars;
 	Msp::GLtk::Label *lbl_status;
 
 	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;
+	std::list<R2C2::Path3D *> highlight_paths;
 
 	Mode mode;
 	Selection selection;
-	Manipulator manipulator;
-	Measure measure;
-	CameraController camera_ctl;
-	TrackWrap *track_wrap;
+	SelectionWrap sel_wrap;
+	Tool *cur_tool;
+	unsigned keep_status;
+	CameraController *camera_ctl;
 
 	Msp::Time::TimeStamp last_tick;
 
-	static Msp::Application::RegApp<Designer> reg;
-
 public:
 	Designer(int, char **);
 	~Designer();
@@ -90,13 +82,12 @@ 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 Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-	Msp::GLtk::Root &get_root() { return root; }
+	const R2C2::View3D &get_view() const { return *main_view; }
+	const CameraController &get_camera_controller() const { return *camera_ctl; }
 
-	void new_track();
-	void erase_tracks();
-	void track_properties();
+	void new_object();
+	void erase_objects();
+	void object_properties();
 	void extend_track();
 	void connect_tracks();
 	void flatten_tracks();
@@ -112,25 +103,23 @@ public:
 	R2C2::Zone *get_current_zone() const { return cur_zone; }
 	void add_selection_to_zone();
 
-	R2C2::Vector map_pointer_to_ground(int, int);
+	R2C2::Vector map_pointer_to_ground(const R2C2::Vector &);
 private:
 	void tick();
-	void key_press(unsigned, unsigned, wchar_t);
-	void button_press(int, int, unsigned, unsigned);
-	void pointer_motion(int, int);
+	void key_press(unsigned);
+	template<typename T>
+	T *use_tool_with_selected_objects();
+	template<typename T>
+	T *use_tool();
+	void use_tool(Tool *);
+	void use_select_tool();
+	void button_press(unsigned);
 	void apply_camera();
 	void render();
-	void track_added(R2C2::Track &);
-	void track_removed(R2C2::Track &);
-	R2C2::Track *pick_track(int, int);
-	void update_track_icon(R2C2::Track3D &);
-	void selection_changed();
-	void manipulation_status(const std::string &);
-	void manipulation_done(bool);
-	void measure_changed();
-	void measure_done();
-	void arrange_toolbars();
-	void track_properties_response(int);
+	R2C2::Object *pick_object(const R2C2::Vector &);
+	void update_object_icon(R2C2::Object &);
+	void tool_status(const std::string &);
+	void object_properties_response(int);
 	void route_name_accept(const std::string &);
 	void svg_export_accept(const std::string &);
 	std::string tooltip(int, int);