]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/mapblock_mesh.cpp
projects / dragonfireclient.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix player:set_animation() in third person view
[dragonfireclient.git] / src / mapblock_mesh.cpp
diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index 81aac72d7c4cfe81eb8730444688a8fa9228d1db..73f69c24739e825f631880fa3114df76c011fa68 100644 (file)
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -150,9 +150,8 @@ void MeshMakeData::setSmoothLighting(bool smooth_lighting)
        Single light bank.
 */
 static u8 getInteriorLight(enum LightBank bank, MapNode n, s32 increment,
-               MeshMakeData *data)
+               INodeDefManager *ndef)
 {
-       INodeDefManager *ndef = data->m_gamedef->ndef();
        u8 light = n.getLight(bank, ndef);
 
        while(increment > 0)
@@ -173,10 +172,10 @@ static u8 getInteriorLight(enum LightBank bank, MapNode n, s32 increment,
        Calculate non-smooth lighting at interior of node.
        Both light banks.
 */
-u16 getInteriorLight(MapNode n, s32 increment, MeshMakeData *data)
+u16 getInteriorLight(MapNode n, s32 increment, INodeDefManager *ndef)
 {
-       u16 day = getInteriorLight(LIGHTBANK_DAY, n, increment, data);
-       u16 night = getInteriorLight(LIGHTBANK_NIGHT, n, increment, data);
+       u16 day = getInteriorLight(LIGHTBANK_DAY, n, increment, ndef);
+       u16 night = getInteriorLight(LIGHTBANK_NIGHT, n, increment, ndef);
        return day | (night << 8);
 }
 
@@ -185,10 +184,8 @@ u16 getInteriorLight(MapNode n, s32 increment, MeshMakeData *data)
        Single light bank.
 */
 static u8 getFaceLight(enum LightBank bank, MapNode n, MapNode n2,
-               v3s16 face_dir, MeshMakeData *data)
+               v3s16 face_dir, INodeDefManager *ndef)
 {
-       INodeDefManager *ndef = data->m_gamedef->ndef();
-
        u8 light;
        u8 l1 = n.getLight(bank, ndef);
        u8 l2 = n2.getLight(bank, ndef);
@@ -227,10 +224,10 @@ static u8 getFaceLight(enum LightBank bank, MapNode n, MapNode n2,
        Calculate non-smooth lighting at face of node.
        Both light banks.
 */
-u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, MeshMakeData *data)
+u16 getFaceLight(MapNode n, MapNode n2, v3s16 face_dir, INodeDefManager *ndef)
 {
-       u16 day = getFaceLight(LIGHTBANK_DAY, n, n2, face_dir, data);
-       u16 night = getFaceLight(LIGHTBANK_NIGHT, n, n2, face_dir, data);
+       u16 day = getFaceLight(LIGHTBANK_DAY, n, n2, face_dir, ndef);
+       u16 night = getFaceLight(LIGHTBANK_NIGHT, n, n2, face_dir, ndef);
        return day | (night << 8);
 }
 
@@ -722,9 +719,9 @@ TileSpec getNodeTile(MapNode mn, v3s16 p, v3s16 dir, MeshMakeData *data)
                   0,0,  5,0 , 0,1 , 2,0 ,  0,0,  3,0 , 1,3 , 4,0 ,
 
                   0,0,  2,3 , 5,0 , 0,2 ,  0,0,  1,0 , 4,2 , 3,1 ,  // rotate around z+ 4 - 7
-                  0,0,  4,3 , 2,0 , 0,3 ,  0,0,  1,1 , 3,2 , 5,1 ,
+                  0,0,  4,3 , 2,0 , 0,1 ,  0,0,  1,1 , 3,2 , 5,1 ,
                   0,0,  3,3 , 4,0 , 0,0 ,  0,0,  1,2 , 5,2 , 2,1 ,
-                  0,0,  5,3 , 3,0 , 0,1 ,  0,0,  1,3 , 2,2 , 4,1 ,
+                  0,0,  5,3 , 3,0 , 0,3 ,  0,0,  1,3 , 2,2 , 4,1 ,
 
                   0,0,  2,1 , 4,2 , 1,2 ,  0,0,  0,0 , 5,0 , 3,3 ,  // rotate around z- 8 - 11
                   0,0,  4,1 , 3,2 , 1,3 ,  0,0,  0,3 , 2,0 , 5,3 ,
@@ -812,7 +809,7 @@ static void getTileInfo(
        if(data->m_smooth_lighting == false)
        {
                lights[0] = lights[1] = lights[2] = lights[3] =
-                               getFaceLight(n0, n1, face_dir, data);
+                               getFaceLight(n0, n1, face_dir, ndef);
        }
        else
        {
@@ -1030,7 +1027,7 @@ static void updateAllFastFaceRows(MeshMakeData *data,
        MapBlockMesh
 */
 
-MapBlockMesh::MapBlockMesh(MeshMakeData *data):
+MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
        m_mesh(new scene::SMesh()),
        m_gamedef(data->m_gamedef),
        m_animation_force_timer(0), // force initial animation
@@ -1111,6 +1108,7 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
        */
        bool enable_shaders     = g_settings->getBool("enable_shaders");
        bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
+       bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
 
        video::E_MATERIAL_TYPE  shadermat1, shadermat2, shadermat3,
                                                        shadermat4, shadermat5;
@@ -1210,21 +1208,26 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
                if (enable_shaders) {
                        ITextureSource *tsrc = data->m_gamedef->tsrc();
                        material.setTexture(2, tsrc->getTexture("disable_img.png"));
-                       if (enable_bumpmapping) {
-                               std::string fname_base = tsrc->getTextureName(p.tile.texture_id);
-                               std::string normal_ext = "_normal.png";
-                               size_t pos = fname_base.find(".");
-                               std::string fname_normal = fname_base.substr(0, pos) + normal_ext;
-
-                               if (tsrc->isKnownSourceImage(fname_normal)) {
-                                       // look for image extension and replace it 
-                                       size_t i = 0;
-                                       while ((i = fname_base.find(".", i)) != std::string::npos) {
-                                               fname_base.replace(i, 4, normal_ext);
-                                               i += normal_ext.length();
-                                       }
-                                       material.setTexture(1, tsrc->getTexture(fname_base));
+                       if (enable_bumpmapping || enable_parallax_occlusion) {
+                               if (tsrc->isKnownSourceImage("override_normal.png")){
+                                       material.setTexture(1, tsrc->getTexture("override_normal.png"));
                                        material.setTexture(2, tsrc->getTexture("enable_img.png"));
+                               } else {
+                                       std::string fname_base = tsrc->getTextureName(p.tile.texture_id);
+                                       std::string normal_ext = "_normal.png";
+                                       size_t pos = fname_base.find(".");
+                                       std::string fname_normal = fname_base.substr(0, pos) + normal_ext;
+
+                                       if (tsrc->isKnownSourceImage(fname_normal)) {
+                                               // look for image extension and replace it 
+                                               size_t i = 0;
+                                               while ((i = fname_base.find(".", i)) != std::string::npos) {
+                                                       fname_base.replace(i, 4, normal_ext);
+                                                       i += normal_ext.length();
+                                               }
+                                               material.setTexture(1, tsrc->getTexture(fname_base));
+                                               material.setTexture(2, tsrc->getTexture("enable_img.png"));
+                                       }
                                }
                        }
                        p.tile.applyMaterialOptionsWithShaders(material,
@@ -1247,11 +1250,13 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data):
                                &p.indices[0], p.indices.size());
        }
 
+       m_camera_offset = camera_offset;
+       
        /*
                Do some stuff to the mesh
        */
 
-       translateMesh(m_mesh, intToFloat(data->m_blockpos * MAP_BLOCKSIZE, BS));
+       translateMesh(m_mesh, intToFloat(data->m_blockpos * MAP_BLOCKSIZE - camera_offset, BS));
 
        if(m_mesh)
        {
@@ -1292,7 +1297,8 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
 {
        bool enable_shaders = g_settings->getBool("enable_shaders");
        bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
-       
+       bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
+
        if(!m_has_animation)
        {
                m_animation_force_timer = 100000;
@@ -1362,19 +1368,24 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
                // Set the texture
                buf->getMaterial().setTexture(0, tsrc->getTexture(os.str()));
                buf->getMaterial().setTexture(2, tsrc->getTexture("disable_img.png"));
-               if (enable_shaders && enable_bumpmapping)
+               if (enable_shaders && (enable_bumpmapping || enable_parallax_occlusion))
                        {
-                               std::string fname_base,fname_normal;
-                               fname_base = tsrc->getTextureName(tile.texture_id);
-                               unsigned pos;
-                               pos = fname_base.find(".");
-                               fname_normal = fname_base.substr (0, pos);
-                               fname_normal += "_normal.png";
-                               if (tsrc->isKnownSourceImage(fname_normal)){
-                                       os.str("");
-                                       os<<fname_normal<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<<frame;
-                                       buf->getMaterial().setTexture(1, tsrc->getTexture(os.str()));
+                               if (tsrc->isKnownSourceImage("override_normal.png")){
+                                       buf->getMaterial().setTexture(1, tsrc->getTexture("override_normal.png"));
                                        buf->getMaterial().setTexture(2, tsrc->getTexture("enable_img.png"));
+                               } else {
+                                       std::string fname_base,fname_normal;
+                                       fname_base = tsrc->getTextureName(tile.texture_id);
+                                       unsigned pos;
+                                       pos = fname_base.find(".");
+                                       fname_normal = fname_base.substr (0, pos);
+                                       fname_normal += "_normal.png";
+                                       if (tsrc->isKnownSourceImage(fname_normal)){
+                                               os.str("");
+                                               os<<fname_normal<<"^[verticalframe:"<<(int)tile.animation_frame_count<<":"<<frame;
+                                               buf->getMaterial().setTexture(1, tsrc->getTexture(os.str()));
+                                               buf->getMaterial().setTexture(2, tsrc->getTexture("enable_img.png"));
+                                       }
                                }
                        }
        }
@@ -1413,6 +1424,14 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
        return true;
 }
 
+void MapBlockMesh::updateCameraOffset(v3s16 camera_offset)
+{
+       if (camera_offset != m_camera_offset) {
+               translateMesh(m_mesh, intToFloat(m_camera_offset-camera_offset, BS));
+               m_camera_offset = camera_offset;
+       }
+}
+
 /*
        MeshCollector
 */
Dragonfireclient is an utility client for the Voxelengine minetest (http://minetest.net/). The client was created by Elias Fleckenstein and is inspired by the Minecraft clients Liquid Bounce and Impact. Discord: https://discord.gg/kab99uu for more information.