Improve glass
[oweals/minetest.git] / src / content_mapblock.cpp
index 1cc37b969d989a16a4fc2db1acc6af95e27b610a..0bd2d22638cafeec980f43229afe0fadbd3393ec 100644 (file)
@@ -18,10 +18,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "content_mapblock.h"
-#include "content_mapnode.h"
-#include "main.h" // For g_settings and g_texturesource
+
+#include "main.h" // For g_settings
 #include "mineral.h"
 #include "mapblock_mesh.h" // For MapBlock_LightColor()
+#include "settings.h"
+#include "nodedef.h"
+#include "gamedef.h"
 
 #ifndef SERVER
 // Create a cuboid.
@@ -120,18 +123,17 @@ void makeCuboid(video::SMaterial &material, MeshCollector *collector,
 
 #ifndef SERVER
 void mapblock_mesh_generate_special(MeshMakeData *data,
-               MeshCollector &collector)
+               MeshCollector &collector, IGameDef *gamedef)
 {
+       INodeDefManager *nodedef = gamedef->ndef();
+
        // 0ms
        //TimeTaker timer("mapblock_mesh_generate_special()");
 
        /*
                Some settings
        */
-       bool new_style_water = g_settings.getBool("new_style_water");
-       bool new_style_leaves = g_settings.getBool("new_style_leaves");
-       //bool smooth_lighting = g_settings.getBool("smooth_lighting");
-       bool invisible_stone = g_settings.getBool("invisible_stone");
+       bool new_style_water = g_settings->getBool("new_style_water");
        
        float node_liquid_level = 1.0;
        if(new_style_water)
@@ -139,75 +141,13 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
        
        v3s16 blockpos_nodes = data->m_blockpos*MAP_BLOCKSIZE;
 
-       // New-style leaves material
-       video::SMaterial material_leaves1;
-       material_leaves1.setFlag(video::EMF_LIGHTING, false);
-       //material_leaves1.setFlag(video::EMF_BACK_FACE_CULLING, false);
-       material_leaves1.setFlag(video::EMF_BILINEAR_FILTER, false);
-       material_leaves1.setFlag(video::EMF_FOG_ENABLE, true);
-       material_leaves1.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-       AtlasPointer pa_leaves1 = g_texturesource->getTexture(
-                       g_texturesource->getTextureId("leaves.png"));
-       material_leaves1.setTexture(0, pa_leaves1.atlas);
-
-       // Glass material
-       video::SMaterial material_glass;
-       material_glass.setFlag(video::EMF_LIGHTING, false);
-       material_glass.setFlag(video::EMF_BILINEAR_FILTER, false);
-       material_glass.setFlag(video::EMF_FOG_ENABLE, true);
-       material_glass.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-       AtlasPointer pa_glass = g_texturesource->getTexture(
-                       g_texturesource->getTextureId("glass.png"));
-       material_glass.setTexture(0, pa_glass.atlas);
-
-       // Wood material
-       video::SMaterial material_wood;
-       material_wood.setFlag(video::EMF_LIGHTING, false);
-       material_wood.setFlag(video::EMF_BILINEAR_FILTER, false);
-       material_wood.setFlag(video::EMF_FOG_ENABLE, true);
-       material_wood.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-       AtlasPointer pa_wood = g_texturesource->getTexture(
-                       g_texturesource->getTextureId("wood.png"));
-       material_wood.setTexture(0, pa_wood.atlas);
-
-       // General ground material for special output
+       /*// General ground material for special output
        // Texture is modified just before usage
        video::SMaterial material_general;
        material_general.setFlag(video::EMF_LIGHTING, false);
        material_general.setFlag(video::EMF_BILINEAR_FILTER, false);
        material_general.setFlag(video::EMF_FOG_ENABLE, true);
-       material_general.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-
-
-       // Papyrus material
-       video::SMaterial material_papyrus;
-       material_papyrus.setFlag(video::EMF_LIGHTING, false);
-       material_papyrus.setFlag(video::EMF_BILINEAR_FILTER, false);
-       material_papyrus.setFlag(video::EMF_FOG_ENABLE, true);
-       material_papyrus.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-       AtlasPointer pa_papyrus = g_texturesource->getTexture(
-                       g_texturesource->getTextureId("papyrus.png"));
-       material_papyrus.setTexture(0, pa_papyrus.atlas);
-       
-       // Apple material
-       video::SMaterial material_apple;
-       material_apple.setFlag(video::EMF_LIGHTING, false);
-       material_apple.setFlag(video::EMF_BILINEAR_FILTER, false);
-       material_apple.setFlag(video::EMF_FOG_ENABLE, true);
-       material_apple.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-       AtlasPointer pa_apple = g_texturesource->getTexture(
-                       g_texturesource->getTextureId("apple.png"));
-       material_apple.setTexture(0, pa_apple.atlas);
-
-       // junglegrass material
-       video::SMaterial material_junglegrass;
-       material_junglegrass.setFlag(video::EMF_LIGHTING, false);
-       material_junglegrass.setFlag(video::EMF_BILINEAR_FILTER, false);
-       material_junglegrass.setFlag(video::EMF_FOG_ENABLE, true);
-       material_junglegrass.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-       AtlasPointer pa_junglegrass = g_texturesource->getTexture(
-                       g_texturesource->getTextureId("junglegrass.png"));
-       material_junglegrass.setTexture(0, pa_junglegrass.atlas);
+       material_general.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;*/
 
        for(s16 z=0; z<MAP_BLOCKSIZE; z++)
        for(s16 y=0; y<MAP_BLOCKSIZE; y++)
@@ -216,153 +156,101 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                v3s16 p(x,y,z);
 
                MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes+p);
+               const ContentFeatures &f = nodedef->get(n);
+
+               // Only solidness=0 stuff is drawn here
+               if(f.solidness != 0)
+                       continue;
                
