X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=d229324fb8ccc23a7d65a85d2b2a3937268984f1;hb=bd649cbc44e04f5e456ca19b7a32ebe479c130e1;hp=5cb0c7849fe834186b2dad44aea14dcb66790711;hpb=707a611dae600333f3a9bd6421176f242fe49907;p=r2c2.git diff --git a/source/designer/designer.h b/source/designer/designer.h index 5cb0c78..d229324 100644 --- a/source/designer/designer.h +++ b/source/designer/designer.h @@ -30,6 +30,7 @@ Distributed under the GPL #include "manipulator.h" #include "measure.h" #include "selection.h" +#include "trackwrap.h" class Toolbar; @@ -59,6 +60,7 @@ private: Marklin::Overlay3D *overlay; Msp::GL::Object *base_object; Marklin::Route *cur_route; + std::list new_tracks; Msp::GL::Pipeline *pipeline; Msp::GL::Camera camera; Msp::GL::Lighting lighting; @@ -69,6 +71,7 @@ private: Manipulator manipulator; Measure measure; CameraController camera_ctl; + TrackWrap track_wrap; Msp::Time::TimeStamp last_tick; @@ -105,8 +108,10 @@ private: void pointer_motion(int, int); void apply_camera(); void render(); + void track_added(Marklin::Track &); Marklin::Track3D *pick_track(int, int); void update_track_icon(Marklin::Track3D &); + void selection_changed(); void manipulation_status(const std::string &); void manipulation_done(bool); void measure_changed();