X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=a132b4791b4bcfdcca33e945430d8763a30d7b48;hb=d84f187ca34a6ab2f8c37d85fa13d5c113714344;hp=8dbc9d44d03298b94a8c69384b4cb7299cf0828a;hpb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 8dbc9d4..a132b47 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,113 +1,131 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #ifndef DESIGNER_H_
 #define DESIGNER_H_
 
 #include <string>
 #include <msp/core/application.h>
-#include <msp/gbase/display.h>
-#include <msp/gbase/window.h>
-#include <msp/gbase/glcontext.h>
+#include <msp/graphics/simplewindow.h>
+#include <msp/gl/camera.h>
 #include <msp/gl/font.h>
-#include <msp/gl/mesh.h>
+#include <msp/gl/light.h>
+#include <msp/gl/lighting.h>
+#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>
-#include "libmarklin/catalogue.h"
-#include "libmarklin/layout.h"
+#include "libr2c2/catalogue.h"
+#include "libr2c2/layout.h"
 #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 "selectionwrap.h"
 
-class Input;
-class Manipulator;
-class Measure;
-class Selection;
+class Toolbar;
 
-class Designer: public Msp::Application
+class Designer: public Msp::RegisteredApplication<Designer>
 {
 private:
 	enum Mode
 	{
-		SELECT,
 		CATALOGUE,
-		MANIPULATE,
-		MEASURE,
-		INPUT
+		TOOL
 	};
 
-	Msp::Graphics::Display *dpy;
-	Msp::Graphics::Window *wnd;
-	Msp::Graphics::GLContext *glc;
-	unsigned screen_w;
-	unsigned screen_h;
-	Msp::GL::Font *font;
-
-	Marklin::Catalogue catalogue;
-	Marklin::Layout *layout;
-	Marklin::Layout3D *layout_3d;
-	Marklin::Layout *cat_layout;
-	Marklin::Layout3D *cat_layout_3d;
-	Msp::GL::Mesh *base_mesh;
+	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::Path3D *> highlight_paths;
 
 	Mode mode;
-	Selection *selection;
-	Manipulator *manipulator;
-	Measure *measure;
-	Input *input;
-
-	float cam_yaw;
-	float cam_pitch;
-	Marklin::Point cam_pos;
-
-	bool shift;
-	int move_x;
-	int move_y;
-	int zoom;
-	int rotate;
-	int pitch;
-	int pointer_x;
-	int pointer_y;
-
-	int tooltip_x;
-	int tooltip_y;
-	std::string tooltip;
-	Msp::Time::TimeStamp tooltip_timeout;
+	Selection selection;
+	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();
 
-	Marklin::Layout *get_layout() { return layout; }
-	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
-	Msp::GL::Font &get_font() { return *font; }
 	int main();
-	void map_pointer_coords(int, int, float &, float &);
+	void save();
+	void quit();
+
+	const R2C2::Catalogue &get_catalogue() const { return catalogue; }
+	R2C2::Layout &get_layout() { return *layout; }
+	R2C2::Layout3D &get_layout_3d() { return *layout_3d; }
+	const R2C2::View3D &get_view() const { return *main_view; }
+	const CameraController &get_camera_controller() const { return *camera_ctl; }
+
+	void new_object();
+	void erase_objects();
+	void object_properties();
+	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();
+
+	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(const R2C2::Vector &);
 private:
 	void tick();
-	void key_press(unsigned, unsigned, wchar_t);
-	void key_release(unsigned, unsigned);
-	void button_press(int, int, unsigned, unsigned);
-	void pointer_motion(int, int);
-	void project_3d();
+	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();
-	Marklin::Track3D *pick_track(int, int);
-	void manipulation_status(const std::string &);
-	void manipulation_done(bool);
-	void measure_changed();
-	void measure_done();
-	void move_tooltip(int, int);
-	void save_accept();
-	void turnout_id_accept();
-	void sensor_id_accept();
-	void input_dismiss();
+	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);
+	void clear_paths();
+	void show_route(const R2C2::Route &);
+	void show_zone(const R2C2::Zone &);
 };
 
 #endif