diff options
| -rw-r--r-- | src/content_mapblock.cpp | 208 |
1 files changed, 158 insertions, 50 deletions
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp index 3637094f9..9078488c2 100644 --- a/src/content_mapblock.cpp +++ b/src/content_mapblock.cpp @@ -755,14 +755,37 @@ void mapblock_mesh_generate_special(MeshMakeData *data, v3s16( 0, 0, 1), v3s16( 0, 0,-1) }; - TileSpec tiles[2]; - tiles[0] = getNodeTile(n, p, dirs[0], data); - tiles[1] = getNodeTile(n, p, dirs[1], data); + + u8 i; + TileSpec tiles[6]; + for (i = 0; i < 6; i++) + tiles[i] = getNodeTile(n, p, dirs[i], data); + + TileSpec glass_tiles[6]; + if (tiles[1].texture && tiles[2].texture && tiles[3].texture) { + glass_tiles[0] = tiles[2]; + glass_tiles[1] = tiles[3]; + glass_tiles[2] = tiles[1]; + glass_tiles[3] = tiles[1]; + glass_tiles[4] = tiles[1]; + glass_tiles[5] = tiles[1]; + } else { + for (i = 0; i < 6; i++) + glass_tiles[i] = tiles[1]; + } + + u8 param2 = n.getParam2(); + bool H_merge = ! bool(param2 & 128); + bool V_merge = ! bool(param2 & 64); + param2 = param2 & 63; + u16 l = getInteriorLight(n, 1, nodedef); video::SColor c = MapBlock_LightColor(255, l, decode_light(f.light_source)); v3f pos = intToFloat(p, BS); - static const float a=BS/2; - static const float b=.876*(BS/2); + static const float a = BS / 2; + static const float g = a - 0.003; + static const float b = .876 * ( BS / 2 ); + static const aabb3f frame_edges[12] = { aabb3f( b, b,-a, a, a, a), // y+ aabb3f(-a, b,-a,-b, a, a), // y+ @@ -777,66 +800,117 @@ void mapblock_mesh_generate_special(MeshMakeData *data, aabb3f(-a,-a,-a, a,-b,-b), // z- aabb3f(-a, b,-a, a, a,-b) // z- }; - aabb3f glass_faces[6] = { - aabb3f(-a, a,-a, a, a, a), // y+ - aabb3f(-a,-a,-a, a,-a, a), // y- - aabb3f( a,-a,-a, a, a, a), // x+ - aabb3f(-a,-a,-a,-a, a, a), // x- - aabb3f(-a,-a, a, a, a, a), // z+ - aabb3f(-a,-a,-a, a, a,-a) // z- + static const aabb3f glass_faces[6] = { + aabb3f(-g, g,-g, g, g, g), // y+ + aabb3f(-g,-g,-g, g,-g, g), // y- + aabb3f( g,-g,-g, g, g, g), // x+ + aabb3f(-g,-g,-g,-g, g, g), // x- + aabb3f(-g,-g, g, g, g, g), // z+ + aabb3f(-g,-g,-g, g, g,-g) // z- }; + // table of node visible faces, 0 = invisible int visible_faces[6] = {0,0,0,0,0,0}; + + // table of neighbours, 1 = same type, checked with g_26dirs int nb[18] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - u8 i; + + // g_26dirs to check when only horizontal merge is allowed + int nb_H_dirs[8] = {0,2,3,5,10,11,12,13}; + content_t current = n.getContent(); - content_t content; + content_t n2c; MapNode n2; v3s16 n2p; - for(i=0; i<18; i++) - { - n2p = blockpos_nodes + p + g_26dirs[i]; + + // neighbours checks for frames visibility + + if (!H_merge && V_merge) { + n2p = blockpos_nodes + p + g_26dirs[1]; n2 = data->m_vmanip.getNodeNoEx(n2p); - content_t n2c = n2.getContent(); - //TODO: remove CONTENT_IGNORE check when getNodeNoEx is fixed + n2c = n2.getContent(); if (n2c == current || n2c == CONTENT_IGNORE) - nb[i]=1; - } - for(i=0; i<6; i++) - { - n2p = blockpos_nodes + p + dirs[i]; + nb[1] = 1; + n2p = blockpos_nodes + p + g_26dirs[4]; n2 = data->m_vmanip.getNodeNoEx(n2p); - content = n2.getContent(); - const ContentFeatures &f2 = nodedef->get(content); - if (content == CONTENT_AIR || f2.isLiquid()) - visible_faces[i]=1; + n2c = n2.getContent(); + if (n2c == current || n2c == CONTENT_IGNORE) + nb[4] = 1; + } else if (H_merge && !V_merge) { + for(i = 0; i < 8; i++) { + n2p = blockpos_nodes + p + g_26dirs[nb_H_dirs[i]]; + n2 = data->m_vmanip.getNodeNoEx(n2p); + n2c = n2.getContent(); + if (n2c == current || n2c == CONTENT_IGNORE) + nb[nb_H_dirs[i]] = 1; + } + } else if (H_merge && V_merge) { + for(i = 0; i < 18; i++) { + n2p = blockpos_nodes + p + g_26dirs[i]; + n2 = data->m_vmanip.getNodeNoEx(n2p); + n2c = n2.getContent(); + if (n2c == current || n2c == CONTENT_IGNORE) + nb[i] = 1; + } + } + + // faces visibility checks + + if (!V_merge) { + visible_faces[0] = 1; + visible_faces[1] = 1; + } else { + for(i = 0; i < 2; i++) { + n2p = blockpos_nodes + p + dirs[i]; + n2 = data->m_vmanip.getNodeNoEx(n2p); + n2c = n2.getContent(); + if (n2c != current) + visible_faces[i] = 1; + } } + + if (!H_merge) { + visible_faces[2] = 1; + visible_faces[3] = 1; + visible_faces[4] = 1; + visible_faces[5] = 1; + } else { + for(i = 2; i < 6; i++) { + n2p = blockpos_nodes + p + dirs[i]; + n2 = data->m_vmanip.getNodeNoEx(n2p); + n2c = n2.getContent(); + if (n2c != current) + visible_faces[i] = 1; + } + } + static const u8 nb_triplet[12*3] = { 1,2, 7, 1,5, 6, 4,2,15, 4,5,14, 2,0,11, 2,3,13, 5,0,10, 5,3,12, 0,1, 8, 0,4,16, 3,4,17, 3,1, 9 }; - f32 tx1,ty1,tz1,tx2,ty2,tz2; + f32 tx1, ty1, tz1, tx2, ty2, tz2; aabb3f box; - for(i=0; i<12; i++) + + for(i = 0; i < 12; i++) { int edge_invisible; - if (nb[nb_triplet[i*3+2]]==1) - edge_invisible=nb[nb_triplet[i*3]] & nb[nb_triplet[i*3+1]]; + if (nb[nb_triplet[i*3+2]]) + edge_invisible = nb[nb_triplet[i*3]] & nb[nb_triplet[i*3+1]]; else - edge_invisible=nb[nb_triplet[i*3]] ^ nb[nb_triplet[i*3+1]]; + edge_invisible = nb[nb_triplet[i*3]] ^ nb[nb_triplet[i*3+1]]; if (edge_invisible) continue; - box=frame_edges[i]; + box = frame_edges[i]; box.MinEdge += pos; box.MaxEdge += pos; - tx1 = (box.MinEdge.X/BS)+0.5; - ty1 = (box.MinEdge.Y/BS)+0.5; - tz1 = (box.MinEdge.Z/BS)+0.5; - tx2 = (box.MaxEdge.X/BS)+0.5; - ty2 = (box.MaxEdge.Y/BS)+0.5; - tz2 = (box.MaxEdge.Z/BS)+0.5; + tx1 = (box.MinEdge.X / BS) + 0.5; + ty1 = (box.MinEdge.Y / BS) + 0.5; + tz1 = (box.MinEdge.Z / BS) + 0.5; + tx2 = (box.MaxEdge.X / BS) + 0.5; + ty2 = (box.MaxEdge.Y / BS) + 0.5; + tz2 = (box.MaxEdge.Z / BS) + 0.5; f32 txc1[24] = { tx1, 1-tz2, tx2, 1-tz1, tx1, tz1, tx2, tz2, @@ -847,19 +921,20 @@ void mapblock_mesh_generate_special(MeshMakeData *data, }; makeCuboid(&collector, box, &tiles[0], 1, c, txc1); } - for(i=0; i<6; i++) + + for(i = 0; i < 6; i++) { - if (visible_faces[i]==0) + if (!visible_faces[i]) continue; - box=glass_faces[i]; + box = glass_faces[i]; box.MinEdge += pos; box.MaxEdge += pos; - tx1 = (box.MinEdge.X/BS)+0.5; - ty1 = (box.MinEdge.Y/BS)+0.5; - tz1 = (box.MinEdge.Z/BS)+0.5; - tx2 = (box.MaxEdge.X/BS)+0.5; - ty2 = (box.MaxEdge.Y/BS)+0.5; - tz2 = (box.MaxEdge.Z/BS)+0.5; + tx1 = (box.MinEdge.X / BS) + 0.5; + ty1 = (box.MinEdge.Y / BS) + 0.5; + tz1 = (box.MinEdge.Z / BS) + 0.5; + tx2 = (box.MaxEdge.X / BS) + 0.5; + ty2 = (box.MaxEdge.Y / BS) + 0.5; + tz2 = (box.MaxEdge.Z / BS) + 0.5; f32 txc2[24] = { tx1, 1-tz2, tx2, 1-tz1, tx1, tz1, tx2, tz2, @@ -868,7 +943,40 @@ void mapblock_mesh_generate_special(MeshMakeData *data, 1-tx2, 1-ty2, 1-tx1, 1-ty1, tx1, 1-ty2, tx2, 1-ty1, }; - makeCuboid(&collector, box, &tiles[1], 1, c, txc2); + makeCuboid(&collector, box, &glass_tiles[i], 1, c, txc2); + } + + if (param2 > 0){ + // Interior volume level is in range 0 .. 63, + // convert it to -0.5 .. 0.5 + float vlev = (((float)param2 / 63.0 ) * 2.0 - 1.0); + TileSpec interior_tiles[6]; + for (i = 0; i < 6; i++) + interior_tiles[i] = f.special_tiles[0]; + float offset = 0.003; + box = aabb3f(visible_faces[3] ? -b : -a + offset, + visible_faces[1] ? -b : -a + offset, + visible_faces[5] ? -b : -a + offset, + visible_faces[2] ? b : a - offset, + visible_faces[0] ? b * vlev : a * vlev - offset, + visible_faces[4] ? b : a - offset); + box.MinEdge += pos; + box.MaxEdge += pos; + tx1 = (box.MinEdge.X / BS) + 0.5; + ty1 = (box.MinEdge.Y / BS) + 0.5; + tz1 = (box.MinEdge.Z / BS) + 0.5; + tx2 = (box.MaxEdge.X / BS) + 0.5; + ty2 = (box.MaxEdge.Y / BS) + 0.5; + tz2 = (box.MaxEdge.Z / BS) + 0.5; + f32 txc3[24] = { + tx1, 1-tz2, tx2, 1-tz1, + tx1, tz1, tx2, tz2, + tz1, 1-ty2, tz2, 1-ty1, + 1-tz2, 1-ty2, 1-tz1, 1-ty1, + 1-tx2, 1-ty2, 1-tx1, 1-ty1, + tx1, 1-ty2, tx2, 1-ty1, + }; + makeCuboid(&collector, box, interior_tiles, 6, c, txc3); } break;} case NDT_ALLFACES: |