-               /*
-                       Add torches to mesh
-               */
-               if(n.getContent() == CONTENT_TORCH)
+               switch(f.drawtype){
+               default:
+                       infostream<<"Got "<<f.drawtype<<std::endl;
+                       assert(0);
+                       break;
+               case NDT_AIRLIKE:
+                       break;
+               case NDT_LIQUID:
                {
-                       video::SColor c(255,255,255,255);
-
-                       // Wall at X+ of node
-                       video::S3DVertex vertices[4] =
-                       {
-                               video::S3DVertex(-BS/2,-BS/2,0, 0,0,0, c, 0,1),
-                               video::S3DVertex(BS/2,-BS/2,0, 0,0,0, c, 1,1),
-                               video::S3DVertex(BS/2,BS/2,0, 0,0,0, c, 1,0),
-                               video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c, 0,0),
-                       };
-
-                       v3s16 dir = unpackDir(n.param2);
-
-                       for(s32 i=0; i<4; i++)
-                       {
-                               if(dir == v3s16(1,0,0))
-                                       vertices[i].Pos.rotateXZBy(0);
-                               if(dir == v3s16(-1,0,0))
-                                       vertices[i].Pos.rotateXZBy(180);
-                               if(dir == v3s16(0,0,1))
-                                       vertices[i].Pos.rotateXZBy(90);
-                               if(dir == v3s16(0,0,-1))
-                                       vertices[i].Pos.rotateXZBy(-90);
-                               if(dir == v3s16(0,-1,0))
-                                       vertices[i].Pos.rotateXZBy(45);
-                               if(dir == v3s16(0,1,0))
-                                       vertices[i].Pos.rotateXZBy(-45);
-
-                               vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
-                       }
+                       /*
+                               Add water sources to mesh if using new style
+                       */
+                       assert(nodedef->get(n).special_materials[0]);
+                       //assert(nodedef->get(n).special_materials[1]);
+                       assert(nodedef->get(n).special_aps[0]);
 
-                       // Set material
-                       video::SMaterial material;
-                       material.setFlag(video::EMF_LIGHTING, false);
-                       material.setFlag(video::EMF_BACK_FACE_CULLING, false);
-                       material.setFlag(video::EMF_BILINEAR_FILTER, false);
-                       //material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-                       material.MaterialType
-                                       = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       video::SMaterial &liquid_material =
+                                       *nodedef->get(n).special_materials[0];
+                       /*video::SMaterial &liquid_material_bfculled =
+                                       *nodedef->get(n).special_materials[1];*/
+                       AtlasPointer &pa_liquid1 =
+                                       *nodedef->get(n).special_aps[0];
 
-                       if(dir == v3s16(0,-1,0))
-                               material.setTexture(0,
-                                               g_texturesource->getTextureRaw("torch_on_floor.png"));
-                       else if(dir == v3s16(0,1,0))
-                               material.setTexture(0,
-                                               g_texturesource->getTextureRaw("torch_on_ceiling.png"));
-                       // For backwards compatibility
-                       else if(dir == v3s16(0,0,0))
-                               material.setTexture(0,
-                                               g_texturesource->getTextureRaw("torch_on_floor.png"));
-                       else
-                               material.setTexture(0, 
-                                               g_texturesource->getTextureRaw("torch.png"));
+                       bool top_is_air = false;
+                       MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x,y+1,z));
+                       if(n.getContent() == CONTENT_AIR)
+                               top_is_air = true;
+                       
+                       if(top_is_air == false)
+                               continue;
 
-                       u16 indices[] = {0,1,2,2,3,0};
-                       // Add to mesh collector
-                       collector.append(material, vertices, 4, indices, 6);
-               }
-               /*
-                       Signs on walls
-               */
-               else if(n.getContent() == CONTENT_SIGN_WALL)
-               {
-                       u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio));
-                       video::SColor c = MapBlock_LightColor(255, l);
-                               
-                       float d = (float)BS/16;
-                       // Wall at X+ of node
+                       u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio, nodedef));
+                       video::SColor c = MapBlock_LightColor(
+                                       nodedef->get(n).alpha, l);
+                       
                        video::S3DVertex vertices[4] =
                        {
-                               video::S3DVertex(BS/2-d,-BS/2,-BS/2, 0,0,0, c, 0,1),
-                               video::S3DVertex(BS/2-d,-BS/2,BS/2, 0,0,0, c, 1,1),
-                               video::S3DVertex(BS/2-d,BS/2,BS/2, 0,0,0, c, 1,0),
-                               video::S3DVertex(BS/2-d,BS/2,-BS/2, 0,0,0, c, 0,0),
+                               video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c,
+                                               pa_liquid1.x0(), pa_liquid1.y1()),
+                               video::S3DVertex(BS/2,0,BS/2, 0,0,0, c,
+                                               pa_liquid1.x1(), pa_liquid1.y1()),
+                               video::S3DVertex(BS/2,0,-BS/2, 0,0,0, c,
+                                               pa_liquid1.x1(), pa_liquid1.y0()),
+                               video::S3DVertex(-BS/2,0,-BS/2, 0,0,0, c,
+                                               pa_liquid1.x0(), pa_liquid1.y0()),
                        };
 
-                       v3s16 dir = unpackDir(n.param2);
-
                        for(s32 i=0; i<4; i++)
                        {
-                               if(dir == v3s16(1,0,0))
-                                       vertices[i].Pos.rotateXZBy(0);
-                               if(dir == v3s16(-1,0,0))
-                                       vertices[i].Pos.rotateXZBy(180);
-                               if(dir == v3s16(0,0,1))
-                                       vertices[i].Pos.rotateXZBy(90);
-                               if(dir == v3s16(0,0,-1))
-                                       vertices[i].Pos.rotateXZBy(-90);
-                               if(dir == v3s16(0,-1,0))
-                                       vertices[i].Pos.rotateXYBy(-90);
-                               if(dir == v3s16(0,1,0))
-                                       vertices[i].Pos.rotateXYBy(90);
-
+                               vertices[i].Pos.Y += (-0.5+node_liquid_level)*BS;
                                vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
                        }
 
-                       // Set material
-                       video::SMaterial material;
-                       material.setFlag(video::EMF_LIGHTING, false);
-                       material.setFlag(video::EMF_BACK_FACE_CULLING, false);
-                       material.setFlag(video::EMF_BILINEAR_FILTER, false);
-                       material.setFlag(video::EMF_FOG_ENABLE, true);
-                       //material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-                       material.MaterialType
-                                       = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-
-                       material.setTexture(0, 
-                                       g_texturesource->getTextureRaw("sign_wall.png"));
-
                        u16 indices[] = {0,1,2,2,3,0};
                        // Add to mesh collector
-                       collector.append(material, vertices, 4, indices, 6);
-               }
-               /*
-                       Add flowing liquid to mesh
-               */
-               else if(content_features(n).liquid_type == LIQUID_FLOWING)
+                       collector.append(liquid_material, vertices, 4, indices, 6);
+               break;}
+               case NDT_FLOWINGLIQUID:
                {
-                       assert(content_features(n).special_material);
+                       /*
+                               Add flowing liquid to mesh
+                       */
+                       assert(nodedef->get(n).special_materials[0]);
+                       assert(nodedef->get(n).special_materials[1]);
+                       assert(nodedef->get(n).special_aps[0]);
+
                        video::SMaterial &liquid_material =
-                                       *content_features(n).special_material;
-                       assert(content_features(n).special_atlas);
+                                       *nodedef->get(n).special_materials[0];
+                       video::SMaterial &liquid_material_bfculled =
+                                       *nodedef->get(n).special_materials[1];
                        AtlasPointer &pa_liquid1 =
-                                       *content_features(n).special_atlas;
+                                       *nodedef->get(n).special_aps[0];
 
                        bool top_is_same_liquid = false;
                        MapNode ntop = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x,y+1,z));
