X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=49d4283da2bbf9f026362c875f10239b35d8dd05;hb=634580fc81f83e77f236bd1a27e89509261d6154;hp=2a53745db8634ee450fbe592c957d527c953967a;hpb=2abb7008a1e2b93b77742693becf6fe0b8567d6e;p=r2c2.git diff --git a/source/designer/designer.h b/source/designer/designer.h index 2a53745..49d4283 100644 --- a/source/designer/designer.h +++ b/source/designer/designer.h @@ -1,7 +1,7 @@ /* $Id$ This file is part of R²C² -Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa +Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa Distributed under the GPL */ @@ -61,6 +61,7 @@ private: R2C2::Overlay3D *overlay; Msp::GL::Object *base_object; R2C2::Route *cur_route; + R2C2::Zone *cur_zone; std::list new_tracks; Msp::GL::Pipeline *pipeline; Msp::GL::Camera camera; @@ -99,14 +100,19 @@ public: void extend_track(); void connect_tracks(); void flatten_tracks(); - void rename_route(); 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(); - R2C2::Point map_pointer_to_ground(int, int); + 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(int, int); private: void tick(); void key_press(unsigned, unsigned, wchar_t); @@ -116,7 +122,7 @@ private: void render(); void track_added(R2C2::Track &); void track_removed(R2C2::Track &); - R2C2::Track3D *pick_track(int, int); + R2C2::Track *pick_track(int, int); void update_track_icon(R2C2::Track3D &); void selection_changed(); void manipulation_status(const std::string &); @@ -128,7 +134,9 @@ private: void route_name_accept(const std::string &); void svg_export_accept(const std::string &); std::string tooltip(int, int); - void show_route(const R2C2::Route *); + void clear_paths(); + void show_route(const R2C2::Route &); + void show_zone(const R2C2::Zone &); }; #endif