diff options
| author | stujones11 <stujones111@gmail.com> | 2017-06-07 18:52:38 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-07-01 04:43:55 +0100 |
| commit | 6e5588c8e1a6cf79005b5e95c75cbfacf7c75589 (patch) | |
| tree | 2f008e377daa84c33674099cdc0580e0479340e0 /src/shader.cpp | |
| parent | f3ad75691aea30d2d68aab19fbfa9031409c39d7 (diff) | |
| download | hax-minetest-server-6e5588c8e1a6cf79005b5e95c75cbfacf7c75589.tar.gz hax-minetest-server-6e5588c8e1a6cf79005b5e95c75cbfacf7c75589.zip | |
Tile material: Add 'TILE_MATERIAL_OPAQUE', use for drawtype 'NDT_NORMAL'
Prevents normal drawtype nodes having transparency.
Avoids clients cheating by using 'x-ray' texture packs with transparent textures.
Diffstat (limited to 'src/shader.cpp')
| -rw-r--r-- | src/shader.cpp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/shader.cpp b/src/shader.cpp index 6e89d75ad..4f482fddb 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -531,26 +531,19 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp shaderinfo.drawtype = drawtype; shaderinfo.material = video::EMT_SOLID; switch (material_type) { - case TILE_MATERIAL_BASIC: - shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; - break; - case TILE_MATERIAL_ALPHA: - shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL; - break; - case TILE_MATERIAL_LIQUID_TRANSPARENT: - shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL; - break; - case TILE_MATERIAL_LIQUID_OPAQUE: - shaderinfo.base_material = video::EMT_SOLID; - break; - case TILE_MATERIAL_WAVING_LEAVES: - shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; - break; - case TILE_MATERIAL_WAVING_PLANTS: - shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; - break; - default: - break; + case TILE_MATERIAL_OPAQUE: + case TILE_MATERIAL_LIQUID_OPAQUE: + shaderinfo.base_material = video::EMT_SOLID; + break; + case TILE_MATERIAL_ALPHA: + case TILE_MATERIAL_LIQUID_TRANSPARENT: + shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL; + break; + case TILE_MATERIAL_BASIC: + case TILE_MATERIAL_WAVING_LEAVES: + case TILE_MATERIAL_WAVING_PLANTS: + shaderinfo.base_material = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF; + break; } bool enable_shaders = g_settings->getBool("enable_shaders"); @@ -642,7 +635,8 @@ ShaderInfo generate_shader(const std::string &name, u8 material_type, u8 drawtyp "TILE_MATERIAL_LIQUID_TRANSPARENT", "TILE_MATERIAL_LIQUID_OPAQUE", "TILE_MATERIAL_WAVING_LEAVES", - "TILE_MATERIAL_WAVING_PLANTS" + "TILE_MATERIAL_WAVING_PLANTS", + "TILE_MATERIAL_OPAQUE" }; for (int i = 0; i < 6; i++){ |