X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Foverlay.h;h=e9ed52a93c35df148374511bd3ecf9db994e4fe6;hb=3c04e77e639e7b7fff995ceb9cc8c00da622d26e;hp=8e818bf01e31b59a8fcf2cac1c01f7ecc54354de;hpb=7f81613ba3efdff6e05246738f739e1f914e1151;p=r2c2.git diff --git a/source/3d/overlay.h b/source/3d/overlay.h index 8e818bf..e9ed52a 100644 --- a/source/3d/overlay.h +++ b/source/3d/overlay.h @@ -27,18 +27,17 @@ private: std::string label; float width; Msp::GL::Mesh background; + Msp::GL::Mesh text; Icon(); }; - const Msp::Graphics::Window &window; - const Msp::GL::Camera &camera; const Msp::GL::Font &font; std::map graphics; std::map icons; public: - Overlay3D(const Msp::Graphics::Window &, const Msp::GL::Camera &, const Msp::GL::Font &); + Overlay3D(const Msp::GL::Font &); ~Overlay3D(); void set_label(const Object3D &, const std::string &); @@ -47,7 +46,7 @@ public: void clear_graphics(const Object3D &); void clear(const Object3D &); - virtual void render(const Msp::GL::Tag &) const; + virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const; private: Icon &get_icon(const Object3D &);