Add backwards-compatible behaviour if too few CAO textures specified

[dragonfireclient.git] / src / client / content_cao.cpp

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 2e58e19cfb83e0c5bd646f8a805a7fb979ec1d62..24a9e7921683bbcc955d4b7b5ca56b2e825389b1 100644 (file)
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -20,14 +20,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_cao.h"
 #include <IBillboardSceneNode.h>
 #include <ICameraSceneNode.h>
-#include <ITextSceneNode.h>
 #include <IMeshManipulator.h>
 #include <IAnimatedMeshSceneNode.h>
 #include "client/client.h"
+#include "client/renderingengine.h"
 #include "client/sound.h"
 #include "client/tile.h"
 #include "util/basic_macros.h"
-#include "util/numeric.h" // For IntervalLimiter & setPitchYawRoll
+#include "util/numeric.h"
 #include "util/serialize.h"
 #include "camera.h" // CameraModes
 #include "collision.h"
@@ -171,6 +171,20 @@ static void updatePositionRecursive(scene::ISceneNode *node)
        node->updateAbsolutePosition();
 }
 
+static bool logOnce(const std::ostringstream &from, std::ostream &log_to)
+{
+       thread_local std::vector<u64> logged;
+
+       std::string message = from.str();
+       u64 hash = murmur_hash_64_ua(message.data(), message.length(), 0xBADBABE);
+
+       if (std::find(logged.begin(), logged.end(), hash) != logged.end())
+               return false;
+       logged.push_back(hash);
+       log_to << message << std::endl;
+       return true;
+}
+
 /*
        TestCAO
 */
@@ -555,6 +569,9 @@ void GenericCAO::removeFromScene(bool permanent)
                clearParentAttachment();
        }
 
+       if (auto shadow = RenderingEngine::get_shadow_renderer())
+               shadow->removeNodeFromShadowList(getSceneNode());
+
        if (m_meshnode) {
                m_meshnode->remove();
                m_meshnode->drop();
@@ -644,7 +661,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
                                m_matrixnode, v2f(1, 1), v3f(0,0,0), -1);
                m_spritenode->grab();
                m_spritenode->setMaterialTexture(0,
-                               tsrc->getTextureForMesh("unknown_node.png"));
+                               tsrc->getTextureForMesh("no_texture.png"));
 
                setSceneNodeMaterial(m_spritenode);
 
@@ -803,10 +820,13 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
        if (m_reset_textures_timer < 0)
                updateTextures(m_current_texture_modifier);
 
-       scene::ISceneNode *node = getSceneNode();
+       if (scene::ISceneNode *node = getSceneNode()) {
+               if (m_matrixnode)
+                       node->setParent(m_matrixnode);
 
-       if (node && m_matrixnode)
-               node->setParent(m_matrixnode);
+               if (auto shadow = RenderingEngine::get_shadow_renderer())
+                       shadow->addNodeToShadowList(node);
+       }
 
        updateNametag();
        updateMarker();
@@ -816,6 +836,28 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
        updateAttachments();
        setNodeLight(m_last_light);
        updateMeshCulling();
+
+       if (m_animated_meshnode) {
+               u32 mat_count = m_animated_meshnode->getMaterialCount();
+               if (mat_count == 0 || m_prop.textures.empty()) {
+                       // nothing
+               } else if (mat_count > m_prop.textures.size()) {
+                       std::ostringstream oss;
+                       oss << "GenericCAO::addToScene(): Model "
+                               << m_prop.mesh << " loaded with " << mat_count
+                               << " mesh buffers but only " << m_prop.textures.size()
+                               << " texture(s) specifed, this is deprecated.";
+                       logOnce(oss, warningstream);
+
+                       video::ITexture *last = m_animated_meshnode->getMaterial(0).TextureLayer[0].Texture;
+                       for (s32 i = 1; i < mat_count; i++) {
+                               auto &layer = m_animated_meshnode->getMaterial(i).TextureLayer[0];
+                               if (!layer.Texture)
+                                       layer.Texture = last;
+                               last = layer.Texture;
+                       }
+               }
+       }
 }
 
 void GenericCAO::updateLight(u32 day_night_ratio)
@@ -990,14 +1032,14 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
                        m_velocity = v3f(0,0,0);
                        m_acceleration = v3f(0,0,0);
                        const PlayerControl &controls = player->getPlayerControl();
+                       f32 new_speed = player->local_animation_speed;
 
                        bool walking = false;
-                       if (controls.up || controls.down || controls.left || controls.right ||
-                                       controls.forw_move_joystick_axis != 0.f ||
-                                       controls.sidew_move_joystick_axis != 0.f)
+                       if (controls.movement_speed > 0.001f) {
+                               new_speed *= controls.movement_speed;
                                walking = true;
+                       }
 
-                       f32 new_speed = player->local_animation_speed;
                        v2s32 new_anim = v2s32(0,0);
                        bool allow_update = false;
 
@@ -1009,7 +1051,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
                                        g_settings->getBool("free_move") &&
                                        m_client->checkLocalPrivilege("fly"))))
                                        new_speed *= 1.5;
-                       // slowdown speed if sneeking
+                       // slowdown speed if sneaking
                        if (controls.sneak && walking)
                                new_speed /= 2;
 
@@ -1283,7 +1325,7 @@ void GenericCAO::updateTextures(std::string mod)
 
        if (m_spritenode) {
                if (m_prop.visual == "sprite") {
-                       std::string texturestring = "unknown_node.png";
+                       std::string texturestring = "no_texture.png";
                        if (!m_prop.textures.empty())
                                texturestring = m_prop.textures[0];
                        texturestring += mod;
@@ -1362,7 +1404,7 @@ void GenericCAO::updateTextures(std::string mod)
                {
                        for (u32 i = 0; i < 6; ++i)
                        {
-                               std::string texturestring = "unknown_node.png";
+                               std::string texturestring = "no_texture.png";
                                if(m_prop.textures.size() > i)
                                        texturestring = m_prop.textures[i];
                                texturestring += mod;
@@ -1395,7 +1437,7 @@ void GenericCAO::updateTextures(std::string mod)
                } else if (m_prop.visual == "upright_sprite") {
                        scene::IMesh *mesh = m_meshnode->getMesh();
                        {
-                               std::string tname = "unknown_object.png";
+                               std::string tname = "no_texture.png";
                                if (!m_prop.textures.empty())
                                        tname = m_prop.textures[0];
                                tname += mod;
@@ -1417,7 +1459,7 @@ void GenericCAO::updateTextures(std::string mod)
                                buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
                        }
                        {
-                               std::string tname = "unknown_object.png";
+                               std::string tname = "no_texture.png";
                                if (m_prop.textures.size() >= 2)
                                        tname = m_prop.textures[1];
                                else if (!m_prop.textures.empty())
@@ -1716,6 +1758,7 @@ void GenericCAO::processMessage(const std::string &data)
 
                m_tx_basepos = p;
                m_anim_num_frames = num_frames;
+               m_anim_frame = 0;
                m_anim_framelength = framelength;
                m_tx_select_horiz_by_yawpitch = select_horiz_by_yawpitch;
 
@@ -1864,7 +1907,8 @@ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem,
                        m_armor_groups,
                        toolcap,
                        punchitem,
-                       time_from_last_punch);
+                       time_from_last_punch,
+                       punchitem->wear);
 
        if(result.did_punch && result.damage != 0)
        {