Make shift the default descent control on ladders and when flying

[dragonfireclient.git] / src / mapblock_mesh.cpp

diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index 5584216ba18afe9364113de7c192b0293bcd698c..9ae9b21c07058d7be6cce5ba33cc27edeeab807e 100644 (file)
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -27,6 +27,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "mesh.h"
 #include "content_mapblock.h"
+#include "noise.h"
+#include "settings.h"
+#include "util/directiontables.h"
 
 /*
        MeshMakeData
@@ -559,6 +562,11 @@ TileSpec getNodeTileN(MapNode mn, v3s16 p, u8 tileindex, MeshMakeData *data)
                spec.material_flags |= MATERIAL_FLAG_CRACK;
                spec.texture = data->m_gamedef->tsrc()->getTextureRawAP(spec.texture);
        }
+       // If animated, replace tile texture with one without texture atlas
+       if(spec.material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES)
+       {
+               spec.texture = data->m_gamedef->tsrc()->getTextureRawAP(spec.texture);
+       }
        return spec;
 }
 
@@ -597,7 +605,46 @@ TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 dir, MeshMakeData *data)
                   0,  5,  0,  2,  0,  3,  1,  4,  // facedir = 3
        };
        u8 tileindex = dir_to_tile[facedir*8 + dir_i];
-       return getNodeTileN(mn, p, tileindex, data);
+
+       // If not rotated or is side tile, we're done
+       if(facedir == 0 || (tileindex != 0 && tileindex != 1))
+               return getNodeTileN(mn, p, tileindex, data);
+
+       // This is the top or bottom tile, and it shall be rotated; thus rotate it
+       TileSpec spec = getNodeTileN(mn, p, tileindex, data);
+       if(tileindex == 0){
+               if(facedir == 1){ // -90
+                       std::string name = data->m_gamedef->tsrc()->getTextureName(spec.texture.id);
+                       name += "^[transformR270";
+                       spec.texture = data->m_gamedef->tsrc()->getTexture(name);
+               }
+               else if(facedir == 2){ // 180
+                       spec.texture.pos += spec.texture.size;
+                       spec.texture.size *= -1;
+               }
+               else if(facedir == 3){ // 90
+                       std::string name = data->m_gamedef->tsrc()->getTextureName(spec.texture.id);
+                       name += "^[transformR90";
+                       spec.texture = data->m_gamedef->tsrc()->getTexture(name);
+               }
+       }
+       else if(tileindex == 1){
+               if(facedir == 1){ // -90
+                       std::string name = data->m_gamedef->tsrc()->getTextureName(spec.texture.id);
+                       name += "^[transformR90";
+                       spec.texture = data->m_gamedef->tsrc()->getTexture(name);
+               }
+               else if(facedir == 2){ // 180
+                       spec.texture.pos += spec.texture.size;
+                       spec.texture.size *= -1;
+               }
+               else if(facedir == 3){ // 90
+                       std::string name = data->m_gamedef->tsrc()->getTextureName(spec.texture.id);
+                       name += "^[transformR270";
+                       spec.texture = data->m_gamedef->tsrc()->getTexture(name);
+               }
+       }
+       return spec;
 }
 
 static void getTileInfo(
@@ -983,6 +1030,28 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
                                crack_basename += "^[crack";
                        m_crack_materials.insert(std::make_pair(i, crack_basename));
                }
+               // - Texture animation
+               if(p.tile.material_flags & MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES)
+               {
+                       ITextureSource *tsrc = data->m_gamedef->tsrc();
+                       // Add to MapBlockMesh in order to animate these tiles
+                       m_animation_tiles[i] = p.tile;
+                       m_animation_frames[i] = 0;
+                       if(g_settings->getBool("desynchronize_mapblock_texture_animation")){
+                               // Get starting position from noise
+                               m_animation_frame_offsets[i] = 100000 * (2.0 + noise3d(
+                                               data->m_blockpos.X, data->m_blockpos.Y,
+                                               data->m_blockpos.Z, 0));
+                       } else {
+                               // Play all synchronized
+                               m_animation_frame_offsets[i] = 0;
+                       }
+                       // Replace tile texture with the first animation frame
+                       std::ostringstream os(std::ios::binary);
+                       os<<tsrc->getTextureName(p.tile.texture.id);
+                       os<<"^[verticalframe:"<<(int)p.tile.animation_frame_count<<":0";
+                       p.tile.texture = tsrc->getTexture(os.str());
+               }
                // - Lighting
                for(u32 j = 0; j < p.vertices.size(); j++)
                {
@@ -1055,7 +1124,8 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
        // Check if animation is required for this mesh
        m_has_animation =
                !m_crack_materials.empty() ||
-               !m_daynight_diffs.empty();
+               !m_daynight_diffs.empty() ||
+               !m_animation_tiles.empty();
 }
 
 MapBlockMesh::~MapBlockMesh()
@@ -1094,6 +1164,34 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
 
                m_last_crack = crack;
        }
+       
+       // Texture animation
+       for(std::map<u32, TileSpec>::iterator
+                       i = m_animation_tiles.begin();
+                       i != m_animation_tiles.end(); i++)
+       {
+               const TileSpec &tile = i->second;
+               // Figure out current frame
+               int frameoffset = m_animation_frame_offsets[i->first];
+               int frame = (int)(time * 1000 / tile.animation_frame_length_ms
+                               + frameoffset) % tile.animation_frame_count;
+               // If frame doesn't change, skip
+               if(frame == m_animation_frames[i->first])
+                       continue;
+
+               m_animation_frames[i->first] = frame;
+
+               scene::IMeshBuffer *buf = m_mesh->getMeshBuffer(i->first);
+               ITextureSource *tsrc = m_gamedef->getTextureSource();
+
+               // Create new texture name from original
+               std::ostringstream os(std::ios::binary);
+               os<<tsrc->getTextureName(tile.texture.id);
+               os<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<<frame;
+               // Set the texture
+               AtlasPointer ap = tsrc->getTexture(os.str());
+               buf->getMaterial().setTexture(0, ap.atlas);
+       }
 
        // Day-night transition
        if(daynight_ratio != m_last_daynight_ratio)