-                       content_t c_flowing = content_features(n).liquid_alternative_flowing;
-                       content_t c_source = content_features(n).liquid_alternative_source;
+                       content_t c_flowing = nodedef->get(n).liquid_alternative_flowing;
+                       content_t c_source = nodedef->get(n).liquid_alternative_source;
                        if(ntop.getContent() == c_flowing || ntop.getContent() == c_source)
                                top_is_same_liquid = true;
                        
                        u8 l = 0;
                        // Use the light of the node on top if possible
-                       if(content_features(ntop).param_type == CPT_LIGHT)
-                               l = decode_light(ntop.getLightBlend(data->m_daynight_ratio));
+                       if(nodedef->get(ntop).param_type == CPT_LIGHT)
+                               l = decode_light(ntop.getLightBlend(data->m_daynight_ratio, nodedef));
                        // Otherwise use the light of this node (the liquid)
                        else
-                               l = decode_light(n.getLightBlend(data->m_daynight_ratio));
+                               l = decode_light(n.getLightBlend(data->m_daynight_ratio, nodedef));
                        video::SColor c = MapBlock_LightColor(
-                                       content_features(n).vertex_alpha, l);
+                                       nodedef->get(n).alpha, l);
                        
                        // Neighbor liquid levels (key = relative position)
                        // Includes current node
@@ -495,10 +383,10 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                        continue;
 
                                content_t neighbor_content = neighbor_contents[dir];
+                               const ContentFeatures &n_feat = nodedef->get(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
@@ -509,13 +397,15 @@ 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] =
                                {
-                                       /*video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c, 0,1),
-                                       video::S3DVertex(BS/2,0,BS/2, 0,0,0, c, 1,1),
-                                       video::S3DVertex(BS/2,0,BS/2, 0,0,0, c, 1,0),
-                                       video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c, 0,0),*/
                                        video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c,
                                                        pa_liquid1.x0(), pa_liquid1.y1()),
                                        video::S3DVertex(BS/2,0,BS/2, 0,0,0, c,
@@ -576,17 +466,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);
                        }
                        
                        /*
@@ -597,10 +487,6 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        {
                                video::S3DVertex vertices[4] =
                                {
-                                       /*video::S3DVertex(-BS/2,0,-BS/2, 0,0,0, c, 0,1),
-                                       video::S3DVertex(BS/2,0,-BS/2, 0,0,0, c, 1,1),
-                                       video::S3DVertex(BS/2,0,BS/2, 0,0,0, c, 1,0),
-                                       video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c, 0,0),*/
                                        video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c,
                                                        pa_liquid1.x0(), pa_liquid1.y1()),
                                        video::S3DVertex(BS/2,0,BS/2, 0,0,0, c,
@@ -627,132 +513,82 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                // Add to mesh collector
                                collector.append(liquid_material, vertices, 4, indices, 6);
                        }
-               }
-               /*
-                       Add water sources to mesh if using new style
-               */
-               else if(content_features(n).liquid_type == LIQUID_SOURCE
-                               && new_style_water)
-               {
-                       assert(content_features(n).special_material);
-                       video::SMaterial &liquid_material =
-                                       *content_features(n).special_material;
-                       assert(content_features(n).special_atlas);
-                       AtlasPointer &pa_liquid1 =
-                                       *content_features(n).special_atlas;
-
-                       bool top_is_air = false;
-                       MapNode n = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x,y+1,z));
-                       if(n.getContent() == CONTENT_AIR)
-                               top_is_air = true;
-                       
-                       if(top_is_air == false)
-                               continue;
-
-                       u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio));
-                       video::SColor c = MapBlock_LightColor(
-                                       content_features(n).vertex_alpha, l);
-                       
-                       video::S3DVertex vertices[4] =
-                       {
-                               /*video::S3DVertex(-BS/2,0,-BS/2, 0,0,0, c, 0,1),
-                               video::S3DVertex(BS/2,0,-BS/2, 0,0,0, c, 1,1),
-                               video::S3DVertex(BS/2,0,BS/2, 0,0,0, c, 1,0),
-                               video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c, 0,0),*/
-                               video::S3DVertex(-BS/2,0,BS/2, 0,0,0, c,
-                                               pa_liquid1.x0(), pa_liquid1.y1()),
-                               video::S3DVertex(BS/2,0,BS/2, 0,0,0, c,
-                                               pa_liquid1.x1(), pa_liquid1.y1()),
-                               video::S3DVertex(BS/2,0,-BS/2, 0,0,0, c,
-                                               pa_liquid1.x1(), pa_liquid1.y0()),
-                               video::S3DVertex(-BS/2,0,-BS/2, 0,0,0, c,
-                                               pa_liquid1.x0(), pa_liquid1.y0()),
-                       };
-
-                       for(s32 i=0; i<4; i++)
-                       {
-                               vertices[i].Pos.Y += (-0.5+node_liquid_level)*BS;
-                               vertices[i].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);
-               }
-               /*
-                       Add leaves if using new style
-               */
-               else if(n.getContent() == CONTENT_LEAVES && new_style_leaves)
+               break;}
+               case NDT_GLASSLIKE:
                {
-                       /*u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio));*/
-                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio)));
+                       video::SMaterial material_glass;
+                       material_glass.setFlag(video::EMF_LIGHTING, false);
+                       material_glass.setFlag(video::EMF_BILINEAR_FILTER, false);
+                       material_glass.setFlag(video::EMF_FOG_ENABLE, true);
+                       material_glass.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       AtlasPointer pa_glass = f.tiles[0].texture;
+                       material_glass.setTexture(0, pa_glass.atlas);
+
+                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio, nodedef)));
                        video::SColor c = MapBlock_LightColor(255, l);
 
                        for(u32 j=0; j<6; j++)
                        {
+                               // Check this neighbor
+                               v3s16 n2p = blockpos_nodes + p + g_6dirs[j];
+                               MapNode n2 = data->m_vmanip.getNodeNoEx(n2p);
+                               // Don't make face if neighbor is of same type
+                               if(n2.getContent() == n.getContent())
+                                       continue;
+
+                               // The face at Z+
                                video::S3DVertex vertices[4] =
                                {
-                                       /*video::S3DVertex(-BS/2,-BS/2,BS/2, 0,0,0, c, 0,1),
-                                       video::S3DVertex(BS/2,-BS/2,BS/2, 0,0,0, c, 1,1),
-                                       video::S3DVertex(BS/2,BS/2,BS/2, 0,0,0, c, 1,0),
-                                       video::S3DVertex(-BS/2,BS/2,BS/2, 0,0,0, c, 0,0),*/
                                        video::S3DVertex(-BS/2,-BS/2,BS/2, 0,0,0, c,
-                                               pa_leaves1.x0(), pa_leaves1.y1()),
+                                               pa_glass.x0(), pa_glass.y1()),
                                        video::S3DVertex(BS/2,-BS/2,BS/2, 0,0,0, c,
-                                               pa_leaves1.x1(), pa_leaves1.y1()),
+                                               pa_glass.x1(), pa_glass.y1()),
                                        video::S3DVertex(BS/2,BS/2,BS/2, 0,0,0, c,
-                                               pa_leaves1.x1(), pa_leaves1.y0()),
+                                               pa_glass.x1(), pa_glass.y0()),
                                        video::S3DVertex(-BS/2,BS/2,BS/2, 0,0,0, c,
-                                               pa_leaves1.x0(), pa_leaves1.y0()),
+                                               pa_glass.x0(), pa_glass.y0()),
                                };
