diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2021-04-29 20:38:35 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2021-05-03 19:49:19 +0200 |
| commit | 48d5abd5bee7a3f956cb2b92745bed6313cf5d8a (patch) | |
| tree | 3ecf00918b1011dbe9e141e38eb989e8d0152335 /src/client/renderingengine.h | |
| parent | a93712458b2f8914fdb43ec436c5caf908ba93b8 (diff) | |
| download | minetest-48d5abd5bee7a3f956cb2b92745bed6313cf5d8a.tar.gz minetest-48d5abd5bee7a3f956cb2b92745bed6313cf5d8a.tar.bz2 minetest-48d5abd5bee7a3f956cb2b92745bed6313cf5d8a.zip | |
refacto: remove get_gui_env & draw_load_screen from RenderingEngine singleton
Diffstat (limited to 'src/client/renderingengine.h')
| -rw-r--r-- | src/client/renderingengine.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/client/renderingengine.h b/src/client/renderingengine.h index 4d06baa23..1fd85f5ef 100644 --- a/src/client/renderingengine.h +++ b/src/client/renderingengine.h @@ -95,19 +95,14 @@ public: return m_device->getTimer()->getTime(); } - static gui::IGUIEnvironment *get_gui_env() + gui::IGUIEnvironment *get_gui_env() { - sanity_check(s_singleton && s_singleton->m_device); - return s_singleton->m_device->getGUIEnvironment(); + return m_device->getGUIEnvironment(); } - inline static void draw_load_screen(const std::wstring &text, + void draw_load_screen(const std::wstring &text, gui::IGUIEnvironment *guienv, ITextureSource *tsrc, - float dtime = 0, int percent = 0, bool clouds = true) - { - s_singleton->_draw_load_screen( - text, guienv, tsrc, dtime, percent, clouds); - } + float dtime = 0, int percent = 0, bool clouds = true); void draw_menu_scene(gui::IGUIEnvironment *guienv, float dtime, bool clouds); void draw_scene(video::SColor skycolor, bool show_hud, @@ -125,10 +120,6 @@ public: static std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers(); private: - void _draw_load_screen(const std::wstring &text, gui::IGUIEnvironment *guienv, - ITextureSource *tsrc, float dtime = 0, int percent = 0, - bool clouds = true); - v2u32 _getWindowSize() const; std::unique_ptr<RenderingCore> core; |