X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Foverlay.h;fp=source%2F3d%2Foverlay.h;h=eac51bef810687807ade2e4784108e5d161bf961;hb=bc8ac89bbe774bb133b758416182aa18e5e0a5a5;hp=0a9a0223efad695ae266187cea6416e890673925;hpb=48dff17ed3144d944965e7cb534e1f8fb92bd620;p=r2c2.git diff --git a/source/3d/overlay.h b/source/3d/overlay.h index 0a9a022..eac51be 100644 --- a/source/3d/overlay.h +++ b/source/3d/overlay.h @@ -16,7 +16,7 @@ Distributed under the GPL namespace Marklin { -class Track3D; +class Object3D; class Overlay3D: public Msp::GL::Renderable { @@ -35,22 +35,22 @@ private: const Msp::GL::Camera &camera; const Msp::GL::Font &font; std::map graphics; - std::map icons; + std::map icons; public: Overlay3D(const Msp::Graphics::Window &, const Msp::GL::Camera &, const Msp::GL::Font &); ~Overlay3D(); - void set_label(const Track3D &, const std::string &); - void add_graphic(const Track3D &, const std::string &); - void remove_graphic(const Track3D &, const std::string &); - void clear_graphics(const Track3D &); - void clear(const Track3D &); + void set_label(const Object3D &, const std::string &); + void add_graphic(const Object3D &, const std::string &); + void remove_graphic(const Object3D &, const std::string &); + void clear_graphics(const Object3D &); + void clear(const Object3D &); virtual void render(const Msp::GL::Tag &) const; private: - Icon &get_icon(const Track3D &); + Icon &get_icon(const Object3D &); const Msp::GL::Mesh *get_graphic(const std::string &); void update_icon(Icon &); };