-
-                               if(j == 0)
-                               {
+                               
+                               // Rotations in the g_6dirs format
+                               if(j == 0) // Z+
                                        for(u16 i=0; i<4; i++)
                                                vertices[i].Pos.rotateXZBy(0);
-                               }
-                               else if(j == 1)
-                               {
+                               else if(j == 1) // Y+
                                        for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(180);
-                               }
-                               else if(j == 2)
-                               {
+                                               vertices[i].Pos.rotateYZBy(-90);
+                               else if(j == 2) // X+
                                        for(u16 i=0; i<4; i++)
                                                vertices[i].Pos.rotateXZBy(-90);
-                               }
-                               else if(j == 3)
-                               {
+                               else if(j == 3) // Z-
                                        for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(90);
-                               }
-                               else if(j == 4)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateYZBy(-90);
-                               }
-                               else if(j == 5)
-                               {
+                                               vertices[i].Pos.rotateXZBy(180);
+                               else if(j == 4) // Y-
                                        for(u16 i=0; i<4; i++)
                                                vertices[i].Pos.rotateYZBy(90);
-                               }
+                               else if(j == 5) // X-
+                                       for(u16 i=0; i<4; i++)
+                                               vertices[i].Pos.rotateXZBy(90);
 
-                               for(u16 i=0; i<4; i++)
-                               {
+                               for(u16 i=0; i<4; i++){
                                        vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
                                }
 
                                u16 indices[] = {0,1,2,2,3,0};
                                // Add to mesh collector
-                               collector.append(material_leaves1, vertices, 4, indices, 6);
+                               collector.append(material_glass, vertices, 4, indices, 6);
                        }
-               }
-               /*
-                       Add glass
-               */
-               else if(n.getContent() == CONTENT_GLASS)
+               break;}
+               case NDT_ALLFACES:
                {
-                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio)));
+                       video::SMaterial material_leaves1;
+                       material_leaves1.setFlag(video::EMF_LIGHTING, false);
+                       material_leaves1.setFlag(video::EMF_BILINEAR_FILTER, false);
+                       material_leaves1.setFlag(video::EMF_FOG_ENABLE, true);
+                       material_leaves1.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       AtlasPointer pa_leaves1 = f.tiles[0].texture;
+                       material_leaves1.setTexture(0, pa_leaves1.atlas);
+
+                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio, nodedef)));
                        video::SColor c = MapBlock_LightColor(255, l);
 
                        for(u32 j=0; j<6; j++)
@@ -760,223 +596,192 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                video::S3DVertex vertices[4] =
                                {
                                        video::S3DVertex(-BS/2,-BS/2,BS/2, 0,0,0, c,
-                                               pa_glass.x0(), pa_glass.y1()),
+                                               pa_leaves1.x0(), pa_leaves1.y1()),
                                        video::S3DVertex(BS/2,-BS/2,BS/2, 0,0,0, c,
-                                               pa_glass.x1(), pa_glass.y1()),
+                                               pa_leaves1.x1(), pa_leaves1.y1()),
                                        video::S3DVertex(BS/2,BS/2,BS/2, 0,0,0, c,
-                                               pa_glass.x1(), pa_glass.y0()),
+                                               pa_leaves1.x1(), pa_leaves1.y0()),
                                        video::S3DVertex(-BS/2,BS/2,BS/2, 0,0,0, c,
-                                               pa_glass.x0(), pa_glass.y0()),
+                                               pa_leaves1.x0(), pa_leaves1.y0()),
                                };
 
-                               if(j == 0)
-                               {
+                               // Rotations in the g_6dirs format
+                               if(j == 0) // Z+
                                        for(u16 i=0; i<4; i++)
                                                vertices[i].Pos.rotateXZBy(0);
-                               }
-                               else if(j == 1)
-                               {
+                               else if(j == 1) // Y+
                                        for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(180);
-                               }
-                               else if(j == 2)
-                               {
+                                               vertices[i].Pos.rotateYZBy(-90);
+                               else if(j == 2) // X+
                                        for(u16 i=0; i<4; i++)
                                                vertices[i].Pos.rotateXZBy(-90);
-                               }
-                               else if(j == 3)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(90);
-                               }
-                               else if(j == 4)
-                               {
+                               else if(j == 3) // Z-
                                        for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateYZBy(-90);
-                               }
-                               else if(j == 5)
-                               {
+                                               vertices[i].Pos.rotateXZBy(180);
+                               else if(j == 4) // Y-
                                        for(u16 i=0; i<4; i++)
                                                vertices[i].Pos.rotateYZBy(90);
-                               }
+                               else if(j == 5) // X-
+                                       for(u16 i=0; i<4; i++)
+                                               vertices[i].Pos.rotateXZBy(90);
 
-                               for(u16 i=0; i<4; i++)
-                               {
+                               for(u16 i=0; i<4; i++){
                                        vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
                                }
 
                                u16 indices[] = {0,1,2,2,3,0};
                                // Add to mesh collector
-                               collector.append(material_glass, vertices, 4, indices, 6);
+                               collector.append(material_leaves1, vertices, 4, indices, 6);
                        }
