summaryrefslogtreecommitdiff
path: root/src/clientmap.cpp
diff options
context:
space:
mode:
authorKahrl <kahrl@gmx.net>2016-02-07 04:24:24 +0100
committerparamat <mat.gregory@virginmedia.com>2016-02-09 07:16:00 +0000
commit180893e79dd358d2f8f720b200a62daa2838e341 (patch)
tree3bde44395154228069fd9392bf53905a5d9c2926 /src/clientmap.cpp
parent4adbd69a3701608876b50665ed3f7a150750d26e (diff)
downloadminetest-180893e79dd358d2f8f720b200a62daa2838e341.tar.gz
minetest-180893e79dd358d2f8f720b200a62daa2838e341.tar.bz2
minetest-180893e79dd358d2f8f720b200a62daa2838e341.zip
Remove ClientMap::m_camera_mutex
All places that lock this mutex are only called by the main thread: ClientMap::updateCamera(), ClientMap::updateDrawList(), ClientMap::renderMap(), ClientMap::renderPostFx().
Diffstat (limited to 'src/clientmap.cpp')
-rw-r--r--src/clientmap.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index b865c2780..024f2a266 100644
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -157,12 +157,9 @@ void ClientMap::updateDrawList(video::IVideoDriver* driver)
}
m_drawlist.clear();
- m_camera_mutex.lock();
v3f camera_position = m_camera_position;
v3f camera_direction = m_camera_direction;
f32 camera_fov = m_camera_fov;
- //v3s16 camera_offset = m_camera_offset;
- m_camera_mutex.unlock();
// Use a higher fov to accomodate faster camera movements.
// Blocks are cropped better when they are drawn.
@@ -433,11 +430,9 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
int crack = m_client->getCrackLevel();
u32 daynight_ratio = m_client->getEnv().getDayNightRatio();
- m_camera_mutex.lock();
v3f camera_position = m_camera_position;
v3f camera_direction = m_camera_direction;
f32 camera_fov = m_camera_fov;
- m_camera_mutex.unlock();
/*
Get all blocks and draw all visible ones
@@ -799,11 +794,7 @@ void ClientMap::renderPostFx(CameraMode cam_mode)
// Sadly ISceneManager has no "post effects" render pass, in that case we
// could just register for that and handle it in renderMap().
- m_camera_mutex.lock();
- v3f camera_position = m_camera_position;
- m_camera_mutex.unlock();
-
- MapNode n = getNodeNoEx(floatToInt(camera_position, BS));
+ MapNode n = getNodeNoEx(floatToInt(m_camera_position, BS));
// - If the player is in a solid node, make everything black.
// - If the player is in liquid, draw a semi-transparent overlay.