-/* $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>
#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
};
Msp::Graphics::SimpleGLWindow window;
+ Msp::Input::Keyboard keyboard;
+ Msp::Input::Mouse mouse;
Msp::GLtk::Resources ui_res;
Msp::GLtk::Root root;
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;
+ SelectionWrap sel_wrap;
Manipulator manipulator;
Measure measure;
- CameraController camera_ctl;
- TrackWrap track_wrap;
+ CameraController *camera_ctl;
Msp::Time::TimeStamp last_tick;
- static Msp::Application::RegApp<Designer> reg;
-
public:
Designer(int, char **);
~Designer();
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; }
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);
+ void button_press(unsigned);
+ void axis_motion(unsigned, float, float);
void apply_camera();
void render();
void track_added(R2C2::Track &);
void track_removed(R2C2::Track &);
- R2C2::Track *pick_track(int, int);
+ R2C2::Object *pick_object(const R2C2::Vector &);
void update_track_icon(R2C2::Track3D &);
void selection_changed();
void manipulation_status(const std::string &);