From b3a36f7378ea0f299cfa36c81de42e00adb7292d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Mon, 26 Jun 2017 20:11:17 +0200 Subject: Isolate irrlicht references and use a singleton (#6041) * Add Device3D class which will contain IrrlichtDevice interface move getSupportedVideoDrivers to Device3D Add Device3D singleton & use it in various places Rename Device3D to Rendering engine & add helper functions to various device pointers More singleton work RenderingEngine owns draw_load_screen move draw functions to RenderingEngine Reduce IrrlichtDevice exposure and guienvironment RenderingEngine: Expose get_timer_time() to remove device from guiEngine Make irrlichtdevice & scene manager less exposed * Code style fixes * Move porting::getVideoDriverName, getVideoDriverFriendlyName, getDisplayDensity, getDisplaySize to RenderingEngine Fix XORG_USED macro -> RenderingEngine + create_engine_device from RenderingEngine constructor directly * enum paralax => enum parallax --- src/client/clientlauncher.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/client/clientlauncher.h') diff --git a/src/client/clientlauncher.h b/src/client/clientlauncher.h index 9e0560b14..8f8a01e2f 100644 --- a/src/client/clientlauncher.h +++ b/src/client/clientlauncher.h @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "client/inputhandler.h" #include "gameparams.h" +class RenderingEngine; class ClientLauncher { @@ -43,10 +44,8 @@ protected: GameParams &game_params, const Settings &cmd_args); void main_menu(MainMenuData *menudata); - bool create_engine_device(); void speed_tests(); - bool print_video_modes(); bool list_video_modes = false; bool skip_main_menu = false; @@ -55,12 +54,10 @@ protected: std::string address = ""; std::string playername = ""; std::string password = ""; - IrrlichtDevice *device = nullptr; InputHandler *input = nullptr; MyEventReceiver *receiver = nullptr; gui::IGUISkin *skin = nullptr; gui::IGUIFont *font = nullptr; - scene::ISceneManager *smgr = nullptr; SubgameSpec gamespec; WorldSpec worldspec; bool simple_singleplayer_mode; -- cgit v1.2.3