diff options
| author | number Zero <silverunicorn2011@yandex.ru> | 2017-02-18 21:53:05 +0300 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-03-26 05:50:59 +0100 |
| commit | 4d5177ff708c7e696eead18200e240047ff520fe (patch) | |
| tree | ea77f5af4479fa6a6eb39f9cc87aa379a86f4aa1 /src | |
| parent | 22567d107fffe7a6833b96cc99d531e5303b47dd (diff) | |
| download | minetest-4d5177ff708c7e696eead18200e240047ff520fe.tar.gz minetest-4d5177ff708c7e696eead18200e240047ff520fe.tar.bz2 minetest-4d5177ff708c7e696eead18200e240047ff520fe.zip | |
Add mesh generation delay
Diffstat (limited to 'src')
| -rw-r--r-- | src/client.cpp | 9 | ||||
| -rw-r--r-- | src/client.h | 3 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 1 | ||||
| -rw-r--r-- | src/settings_translation_file.cpp | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/src/client.cpp b/src/client.cpp index 0c4819bc5..8bbaa83bd 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -157,6 +157,12 @@ QueuedMeshUpdate *MeshUpdateQueue::pop() MeshUpdateThread */ +MeshUpdateThread::MeshUpdateThread() : UpdateThread("Mesh") +{ + m_generation_interval = g_settings->getU16("mesh_generation_interval"); + m_generation_interval = rangelim(m_generation_interval, 0, 50); +} + void MeshUpdateThread::enqueueUpdate(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent) { @@ -168,7 +174,8 @@ void MeshUpdateThread::doUpdate() { QueuedMeshUpdate *q; while ((q = m_queue_in.pop())) { - + if (m_generation_interval) + sleep_ms(m_generation_interval); ScopeProfiler sp(g_profiler, "Client: Mesh making"); MapBlockMesh *mesh_new = new MapBlockMesh(q->data, m_camera_offset); diff --git a/src/client.h b/src/client.h index b1310424d..4a4d296f2 100644 --- a/src/client.h +++ b/src/client.h @@ -120,13 +120,14 @@ class MeshUpdateThread : public UpdateThread { private: MeshUpdateQueue m_queue_in; + int m_generation_interval; protected: virtual void doUpdate(); public: - MeshUpdateThread() : UpdateThread("Mesh") {} + MeshUpdateThread(); void enqueueUpdate(v3s16 p, MeshMakeData *data, bool ack_block_to_server, bool urgent); diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index fbf15b2ea..396b69b3a 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -38,6 +38,7 @@ void set_default_settings(Settings *settings) settings->setDefault("enable_sound", "true"); settings->setDefault("sound_volume", "0.8"); settings->setDefault("enable_mesh_cache", "false"); + settings->setDefault("mesh_generation_interval", "0"); settings->setDefault("enable_vbo", "true"); settings->setDefault("free_move", "false"); settings->setDefault("fast_move", "false"); diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp index 39223d9ce..9ec21c415 100644 --- a/src/settings_translation_file.cpp +++ b/src/settings_translation_file.cpp @@ -245,6 +245,8 @@ fake_function() { gettext("Maximum proportion of current window to be used for hotbar.\nUseful if there's something to be displayed right or left of hotbar."); gettext("Mesh cache"); gettext("Enables caching of facedir rotated meshes."); + gettext("Mapblock mesh generation delay"); + gettext("Delay between mesh updates on the client in ms. Increasing this will slow\ndown the rate of mesh updates, thus reducing jitter on slower clients."); gettext("Minimap"); gettext("Enables minimap."); gettext("Round minimap"); |