diff options
| author | Lars <larsh@apache.org> | 2020-10-12 13:29:31 -0700 |
|---|---|---|
| committer | lhofhansl <larsh@apache.org> | 2020-10-17 13:09:16 -0700 |
| commit | ed22260822086f84016aa8384c3174bfc6d1739d (patch) | |
| tree | 0b6d04bf315b4d6c832993efeb1b58244b1bcb50 /src/client/shader.cpp | |
| parent | f43d1cfa81aa496174af6cdfa648dab9dd17288c (diff) | |
| download | minetest-ed22260822086f84016aa8384c3174bfc6d1739d.tar.gz minetest-ed22260822086f84016aa8384c3174bfc6d1739d.tar.bz2 minetest-ed22260822086f84016aa8384c3174bfc6d1739d.zip | |
Remove all bump mapping and parallax occlusion related code.
Diffstat (limited to 'src/client/shader.cpp')
| -rw-r--r-- | src/client/shader.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/client/shader.cpp b/src/client/shader.cpp index c5fe5dfe0..e2eeb4ab0 100644 --- a/src/client/shader.cpp +++ b/src/client/shader.cpp @@ -688,35 +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("enable_bumpmapping")) - shaders_header += "#define ENABLE_BUMPMAPPING\n"; - - if (g_settings->getBool("enable_parallax_occlusion")){ - int mode = g_settings->getFloat("parallax_occlusion_mode"); - float scale = g_settings->getFloat("parallax_occlusion_scale"); - float bias = g_settings->getFloat("parallax_occlusion_bias"); - int iterations = g_settings->getFloat("parallax_occlusion_iterations"); - shaders_header += "#define ENABLE_PARALLAX_OCCLUSION\n"; - shaders_header += "#define PARALLAX_OCCLUSION_MODE "; - shaders_header += itos(mode); - shaders_header += "\n"; - shaders_header += "#define PARALLAX_OCCLUSION_SCALE "; - shaders_header += ftos(scale); - shaders_header += "\n"; - shaders_header += "#define PARALLAX_OCCLUSION_BIAS "; - shaders_header += ftos(bias); - shaders_header += "\n"; - shaders_header += "#define PARALLAX_OCCLUSION_ITERATIONS "; - shaders_header += itos(iterations); - shaders_header += "\n"; - } - - shaders_header += "#define USE_NORMALMAPS "; - if (g_settings->getBool("enable_bumpmapping") || g_settings->getBool("enable_parallax_occlusion")) - shaders_header += "1\n"; - else - shaders_header += "0\n"; - if (g_settings->getBool("enable_waving_water")){ shaders_header += "#define ENABLE_WAVING_WATER 1\n"; shaders_header += "#define WATER_WAVE_HEIGHT "; |