aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhecks <42101236+hecktest@users.noreply.github.com>2020-09-14 19:27:25 +0200
committerGitHub <noreply@github.com>2020-09-14 19:27:25 +0200
commitfcff9f291103411af6d8f946fbb275b6fa0583b9 (patch)
tree60e33f8decb59a4a04265a2563b5bf56a5c1aad5 /src
parent3fb1f45301880a3aa901b752af1ecc912efe5915 (diff)
downloadminetest-fcff9f291103411af6d8f946fbb275b6fa0583b9.tar.gz
minetest-fcff9f291103411af6d8f946fbb275b6fa0583b9.tar.bz2
minetest-fcff9f291103411af6d8f946fbb275b6fa0583b9.zip
Remove "generate normal maps" feature (#10313)
Erase all traces of normal "generation" from fragment shaders Remove the "feature" from the engine and default config Remove any leftover documentation of it
Diffstat (limited to 'src')
-rw-r--r--src/client/shader.cpp28
-rw-r--r--src/defaultsettings.cpp3
-rw-r--r--src/settings_translation_file.cpp8
3 files changed, 1 insertions, 38 deletions
diff --git a/src/client/shader.cpp b/src/client/shader.cpp
index fc0a72319..c5fe5dfe0 100644
--- a/src/client/shader.cpp
+++ b/src/client/shader.cpp
@@ -688,34 +688,6 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp
shaders_header += itos(drawtype);
shaders_header += "\n";
- if (g_settings->getBool("generate_normalmaps")) {
- shaders_header += "#define GENERATE_NORMALMAPS 1\n";
- } else {
- shaders_header += "#define GENERATE_NORMALMAPS 0\n";
- }
- shaders_header += "#define NORMALMAPS_STRENGTH ";
- shaders_header += ftos(g_settings->getFloat("normalmaps_strength"));
- shaders_header += "\n";
- float sample_step;
- int smooth = (int)g_settings->getFloat("normalmaps_smooth");
- switch (smooth){
- case 0:
- sample_step = 0.0078125; // 1.0 / 128.0
- break;
- case 1:
- sample_step = 0.00390625; // 1.0 / 256.0
- break;
- case 2:
- sample_step = 0.001953125; // 1.0 / 512.0
- break;
- default:
- sample_step = 0.0078125;
- break;
- }
- shaders_header += "#define SAMPLE_STEP ";
- shaders_header += ftos(sample_step);
- shaders_header += "\n";
-
if (g_settings->getBool("enable_bumpmapping"))
shaders_header += "#define ENABLE_BUMPMAPPING\n";
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index d2115c959..3a0b88dc2 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -253,9 +253,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("tone_mapping", "false");
settings->setDefault("enable_bumpmapping", "false");
settings->setDefault("enable_parallax_occlusion", "false");
- settings->setDefault("generate_normalmaps", "false");
- settings->setDefault("normalmaps_strength", "0.6");
- settings->setDefault("normalmaps_smooth", "1");
settings->setDefault("parallax_occlusion_mode", "1");
settings->setDefault("parallax_occlusion_iterations", "4");
settings->setDefault("parallax_occlusion_scale", "0.08");
diff --git a/src/settings_translation_file.cpp b/src/settings_translation_file.cpp
index febfbb9d3..0cd772337 100644
--- a/src/settings_translation_file.cpp
+++ b/src/settings_translation_file.cpp
@@ -242,13 +242,7 @@ fake_function() {
gettext("Enables Hable's 'Uncharted 2' filmic tone mapping.\nSimulates the tone curve of photographic film and how this approximates the\nappearance of high dynamic range images. Mid-range contrast is slightly\nenhanced, highlights and shadows are gradually compressed.");
gettext("Bumpmapping");
gettext("Bumpmapping");
- gettext("Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack\nor need to be auto-generated.\nRequires shaders to be enabled.");
- gettext("Generate normalmaps");
- gettext("Enables on the fly normalmap generation (Emboss effect).\nRequires bumpmapping to be enabled.");
- gettext("Normalmaps strength");
- gettext("Strength of generated normalmaps.");
- gettext("Normalmaps sampling");
- gettext("Defines sampling step of texture.\nA higher value results in smoother normal maps.");
+ gettext("Enables bumpmapping for textures. Normalmaps need to be supplied by the texture pack.\nRequires shaders to be enabled.");
gettext("Parallax Occlusion");
gettext("Parallax occlusion");
gettext("Enables parallax occlusion mapping.\nRequires shaders to be enabled.");