diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-26 20:11:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 20:11:17 +0200 |
| commit | b3a36f7378ea0f299cfa36c81de42e00adb7292d (patch) | |
| tree | 23d056b575ff0dba8cc759cc00f732099a1f3bce /src/content_mapblock.cpp | |
| parent | a8650e785df3f12efa5f8cd3c6a695fb9e22a598 (diff) | |
| download | minetest-b3a36f7378ea0f299cfa36c81de42e00adb7292d.tar.gz minetest-b3a36f7378ea0f299cfa36c81de42e00adb7292d.tar.bz2 minetest-b3a36f7378ea0f299cfa36c81de42e00adb7292d.zip | |
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
Diffstat (limited to 'src/content_mapblock.cpp')
| -rw-r--r-- | src/content_mapblock.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index d7ee8fb82..1077c2382 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "client/tile.h" #include "mesh.h" #include <IMeshManipulator.h> +#include "client/renderingengine.h" #include "client.h" #include "log.h" #include "noise.h" @@ -64,8 +65,7 @@ MapblockMeshGenerator::MapblockMeshGenerator(MeshMakeData *input, MeshCollector collector = output; nodedef = data->m_client->ndef(); - smgr = data->m_client->getSceneManager(); - meshmanip = smgr->getMeshManipulator(); + meshmanip = RenderingEngine::get_scene_manager()->getMeshManipulator(); enable_mesh_cache = g_settings->getBool("enable_mesh_cache") && !data->m_smooth_lighting; // Mesh cache is not supported with smooth lighting |