diff options
| author | SmallJoker <mk939@ymail.com> | 2021-10-16 19:21:53 +0200 |
|---|---|---|
| committer | Hugues Ross <hugues.ross@gmail.com> | 2022-01-29 18:42:55 -0500 |
| commit | a27362de6a66692b191f8db0eea13f8d9302cef6 (patch) | |
| tree | d9564f08d6c280c56686e2017c2609f917df2d8b /src | |
| parent | 66e8aae9f2a28ee31ffe30694fdb61a8fdceb8d7 (diff) | |
| download | minetest-a27362de6a66692b191f8db0eea13f8d9302cef6.tar.gz minetest-a27362de6a66692b191f8db0eea13f8d9302cef6.tar.bz2 minetest-a27362de6a66692b191f8db0eea13f8d9302cef6.zip | |
Disable dynamic shadows for the 5.5.0 release
The dynamic shadows are yet not in the desired state to justify the
inclusion into version 5.5.0. A stable release is long overdue, hence
this allows fixes to continue in 5.6.0-dev to finally release an
acceptable version of the dynamic shadows feature.
Reverting this commit is highly recommended to proceed in development.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/mapblock_mesh.cpp | 2 | ||||
| -rw-r--r-- | src/client/render/core.cpp | 2 | ||||
| -rw-r--r-- | src/client/renderingengine.h | 4 | ||||
| -rw-r--r-- | src/client/shader.cpp | 2 | ||||
| -rw-r--r-- | src/client/sky.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp index 03522eca9..249a56087 100644 --- a/src/client/mapblock_mesh.cpp +++ b/src/client/mapblock_mesh.cpp @@ -861,7 +861,7 @@ static void updateFastFaceRow( g_settings->getBool("enable_waving_water"); static thread_local const bool force_not_tiling = - g_settings->getBool("enable_dynamic_shadows"); + false && g_settings->getBool("enable_dynamic_shadows"); v3s16 p = startpos; diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp index f151832f3..44ef1c98c 100644 --- a/src/client/render/core.cpp +++ b/src/client/render/core.cpp @@ -36,7 +36,7 @@ RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud virtual_size = screensize; if (g_settings->getBool("enable_shaders") && - g_settings->getBool("enable_dynamic_shadows")) { + false && g_settings->getBool("enable_dynamic_shadows")) { shadow_renderer = new ShadowRenderer(device, client); } } diff --git a/src/client/renderingengine.h b/src/client/renderingengine.h index 6f104bba9..a0ddb0d9a 100644 --- a/src/client/renderingengine.h +++ b/src/client/renderingengine.h @@ -123,8 +123,8 @@ public: // FIXME: this is still global when it shouldn't be static ShadowRenderer *get_shadow_renderer() { - if (s_singleton && s_singleton->core) - return s_singleton->core->get_shadow_renderer(); + //if (s_singleton && s_singleton->core) + // return s_singleton->core->get_shadow_renderer(); return nullptr; } static std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers(); diff --git a/src/client/shader.cpp b/src/client/shader.cpp index dc9e9ae6d..c04a25862 100644 --- a/src/client/shader.cpp +++ b/src/client/shader.cpp @@ -733,7 +733,7 @@ ShaderInfo ShaderSource::generateShader(const std::string &name, shaders_header << "#define FOG_START " << core::clamp(g_settings->getFloat("fog_start"), 0.0f, 0.99f) << "\n"; - if (g_settings->getBool("enable_dynamic_shadows")) { + if (false && g_settings->getBool("enable_dynamic_shadows")) { shaders_header << "#define ENABLE_DYNAMIC_SHADOWS 1\n"; if (g_settings->getBool("shadow_map_color")) shaders_header << "#define COLORED_SHADOWS 1\n"; diff --git a/src/client/sky.cpp b/src/client/sky.cpp index 0ab710eee..7fe90c6cd 100644 --- a/src/client/sky.cpp +++ b/src/client/sky.cpp @@ -103,7 +103,7 @@ Sky::Sky(s32 id, RenderingEngine *rendering_engine, ITextureSource *tsrc, IShade m_directional_colored_fog = g_settings->getBool("directional_colored_fog"); - if (g_settings->getBool("enable_dynamic_shadows")) { + if (false && g_settings->getBool("enable_dynamic_shadows")) { float val = g_settings->getFloat("shadow_sky_body_orbit_tilt"); m_sky_body_orbit_tilt = rangelim(val, 0.0f, 60.0f); } |