-               }
-               /*
-                       Add fence
-               */
-               else if(n.getContent() == CONTENT_FENCE)
+               break;}
+               case NDT_ALLFACES_OPTIONAL:
+                       // This is always pre-converted to something else
+                       assert(0);
+                       break;
+               case NDT_TORCHLIKE:
                {
-                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio)));
-                       video::SColor c = MapBlock_LightColor(255, l);
+                       v3s16 dir = unpackDir(n.param2);
+                       
+                       AtlasPointer ap(0);
+                       if(dir == v3s16(0,-1,0)){
+                               ap = f.tiles[0].texture; // floor
+                       } else if(dir == v3s16(0,1,0)){
+                               ap = f.tiles[1].texture; // ceiling
+                       // For backwards compatibility
+                       } else if(dir == v3s16(0,0,0)){
+                               ap = f.tiles[0].texture; // floor
+                       } else {
+                               ap = f.tiles[2].texture; // side
+                       }
 
-                       const f32 post_rad=(f32)BS/10;
-                       const f32 bar_rad=(f32)BS/20;
-                       const f32 bar_len=(f32)(BS/2)-post_rad;
+                       // Set material
+                       video::SMaterial material;
+                       material.setFlag(video::EMF_LIGHTING, false);
+                       material.setFlag(video::EMF_BACK_FACE_CULLING, false);
+                       material.setFlag(video::EMF_BILINEAR_FILTER, false);
+                       material.setFlag(video::EMF_FOG_ENABLE, true);
+                       //material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
+                       material.MaterialType
+                                       = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       material.setTexture(0, ap.atlas);
 
-                       // The post - always present
-                       v3f pos = intToFloat(p+blockpos_nodes, BS);
-                       f32 postuv[24]={
-                                       0.4,0.4,0.6,0.6,
-                                       0.35,0,0.65,1,
-                                       0.35,0,0.65,1,
-                                       0.35,0,0.65,1,
-                                       0.35,0,0.65,1,
-                                       0.4,0.4,0.6,0.6};
-                       makeCuboid(material_wood, &collector,
-                               &pa_wood, c, pos,
-                               post_rad,BS/2,post_rad, postuv);
+                       video::SColor c(255,255,255,255);
 
-                       // Now a section of fence, +X, if there's a post there
-                       v3s16 p2 = p;
-                       p2.X++;
-                       MapNode n2 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p2);
-                       if(n2.getContent() == CONTENT_FENCE)
-                       {
-                               pos = intToFloat(p+blockpos_nodes, BS);
-                               pos.X += BS/2;
-                               pos.Y += BS/4;
-                               f32 xrailuv[24]={
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6};
-                               makeCuboid(material_wood, &collector,
-                                       &pa_wood, c, pos,
-                                       bar_len,bar_rad,bar_rad, xrailuv);
-
-                               pos.Y -= BS/2;
-                               makeCuboid(material_wood, &collector,
-                                       &pa_wood, c, pos,
-                                       bar_len,bar_rad,bar_rad, xrailuv);
-                       }
+                       // Wall at X+ of node
+                       video::S3DVertex vertices[4] =
+                       {
+                               video::S3DVertex(-BS/2,-BS/2,0, 0,0,0, c,
+                                               ap.x0(), ap.y1()),
+                               video::S3DVertex(BS/2,-BS/2,0, 0,0,0, c,
+                                               ap.x1(), ap.y1()),
+                               video::S3DVertex(BS/2,BS/2,0, 0,0,0, c,
+                                               ap.x1(), ap.y0()),
+                               video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c,
+                                               ap.x0(), ap.y0()),
+                       };
 
-                       // Now a section of fence, +Z, if there's a post there
-                       p2 = p;
-                       p2.Z++;
-                       n2 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p2);
-                       if(n2.getContent() == CONTENT_FENCE)
+                       for(s32 i=0; i<4; i++)
                        {
-                               pos = intToFloat(p+blockpos_nodes, BS);
-                               pos.Z += BS/2;
-                               pos.Y += BS/4;
-                               f32 zrailuv[24]={
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6,
-                                       0,0.4,1,0.6};
-                               makeCuboid(material_wood, &collector,
-                                       &pa_wood, c, pos,
-                                       bar_rad,bar_rad,bar_len, zrailuv);
-                               pos.Y -= BS/2;
-                               makeCuboid(material_wood, &collector,
-                                       &pa_wood, c, pos,
-                                       bar_rad,bar_rad,bar_len, zrailuv);
+                               if(dir == v3s16(1,0,0))
+                                       vertices[i].Pos.rotateXZBy(0);
+                               if(dir == v3s16(-1,0,0))
+                                       vertices[i].Pos.rotateXZBy(180);
+                               if(dir == v3s16(0,0,1))
+                                       vertices[i].Pos.rotateXZBy(90);
+                               if(dir == v3s16(0,0,-1))
+                                       vertices[i].Pos.rotateXZBy(-90);
+                               if(dir == v3s16(0,-1,0))
+                                       vertices[i].Pos.rotateXZBy(45);
+                               if(dir == v3s16(0,1,0))
+                                       vertices[i].Pos.rotateXZBy(-45);
 
+                               vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
                        }
 
