Triplehx3/luanti
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refacto: protect some RenderingEngine::get_scene_manager

Browse Source 
* protect it from Camera, Sky, ClientMap object calls
* rename Game::sky to Game::m_sky
This commit is contained in:
Loic Blot
2021-04-29 08:51:17 +02:00
committed by Loïc Blot
parent 258101a910
commit 1bc855646e
8 changed files with 56 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/camera.cpp
View File

@@ -43,11 +43,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define WIELDMESH_AMPLITUDE_X 7.0f
#define WIELDMESH_AMPLITUDE_Y 10.0f
Camera::Camera(MapDrawControl &draw_control, Client *client):
Camera::Camera(MapDrawControl &draw_control, Client *client, RenderingEngine *rendering_engine):
m_draw_control(draw_control),
m_client(client)
{
scene::ISceneManager *smgr = RenderingEngine::get_scene_manager();
auto smgr = rendering_engine->get_scene_manager();
// note: making the camera node a child of the player node
// would lead to unexpected behaviour, so we don't do that.
m_playernode = smgr->addEmptySceneNode(smgr->getRootSceneNode());