X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=9fc2961ddd01ba7ba08da0858e16584100509e5d;hb=1ff06c5bc46a677fa389ef86c6b26664368f1653;hp=c173668408a36d1300f8c725a75a9dec18a06a91;hpb=9b05c573a38639827697fe393d55b7c76f5bde45;p=r2c2.git diff --git a/source/designer/designer.h b/source/designer/designer.h index c173668..9fc2961 100644 --- a/source/designer/designer.h +++ b/source/designer/designer.h @@ -1,6 +1,6 @@ /* $Id$ -This file is part of the MSP Märklin suite +This file is part of R²C² Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -21,8 +21,8 @@ Distributed under the GPL #include #include #include -#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" @@ -53,15 +53,15 @@ private: Toolbar *toolbar; Msp::GLtk::Label *lbl_status; - Marklin::Catalogue catalogue; - Marklin::Layout3D *cat_layout_3d; + R2C2::Catalogue catalogue; + R2C2::Layout3D *cat_layout_3d; std::string filename; - Marklin::Layout *layout; - Marklin::Layout3D *layout_3d; - Marklin::Overlay3D *overlay; + R2C2::Layout *layout; + R2C2::Layout3D *layout_3d; + R2C2::Overlay3D *overlay; Msp::GL::Object *base_object; - Marklin::Route *cur_route; - std::list new_tracks; + R2C2::Route *cur_route; + std::list new_tracks; Msp::GL::Pipeline *pipeline; Msp::GL::Camera camera; Msp::GL::Lighting lighting; @@ -86,9 +86,9 @@ public: void save(); void quit(); - const Marklin::Catalogue &get_catalogue() const { return catalogue; } - Marklin::Layout &get_layout() { return *layout; } - Marklin::Layout3D &get_layout_3d() { return *layout_3d; } + 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; } @@ -99,11 +99,11 @@ public: void rename_route(); void svg_export(); - void edit_route(Marklin::Route *); - Marklin::Route *get_current_route() const { return cur_route; } + void edit_route(R2C2::Route *); + R2C2::Route *get_current_route() const { return cur_route; } void add_selection_to_route(); - Marklin::Point map_pointer_to_ground(int, int); + R2C2::Point map_pointer_to_ground(int, int); private: void tick(); void key_press(unsigned, unsigned, wchar_t); @@ -111,10 +111,10 @@ private: void pointer_motion(int, int); void apply_camera(); void render(); - void track_added(Marklin::Track &); - void track_removed(Marklin::Track &); - Marklin::Track3D *pick_track(int, int); - void update_track_icon(Marklin::Track3D &); + void track_added(R2C2::Track &); + void track_removed(R2C2::Track &); + R2C2::Track3D *pick_track(int, int); + void update_track_icon(R2C2::Track3D &); void selection_changed(); void manipulation_status(const std::string &); void manipulation_done(bool); @@ -125,7 +125,7 @@ private: void route_name_accept(const std::string &); void svg_export_accept(const std::string &); std::string tooltip(int, int); - void show_route(const Marklin::Route *); + void show_route(const R2C2::Route *); }; #endif