-               }
-#if 1
-               /*
-                       Add stones with minerals if stone is invisible
-               */
-               else if(n.getContent() == CONTENT_STONE && invisible_stone && n.getMineral() != MINERAL_NONE)
+                       u16 indices[] = {0,1,2,2,3,0};
+                       // Add to mesh collector
+                       collector.append(material, vertices, 4, indices, 6);
+               break;}
+               case NDT_SIGNLIKE:
                {
-                       for(u32 j=0; j<6; j++)
-                       {
-                               // NOTE: Hopefully g_6dirs[j] is the right direction...
-                               v3s16 dir = g_6dirs[j];
-                               /*u8 l = 0;
-                               MapNode n2 = data->m_vmanip.getNodeNoEx(blockpos_nodes + dir);
-                               if(content_features(n2).param_type == CPT_LIGHT)
-                                       l = decode_light(n2.getLightBlend(data->m_daynight_ratio));
-                               else
-                                       l = 255;*/
-                               u8 l = 255;
-                               video::SColor c = MapBlock_LightColor(255, l);
-                               
-                               // Get the right texture
-                               TileSpec ts = n.getTile(dir);
-                               AtlasPointer ap = ts.texture;
-                               material_general.setTexture(0, ap.atlas);
+                       // Set material
+                       video::SMaterial material;
+                       material.setFlag(video::EMF_LIGHTING, false);
+                       material.setFlag(video::EMF_BACK_FACE_CULLING, false);
+                       material.setFlag(video::EMF_BILINEAR_FILTER, false);
+                       material.setFlag(video::EMF_FOG_ENABLE, true);
+                       material.MaterialType
+                                       = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       AtlasPointer ap = f.tiles[0].texture;
+                       material.setTexture(0, ap.atlas);
 
-                               video::S3DVertex vertices[4] =
-                               {
-                                       /*video::S3DVertex(-BS/2,-BS/2,BS/2, 0,0,0, c, 0,1),
-                                       video::S3DVertex(BS/2,-BS/2,BS/2, 0,0,0, c, 1,1),
-                                       video::S3DVertex(BS/2,BS/2,BS/2, 0,0,0, c, 1,0),
-                                       video::S3DVertex(-BS/2,BS/2,BS/2, 0,0,0, c, 0,0),*/
-                                       video::S3DVertex(-BS/2,-BS/2,BS/2, 0,0,0, c,
+                       u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio, nodedef));
+                       video::SColor c = MapBlock_LightColor(255, l);
+                               
+                       float d = (float)BS/16;
+                       // Wall at X+ of node
+                       video::S3DVertex vertices[4] =
+                       {
+                               video::S3DVertex(BS/2-d,-BS/2,-BS/2, 0,0,0, c,
                                                ap.x0(), ap.y1()),
-                                       video::S3DVertex(BS/2,-BS/2,BS/2, 0,0,0, c,
+                               video::S3DVertex(BS/2-d,-BS/2,BS/2, 0,0,0, c,
                                                ap.x1(), ap.y1()),
-                                       video::S3DVertex(BS/2,BS/2,BS/2, 0,0,0, c,
+                               video::S3DVertex(BS/2-d,BS/2,BS/2, 0,0,0, c,
                                                ap.x1(), ap.y0()),
-                                       video::S3DVertex(-BS/2,BS/2,BS/2, 0,0,0, c,
+                               video::S3DVertex(BS/2-d,BS/2,-BS/2, 0,0,0, c,
                                                ap.x0(), ap.y0()),
-                               };
+                       };
 
-                               if(j == 0)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(0);
-                               }
-                               else if(j == 1)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(180);
-                               }
-                               else if(j == 2)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(-90);
-                               }
-                               else if(j == 3)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(90);
-                               }
-                               else if(j == 4)
+                       v3s16 dir = unpackDir(n.param2);
 
-                               for(u16 i=0; i<4; i++)
-                               {
-                                       vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
-                               }
+                       for(s32 i=0; i<4; i++)
+                       {
+                               if(dir == v3s16(1,0,0))
+                                       vertices[i].Pos.rotateXZBy(0);
+                               if(dir == v3s16(-1,0,0))
+                                       vertices[i].Pos.rotateXZBy(180);
+                               if(dir == v3s16(0,0,1))
+                                       vertices[i].Pos.rotateXZBy(90);
+                               if(dir == v3s16(0,0,-1))
+                                       vertices[i].Pos.rotateXZBy(-90);
+                               if(dir == v3s16(0,-1,0))
+                                       vertices[i].Pos.rotateXYBy(-90);
+                               if(dir == v3s16(0,1,0))
+                                       vertices[i].Pos.rotateXYBy(90);
 
-                               u16 indices[] = {0,1,2,2,3,0};
-                               // Add to mesh collector
-                               collector.append(material_general, vertices, 4, indices, 6);
+                               vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
                        }
-               }
-#endif
-               else if(n.getContent() == CONTENT_PAPYRUS)
+
+                       u16 indices[] = {0,1,2,2,3,0};
+                       // Add to mesh collector
+                       collector.append(material, vertices, 4, indices, 6);
+               break;}
+               case NDT_PLANTLIKE:
                {
-                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio)));
+                       video::SMaterial material_papyrus;
+                       material_papyrus.setFlag(video::EMF_LIGHTING, false);
+                       material_papyrus.setFlag(video::EMF_BILINEAR_FILTER, false);
+                       material_papyrus.setFlag(video::EMF_FOG_ENABLE, true);
+                       material_papyrus.MaterialType=video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       AtlasPointer pa_papyrus = f.tiles[0].texture;
+                       material_papyrus.setTexture(0, pa_papyrus.atlas);
+                       
+                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio, nodedef)));
                        video::SColor c = MapBlock_LightColor(255, l);
 
                        for(u32 j=0; j<4; j++)
                        {
                                video::S3DVertex vertices[4] =
                                {
-                                       video::S3DVertex(-BS/2,-BS/2,0, 0,0,0, c,
+                                       video::S3DVertex(-BS/2*f.visual_scale,-BS/2,0, 0,0,0, c,
                                                pa_papyrus.x0(), pa_papyrus.y1()),
-                                       video::S3DVertex(BS/2,-BS/2,0, 0,0,0, c,
+                                       video::S3DVertex( BS/2*f.visual_scale,-BS/2,0, 0,0,0, c,
                                                pa_papyrus.x1(), pa_papyrus.y1()),
-                                       video::S3DVertex(BS/2,BS/2,0, 0,0,0, c,
+                                       video::S3DVertex( BS/2*f.visual_scale,
+                                               -BS/2 + f.visual_scale*BS,0, 0,0,0, c,
                                                pa_papyrus.x1(), pa_papyrus.y0()),
-                                       video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c,
+                                       video::S3DVertex(-BS/2*f.visual_scale,
+                                               -BS/2 + f.visual_scale*BS,0, 0,0,0, c,
                                                pa_papyrus.x0(), pa_papyrus.y0()),
                                };
 
@@ -1003,6 +808,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 
                                for(u16 i=0; i<4; i++)
                                {
+                                       vertices[i].Pos *= f.visual_scale;
                                        vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
                                }
 
@@ -1010,63 +816,93 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                                // Add to mesh collector
                                collector.append(material_papyrus, vertices, 4, indices, 6);
                        }
-               }
-               else if(n.getContent() == CONTENT_JUNGLEGRASS)
+               break;}
+               case NDT_FENCELIKE:
                {
-                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio)));
+                       video::SMaterial material_wood;
+                       material_wood.setFlag(video::EMF_LIGHTING, false);
+                       material_wood.setFlag(video::EMF_BILINEAR_FILTER, false);
+                       material_wood.setFlag(video::EMF_FOG_ENABLE, true);
+                       material_wood.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       AtlasPointer pa_wood = f.tiles[0].texture;
+                       material_wood.setTexture(0, pa_wood.atlas);
+
+                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio, nodedef)));
                        video::SColor c = MapBlock_LightColor(255, l);
 
