ServerRemotePlayer implements ServerActiveObject

[oweals/minetest.git] / src / content_mapblock.cpp

diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 5e1bac2e997d254238693763e49c899b38526e6a..b033e484c35adf6fc1096319de0092889a26b4ba 100644 (file)
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -364,6 +364,9 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        assert(content_features(n).special_material);
                        video::SMaterial &liquid_material =
                                        *content_features(n).special_material;
+                       video::SMaterial &liquid_material_bfculled =
+                                       *content_features(n).special_material2;
+
                        assert(content_features(n).special_atlas);
                        AtlasPointer &pa_liquid1 =
                                        *content_features(n).special_atlas;
@@ -516,10 +519,10 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                        continue;
 
                                content_t neighbor_content = neighbor_contents[dir];
+                               ContentFeatures &n_feat = content_features(neighbor_content);
                                
-                               // Don't draw face if neighbor is not air or liquid
-                               if(neighbor_content != CONTENT_AIR
-                                               && content_liquid(neighbor_content) == false)
+                               // Don't draw face if neighbor is blocking the view
+                               if(n_feat.solidness == 2)
                                        continue;
                                
                                bool neighbor_is_same_liquid = (neighbor_content == c_source
@@ -530,6 +533,12 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                if(neighbor_is_same_liquid == true
                                                && top_is_same_liquid == false)
                                        continue;
+
+                               // Use backface culled material if neighbor doesn't have a
+                               // solidness of 0
+                               video::SMaterial *current_material = &liquid_material;
+                               if(n_feat.solidness != 0 || n_feat.visual_solidness != 0)
+                                       current_material = &liquid_material_bfculled;
                                
                                video::S3DVertex vertices[4] =
                                {
@@ -593,17 +602,17 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                                
                                        // Do this to not cause glitches when two liquids are
                                        // side-by-side
-                                       if(neighbor_is_same_liquid == false){
+                                       /*if(neighbor_is_same_liquid == false){
                                                vertices[j].Pos.X *= 0.98;
                                                vertices[j].Pos.Z *= 0.98;
-                                       }
+                                       }*/
 
                                        vertices[j].Pos += intToFloat(p + blockpos_nodes, BS);
                                }
 
                                u16 indices[] = {0,1,2,2,3,0};
                                // Add to mesh collector
-                               collector.append(liquid_material, vertices, 4, indices, 6);
+                               collector.append(*current_material, vertices, 4, indices, 6);
                        }
                        
                        /*