diff options
author | Paramat <paramat@users.noreply.github.com> | 2018-10-30 06:41:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-30 06:41:15 +0000 |
commit | 34a5960671d2bae76b3ad2080397ffae694a4209 (patch) | |
tree | 8347216daf92bb67c73e4931945e93265ce46db4 | |
parent | 88ba1c70d33cfeb09b73e46d720099083925c805 (diff) | |
download | hax-minetest-server-34a5960671d2bae76b3ad2080397ffae694a4209.tar.gz hax-minetest-server-34a5960671d2bae76b3ad2080397ffae694a4209.zip |
Framed glasslike: Fix and document top/base textures feature (#7824)
Diffstat (limited to '')
-rw-r--r-- | doc/lua_api.txt | 5 | ||||
-rw-r--r-- | src/content_mapblock.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/lua_api.txt b/doc/lua_api.txt index 53f27e20c..2b05cff8c 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1082,6 +1082,11 @@ Look for examples in `games/minimal` or `games/minetest_game`. size: 1 pixel for 16x16, 2 pixels for 32x32 etc. * The glass 'shine' (or other desired detail) on each node face is supplied by the second texture specified in `tiles`. + * If a third texture is specified in `tiles` it will be used for the top and + base of the glass volume. + * If third and fourth textures are specified in `tiles`, the third will be + used for the top of the glass volume and the fourth will be used for the + base of the glass volume. * `glasslike_framed_optional` * This switches between the above 2 drawtypes according to the menu setting 'Connected Glass'. diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index 0259ca3af..7b8231869 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -702,7 +702,7 @@ void MapblockMeshGenerator::drawGlasslikeFramedNode() tiles[2].layers[0].texture && tiles[3].layers[0].texture) { glass_tiles[0] = tiles[4]; - glass_tiles[1] = tiles[0]; + glass_tiles[1] = tiles[2]; glass_tiles[2] = tiles[4]; glass_tiles[3] = tiles[4]; glass_tiles[4] = tiles[3]; |