-                       for(u32 j=0; j<4; j++)
+                       const f32 post_rad=(f32)BS/10;
+                       const f32 bar_rad=(f32)BS/20;
+                       const f32 bar_len=(f32)(BS/2)-post_rad;
+
+                       // The post - always present
+                       v3f pos = intToFloat(p+blockpos_nodes, BS);
+                       f32 postuv[24]={
+                                       0.4,0.4,0.6,0.6,
+                                       0.35,0,0.65,1,
+                                       0.35,0,0.65,1,
+                                       0.35,0,0.65,1,
+                                       0.35,0,0.65,1,
+                                       0.4,0.4,0.6,0.6};
+                       makeCuboid(material_wood, &collector,
+                               &pa_wood, c, pos,
+                               post_rad,BS/2,post_rad, postuv);
+
+                       // Now a section of fence, +X, if there's a post there
+                       v3s16 p2 = p;
+                       p2.X++;
+                       MapNode n2 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p2);
+                       const ContentFeatures *f2 = &nodedef->get(n2);
+                       if(f2->drawtype == NDT_FENCELIKE)
                        {
-                               video::S3DVertex vertices[4] =
-                               {
-                                       video::S3DVertex(-BS/2,-BS/2,0, 0,0,0, c,
-                                               pa_papyrus.x0(), pa_papyrus.y1()),
-                                       video::S3DVertex(BS/2,-BS/2,0, 0,0,0, c,
-                                               pa_papyrus.x1(), pa_papyrus.y1()),
-                                       video::S3DVertex(BS/2,BS/1,0, 0,0,0, c,
-                                               pa_papyrus.x1(), pa_papyrus.y0()),
-                                       video::S3DVertex(-BS/2,BS/1,0, 0,0,0, c,
-                                               pa_papyrus.x0(), pa_papyrus.y0()),
-                               };
+                               pos = intToFloat(p+blockpos_nodes, BS);
+                               pos.X += BS/2;
+                               pos.Y += BS/4;
+                               f32 xrailuv[24]={
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6};
+                               makeCuboid(material_wood, &collector,
+                                       &pa_wood, c, pos,
+                                       bar_len,bar_rad,bar_rad, xrailuv);
 
-                               if(j == 0)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(45);
-                               }
-                               else if(j == 1)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(-45);
-                               }
-                               else if(j == 2)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(135);
-                               }
-                               else if(j == 3)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(-135);
-                               }
+                               pos.Y -= BS/2;
+                               makeCuboid(material_wood, &collector,
+                                       &pa_wood, c, pos,
+                                       bar_len,bar_rad,bar_rad, xrailuv);
+                       }
 
-                               for(u16 i=0; i<4; i++)
-                               {
-                                       vertices[i].Pos *= 1.3;
-                                       vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
-                               }
+                       // Now a section of fence, +Z, if there's a post there
+                       p2 = p;
+                       p2.Z++;
+                       n2 = data->m_vmanip.getNodeNoEx(blockpos_nodes + p2);
+                       f2 = &nodedef->get(n2);
+                       if(f2->drawtype == NDT_FENCELIKE)
+                       {
+                               pos = intToFloat(p+blockpos_nodes, BS);
+                               pos.Z += BS/2;
+                               pos.Y += BS/4;
+                               f32 zrailuv[24]={
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6,
+                                       0,0.4,1,0.6};
+                               makeCuboid(material_wood, &collector,
+                                       &pa_wood, c, pos,
+                                       bar_rad,bar_rad,bar_len, zrailuv);
+                               pos.Y -= BS/2;
+                               makeCuboid(material_wood, &collector,
+                                       &pa_wood, c, pos,
+                                       bar_rad,bar_rad,bar_len, zrailuv);
 
-                               u16 indices[] = {0,1,2,2,3,0};
-                               // Add to mesh collector
-                               collector.append(material_junglegrass, vertices, 4, indices, 6);
                        }
-               }
-               else if(n.getContent() == CONTENT_RAIL)
+               break;}
+               case NDT_RAILLIKE:
                {
-                       u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio));
-                       video::SColor c = MapBlock_LightColor(255, l);
-
                        bool is_rail_x [] = { false, false };  /* x-1, x+1 */
                        bool is_rail_z [] = { false, false };  /* z-1, z+1 */
 
@@ -1074,53 +910,59 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
                        MapNode n_plus_x = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x+1,y,z));
                        MapNode n_minus_z = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x,y,z-1));
                        MapNode n_plus_z = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x,y,z+1));
-
-                       if(n_minus_x.getContent() == CONTENT_RAIL)
+                       
+                       content_t thiscontent = n.getContent();
+                       if(n_minus_x.getContent() == thiscontent)
                                is_rail_x[0] = true;
-                       if(n_plus_x.getContent() == CONTENT_RAIL)
+                       if(n_plus_x.getContent() == thiscontent)
                                is_rail_x[1] = true;
-                       if(n_minus_z.getContent() == CONTENT_RAIL)
+                       if(n_minus_z.getContent() == thiscontent)
                                is_rail_z[0] = true;
-                       if(n_plus_z.getContent() == CONTENT_RAIL)
+                       if(n_plus_z.getContent() == thiscontent)
                                is_rail_z[1] = true;
 
-                       float d = (float)BS/16;
-                       video::S3DVertex vertices[4] =
-                       {
-                               video::S3DVertex(-BS/2,-BS/2+d,-BS/2, 0,0,0, c,
-                                       0, 1),
-                               video::S3DVertex(BS/2,-BS/2+d,-BS/2, 0,0,0, c,
-                                       1, 1),
-                               video::S3DVertex(BS/2,-BS/2+d,BS/2, 0,0,0, c,
-                                       1, 0),
-                               video::S3DVertex(-BS/2,-BS/2+d,BS/2, 0,0,0, c,
-                                       0, 0),
-                       };
-
-                       video::SMaterial material_rail;
-                       material_rail.setFlag(video::EMF_LIGHTING, false);
-                       material_rail.setFlag(video::EMF_BACK_FACE_CULLING, false);
-                       material_rail.setFlag(video::EMF_BILINEAR_FILTER, false);
-                       material_rail.setFlag(video::EMF_FOG_ENABLE, true);
-                       material_rail.MaterialType
-                                       = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-
                        int adjacencies = is_rail_x[0] + is_rail_x[1] + is_rail_z[0] + is_rail_z[1];
 
                        // Assign textures
+                       AtlasPointer ap = f.tiles[0].texture; // straight
                        if(adjacencies < 2)
