Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-04 14:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reformat rot array in NodeDefManager::nodeboxConnects, to make it less magic

Browse Source
This commit is contained in:
Desour 2023-10-29 01:38:34 +02:00 committed by sfan5
parent 64104585c5
commit 1d31533601
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/nodedef.cpp
View File

@ -1736,18 +1736,41 @@ bool NodeDefManager::nodeboxConnects(MapNode from, MapNode to,
f2.param_type_2 == CPT2_4DIR || f2.param_type_2 == CPT2_4DIR ||
f2.param_type_2 == CPT2_COLORED_4DIR) f2.param_type_2 == CPT2_COLORED_4DIR)
&& (connect_face >= 4)) { && (connect_face >= 4)) {
static const u8 rot[33 * 4] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, static const u8 rot[33 * 4] = {
0, 0, 0, 0, 4, 32, 16, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, // 4 - back 0, 0, 0, 0,
8, 4, 32, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, // 8 - right 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 8, 4, 32, 0, 4, 32, 16, 8, // 4 - back
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, // 16 - front 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 32, 16, // 8 - right
0, 0, 0, 0, 0, 0, 32, 16, 8, 4 // 32 - left 0, 0, 0, 0,
}; 0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
16, 8, 4, 32, // 16 - front
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
32, 16, 8, 4 // 32 - left
};
if (f2.param_type_2 == CPT2_FACEDIR || if (f2.param_type_2 == CPT2_FACEDIR ||
f2.param_type_2 == CPT2_COLORED_FACEDIR) { f2.param_type_2 == CPT2_COLORED_FACEDIR) {
return (f2.connect_sides return (f2.connect_sides