/* $Id$
This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include "libmarklin/catalogue.h"
#include "libmarklin/layout.h"
#include "3d/layout.h"
+#include "3d/overlay.h"
#include "3d/track.h"
#include "cameracontroller.h"
#include "manipulator.h"
#include "measure.h"
#include "selection.h"
+#include "trackwrap.h"
-class Input;
class Toolbar;
class Designer: public Msp::Application
SELECT,
CATALOGUE,
MANIPULATE,
- MEASURE,
- INPUT
+ MEASURE
};
Msp::Graphics::SimpleGLWindow window;
Msp::GLtk::Root *root;
Toolbar *toolbar;
- Msp::GLtk::Label *lbl_tooltip;
- Msp::Time::TimeStamp tooltip_timeout;
+ Msp::GLtk::Label *lbl_status;
Marklin::Catalogue catalogue;
Marklin::Layout3D *cat_layout_3d;
std::string filename;
Marklin::Layout *layout;
Marklin::Layout3D *layout_3d;
+ Marklin::Overlay3D *overlay;
Msp::GL::Object *base_object;
Marklin::Route *cur_route;
+ std::list<Marklin::Track *> new_tracks;
Msp::GL::Pipeline *pipeline;
Msp::GL::Camera camera;
Msp::GL::Lighting lighting;
Selection selection;
Manipulator manipulator;
Measure measure;
- Input *input;
- CameraController camera_ctl;
-
- bool shift;
- int pointer_x;
- int pointer_y;
+ CameraController *camera_ctl;
+ TrackWrap track_wrap;
Msp::Time::TimeStamp last_tick;
void save();
void quit();
- Marklin::Layout *get_layout() { return layout; }
- Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+ const Marklin::Catalogue &get_catalogue() const { return catalogue; }
+ Marklin::Layout &get_layout() { return *layout; }
+ Marklin::Layout3D &get_layout_3d() { return *layout_3d; }
+ const Msp::GL::Camera &get_camera() const { return camera; }
const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
Msp::GLtk::Root &get_root() const { return *root; }
- void edit_route(Marklin::Route &);
+
+ void new_track();
+ void set_turnout_id();
+ void set_sensor_id();
+ void rename_route();
+
+ void edit_route(Marklin::Route *);
Marklin::Route *get_current_route() const { return cur_route; }
void add_selection_to_route();
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 apply_camera();
void render();
+ void track_added(Marklin::Track &);
Marklin::Track3D *pick_track(int, int);
- void update_track_color(Marklin::Track3D &);
+ void update_track_icon(Marklin::Track3D &);
+ void selection_changed();
void manipulation_status(const std::string &);
void manipulation_done(bool);
void measure_changed();
void measure_done();
- void set_tooltip(int, int, const std::string &);
- void clear_tooltip();
- void save_accept();
- void turnout_id_accept();
- void sensor_id_accept();
- void input_dismiss();
- void view_all();
+ void turnout_id_accept(const std::string &);
+ void sensor_id_accept(const std::string &);
+ void route_name_accept(const std::string &);
+ std::string tooltip(int, int);
+ void show_route(const Marklin::Route *);
};
#endif