-                               material_rail.setTexture(0, g_texturesource->getTextureRaw("rail.png"));
+                               ap = f.tiles[0].texture; // straight
                        else if(adjacencies == 2)
                        {
                                if((is_rail_x[0] && is_rail_x[1]) || (is_rail_z[0] && is_rail_z[1]))
-                                       material_rail.setTexture(0, g_texturesource->getTextureRaw("rail.png"));
+                                       ap = f.tiles[0].texture; // straight
                                else
-                                       material_rail.setTexture(0, g_texturesource->getTextureRaw("rail_curved.png"));
+                                       ap = f.tiles[1].texture; // curved
                        }
                        else if(adjacencies == 3)
-                               material_rail.setTexture(0, g_texturesource->getTextureRaw("rail_t_junction.png"));
+                               ap = f.tiles[2].texture; // t-junction
                        else if(adjacencies == 4)
-                               material_rail.setTexture(0, g_texturesource->getTextureRaw("rail_crossing.png"));
+                               ap = f.tiles[3].texture; // crossing
+                       
+                       video::SMaterial material_rail;
+                       material_rail.setFlag(video::EMF_LIGHTING, false);
+                       material_rail.setFlag(video::EMF_BACK_FACE_CULLING, false);
+                       material_rail.setFlag(video::EMF_BILINEAR_FILTER, false);
+                       material_rail.setFlag(video::EMF_FOG_ENABLE, true);
+                       material_rail.MaterialType
+                                       = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+                       material_rail.setTexture(0, ap.atlas);
+
+                       u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio, nodedef));
+                       video::SColor c = MapBlock_LightColor(255, l);
+
+                       float d = (float)BS/16;
+                       video::S3DVertex vertices[4] =
+                       {
+                               video::S3DVertex(-BS/2,-BS/2+d,-BS/2, 0,0,0, c,
+                                               ap.x0(), ap.y1()),
+                               video::S3DVertex(BS/2,-BS/2+d,-BS/2, 0,0,0, c,
+                                               ap.x1(), ap.y1()),
+                               video::S3DVertex(BS/2,-BS/2+d,BS/2, 0,0,0, c,
+                                               ap.x1(), ap.y0()),
+                               video::S3DVertex(-BS/2,-BS/2+d,BS/2, 0,0,0, c,
+                                               ap.x0(), ap.y0()),
+                       };
 
                        // Rotate textures
                        int angle = 0;
@@ -1165,103 +1007,7 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 
                        u16 indices[] = {0,1,2,2,3,0};
                        collector.append(material_rail, vertices, 4, indices, 6);
-               }
-               else if (n.getContent() == CONTENT_LADDER) {
-                       u8 l = decode_light(n.getLightBlend(data->m_daynight_ratio));
-                       video::SColor c(255,l,l,l);
-
-                       float d = (float)BS/16;
-
-                       // Assume wall is at X+
-                       video::S3DVertex vertices[4] =
-                       {
-                               video::S3DVertex(BS/2-d,-BS/2,-BS/2, 0,0,0, c, 0,1),
-                               video::S3DVertex(BS/2-d,-BS/2,BS/2, 0,0,0, c, 1,1),
-                               video::S3DVertex(BS/2-d,BS/2,BS/2, 0,0,0, c, 1,0),
-                               video::S3DVertex(BS/2-d,BS/2,-BS/2, 0,0,0, c, 0,0),
-                       };
-
-                       v3s16 dir = unpackDir(n.param2);
-
-                       for(s32 i=0; i<4; i++)
-                       {
-                               if(dir == v3s16(1,0,0))
-                                       vertices[i].Pos.rotateXZBy(0);
-                               if(dir == v3s16(-1,0,0))
-                                       vertices[i].Pos.rotateXZBy(180);
-                               if(dir == v3s16(0,0,1))
-                                       vertices[i].Pos.rotateXZBy(90);
-                               if(dir == v3s16(0,0,-1))
-                                       vertices[i].Pos.rotateXZBy(-90);
-                               if(dir == v3s16(0,-1,0))
-                                       vertices[i].Pos.rotateXYBy(-90);
-                               if(dir == v3s16(0,1,0))
-                                       vertices[i].Pos.rotateXYBy(90);
-
-                               vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
-                       }
-
-                       video::SMaterial material_ladder;
-                       material_ladder.setFlag(video::EMF_LIGHTING, false);
-                       material_ladder.setFlag(video::EMF_BACK_FACE_CULLING, false);
-                       material_ladder.setFlag(video::EMF_BILINEAR_FILTER, false);
-                       material_ladder.setFlag(video::EMF_FOG_ENABLE, true);
-                       material_ladder.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
-                       material_ladder.setTexture(0, g_texturesource->getTextureRaw("ladder.png"));
-
-                       u16 indices[] = {0,1,2,2,3,0};
-                       // Add to mesh collector
-                       collector.append(material_ladder, vertices, 4, indices, 6);
-               }
-               else if(n.getContent() == CONTENT_APPLE)
-               {
-                       u8 l = decode_light(undiminish_light(n.getLightBlend(data->m_daynight_ratio)));
-                       video::SColor c = MapBlock_LightColor(255, l);
-
-                       for(u32 j=0; j<4; j++)
-                       {
-                               video::S3DVertex vertices[4] =
-                               {
-                                       video::S3DVertex(-BS/2,-BS/2,0, 0,0,0, c,
-                                               pa_apple.x0(), pa_apple.y1()),
-                                       video::S3DVertex(BS/2,-BS/2,0, 0,0,0, c,
-                                               pa_apple.x1(), pa_apple.y1()),
-                                       video::S3DVertex(BS/2,BS/2,0, 0,0,0, c,
-                                               pa_apple.x1(), pa_apple.y0()),
-                                       video::S3DVertex(-BS/2,BS/2,0, 0,0,0, c,
-                                               pa_apple.x0(), pa_apple.y0()),
-                               };
-
-                               if(j == 0)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(45);
-                               }
-                               else if(j == 1)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(-45);
-                               }
-                               else if(j == 2)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(135);
-                               }
-                               else if(j == 3)
-                               {
-                                       for(u16 i=0; i<4; i++)
-                                               vertices[i].Pos.rotateXZBy(-135);
-                               }
-
-                               for(u16 i=0; i<4; i++)
-                               {
-                                       vertices[i].Pos += intToFloat(p + blockpos_nodes, BS);
-                               }
-
-                               u16 indices[] = {0,1,2,2,3,0};
-                               // Add to mesh collector
-                               collector.append(material_apple, vertices, 4, indices, 6);
-                       }
+               break;}
                }
        }
 }