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/clientenvironment.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/clientenvironment.cpp') diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp index e0398a062..28b61b06e 100644 --- a/src/clientenvironment.cpp +++ b/src/clientenvironment.cpp @@ -31,16 +31,16 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "voxelalgorithms.h" #include "settings.h" #include +#include "client/renderingengine.h" /* ClientEnvironment */ -ClientEnvironment::ClientEnvironment(ClientMap *map, scene::ISceneManager *smgr, +ClientEnvironment::ClientEnvironment(ClientMap *map, ITextureSource *texturesource, Client *client): Environment(client), m_map(map), - m_smgr(smgr), m_texturesource(texturesource), m_client(client) { @@ -456,7 +456,7 @@ u16 ClientEnvironment::addActiveObject(ClientActiveObject *object) infostream<<"ClientEnvironment::addActiveObject(): " <<"added (id="<getId()<<")"<getId()] = object; - object->addToScene(m_smgr, m_texturesource); + object->addToScene(RenderingEngine::get_scene_manager(), m_texturesource); { // Update lighting immediately u8 light = 0; bool pos_ok; -- cgit v1.2.3