X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_cao.cpp;h=72f6145b067c25b6179e63fb902e471b58bcd0f3;hb=8f49358153637bb87f492e558a13cf9f23046e64;hp=30384a3134855a79576b14c21ed162953a56c9c1;hpb=d9f6f9e7a8038071648eb53da0d5be8abdaa9e45;p=dragonfireclient.git diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 30384a313..72f6145b0 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -17,18 +17,23 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include +#include +#include +#include +#include +#include #include "content_cao.h" -#include "tile.h" +#include "util/numeric.h" // For IntervalLimiter +#include "util/serialize.h" +#include "util/mathconstants.h" +#include "client/tile.h" #include "environment.h" #include "collision.h" #include "settings.h" -#include -#include -#include #include "serialization.h" // For decompressZlib #include "gamedef.h" #include "clientobject.h" -#include "content_object.h" #include "mesh.h" #include "itemdef.h" #include "tool.h" @@ -36,15 +41,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "sound.h" #include "nodedef.h" #include "localplayer.h" -#include "util/numeric.h" // For IntervalLimiter -#include "util/serialize.h" -#include "util/mathconstants.h" #include "map.h" -#include "main.h" // g_settings #include "camera.h" // CameraModes -#include -#include -#include +#include "wieldmesh.h" +#include "log.h" class Settings; struct ToolCapabilities; @@ -84,7 +84,8 @@ void SmoothTranslator::update(v3f vect_new, bool is_end_position, float update_i aim_is_end = is_end_position; vect_old = vect_show; vect_aim = vect_new; - if(update_interval > 0){ + if(update_interval > 0) + { anim_time = update_interval; } else { if(anim_time < 0.001 || anim_time > 1.0) @@ -141,12 +142,12 @@ class TestCAO : public ClientActiveObject public: TestCAO(IGameDef *gamedef, ClientEnvironment *env); virtual ~TestCAO(); - - u8 getType() const + + ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_TEST; } - + static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, @@ -191,9 +192,9 @@ void TestCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, { if(m_node != NULL) return; - + //video::IVideoDriver* driver = smgr->getVideoDriver(); - + scene::SMesh *mesh = new scene::SMesh(); scene::IMeshBuffer *buf = new scene::SMeshBuffer(); video::SColor c(255,255,255,255); @@ -209,7 +210,7 @@ void TestCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, // Set material buf->getMaterial().setFlag(video::EMF_LIGHTING, false); buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false); - buf->getMaterial().setTexture(0, tsrc->getTexture("rat.png")); + buf->getMaterial().setTexture(0, tsrc->getTextureForMesh("rat.png")); buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false); buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true); buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL; @@ -285,12 +286,12 @@ class ItemCAO : public ClientActiveObject public: ItemCAO(IGameDef *gamedef, ClientEnvironment *env); virtual ~ItemCAO(); - - u8 getType() const + + ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_ITEM; } - + static ClientActiveObject* create(IGameDef *gamedef, ClientEnvironment *env); void addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, @@ -307,12 +308,12 @@ class ItemCAO : public ClientActiveObject void processMessage(const std::string &data); void initialize(const std::string &data); - + core::aabbox3d* getSelectionBox() {return &m_selection_box;} v3f getPosition() {return m_position;} - + std::string infoText() {return m_infotext;} @@ -356,9 +357,9 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, { if(m_node != NULL) return; - + //video::IVideoDriver* driver = smgr->getVideoDriver(); - + scene::SMesh *mesh = new scene::SMesh(); scene::IMeshBuffer *buf = new scene::SMeshBuffer(); video::SColor c(255,255,255,255); @@ -464,11 +465,11 @@ void ItemCAO::updateTexture() } catch(SerializationError &e) { - infostream<<"WARNING: "<<__FUNCTION_NAME + warningstream<getMaterial(0).setTexture(0, texture); } @@ -513,7 +514,7 @@ void ItemCAO::processMessage(const std::string &data) void ItemCAO::initialize(const std::string &data) { infostream<<"ItemCAO: Got init data"< >()), m_attachment_bone(""), m_attachment_position(v3f(0,0,0)), @@ -582,8 +585,10 @@ GenericCAO::GenericCAO(IGameDef *gamedef, ClientEnvironment *env): ClientActiveObject::registerType(getType(), create); } -bool GenericCAO::getCollisionBox(aabb3f *toset) { - if (m_prop.physical) { +bool GenericCAO::getCollisionBox(aabb3f *toset) +{ + if (m_prop.physical) + { //update collision box toset->MinEdge = m_prop.collisionbox.MinEdge * BS; toset->MaxEdge = m_prop.collisionbox.MaxEdge * BS; @@ -597,7 +602,8 @@ bool GenericCAO::getCollisionBox(aabb3f *toset) { return false; } -bool GenericCAO::collideWithObjects() { +bool GenericCAO::collideWithObjects() +{ return m_prop.collideWithObjects; } @@ -635,7 +641,8 @@ void GenericCAO::initialize(const std::string &data) return; } - for(int i=0; igetPlayer(m_name.c_str()); - if(player && player->isLocal()){ + if(player && player->isLocal()) + { m_is_local_player = true; + m_is_visible = false; + LocalPlayer* localplayer = dynamic_cast(player); + + assert( localplayer != NULL ); + localplayer->setCAO(this); } m_env->addPlayerName(m_name.c_str()); } @@ -654,9 +668,11 @@ void GenericCAO::initialize(const std::string &data) GenericCAO::~GenericCAO() { - if(m_is_player){ + if(m_is_player) + { m_env->removePlayerName(m_name.c_str()); } + removeFromScene(true); } core::aabbox3d* GenericCAO::getSelectionBox() @@ -668,37 +684,57 @@ core::aabbox3d* GenericCAO::getSelectionBox() v3f GenericCAO::getPosition() { - if(getParent() != NULL){ - if(m_meshnode) - return m_meshnode->getAbsolutePosition(); - if(m_animated_meshnode) - return m_animated_meshnode->getAbsolutePosition(); - if(m_spritenode) - return m_spritenode->getAbsolutePosition(); - return m_position; + if (getParent() != NULL) { + scene::ISceneNode *node = getSceneNode(); + if (node) + return node->getAbsolutePosition(); + else + return m_position; } return pos_translator.vect_show; } -scene::IMeshSceneNode* GenericCAO::getMeshSceneNode() +scene::ISceneNode* GenericCAO::getSceneNode() { - if(m_meshnode) + if (m_meshnode) return m_meshnode; + if (m_animated_meshnode) + return m_animated_meshnode; + if (m_wield_meshnode) + return m_wield_meshnode; + if (m_spritenode) + return m_spritenode; return NULL; } +scene::IMeshSceneNode* GenericCAO::getMeshSceneNode() +{ + return m_meshnode; +} + scene::IAnimatedMeshSceneNode* GenericCAO::getAnimatedMeshSceneNode() { - if(m_animated_meshnode) - return m_animated_meshnode; - return NULL; + return m_animated_meshnode; +} + +WieldMeshSceneNode* GenericCAO::getWieldMeshSceneNode() +{ + return m_wield_meshnode; } scene::IBillboardSceneNode* GenericCAO::getSpriteSceneNode() { - if(m_spritenode) - return m_spritenode; - return NULL; + return m_spritenode; +} + +void GenericCAO::setChildrenVisible(bool toset) +{ + for (std::vector::size_type i = 0; i < m_children.size(); i++) { + GenericCAO *obj = m_env->getGenericCAO(m_children[i]); + if (obj) { + obj->setVisible(toset); + } + } } void GenericCAO::setAttachments() @@ -709,60 +745,67 @@ void GenericCAO::setAttachments() ClientActiveObject* GenericCAO::getParent() { ClientActiveObject *obj = NULL; - for(std::vector >::const_iterator cii = m_env->attachment_list.begin(); cii != m_env->attachment_list.end(); cii++) - { - if(cii->X == getId()){ // This ID is our child - if(cii->Y > 0){ // A parent ID exists for our child - if(cii->X != cii->Y){ // The parent and child ID are not the same - obj = m_env->getActiveObject(cii->Y); - } - } - break; - } + + u16 attached_id = m_env->attachement_parent_ids[getId()]; + + if ((attached_id != 0) && + (attached_id != getId())) { + obj = m_env->getActiveObject(attached_id); } - if(obj) - return obj; - return NULL; + return obj; } void GenericCAO::removeFromScene(bool permanent) { - if(permanent) // Should be true when removing the object permanently and false when refreshing (eg: updating visuals) + // Should be true when removing the object permanently and false when refreshing (eg: updating visuals) + if((m_env != NULL) && (permanent)) { - // Detach this object's children - for(std::vector >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++) - { - if(ii->Y == getId()) // Is a child of our object - { - ii->Y = 0; - ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child - if(obj) - obj->setAttachments(); + for (std::vector::size_type i = 0; i < m_children.size(); i++) { + u16 ci = m_children[i]; + if (m_env->attachement_parent_ids[ci] == getId()) { + m_env->attachement_parent_ids[ci] = 0; } } - // Delete this object from the attachments list - for(std::vector >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++) - { - if(ii->X == getId()) // Is our object - { - m_env->attachment_list.erase(ii); - break; - } + + m_env->attachement_parent_ids[getId()] = 0; + + LocalPlayer* player = m_env->getLocalPlayer(); + if (this == player->parent) { + player->parent = NULL; + player->isAttached = false; } } - if(m_meshnode){ + if(m_meshnode) + { m_meshnode->remove(); + m_meshnode->drop(); m_meshnode = NULL; } - if(m_animated_meshnode){ + if(m_animated_meshnode) + { m_animated_meshnode->remove(); + m_animated_meshnode->drop(); m_animated_meshnode = NULL; } - if(m_spritenode){ + if(m_wield_meshnode) + { + m_wield_meshnode->remove(); + m_wield_meshnode->drop(); + m_wield_meshnode = NULL; + } + if(m_spritenode) + { m_spritenode->remove(); + m_spritenode->drop(); m_spritenode = NULL; } + if (m_textnode) + { + m_textnode->remove(); + m_textnode->drop(); + m_textnode = NULL; + } } void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, @@ -771,7 +814,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, m_smgr = smgr; m_irr = irr; - if(m_meshnode != NULL || m_animated_meshnode != NULL || m_spritenode != NULL) + if (getSceneNode() != NULL) return; m_visuals_expired = false; @@ -781,12 +824,14 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, //video::IVideoDriver* driver = smgr->getVideoDriver(); - if(m_prop.visual == "sprite"){ + if(m_prop.visual == "sprite") + { infostream<<"GenericCAO::addToScene(): single_sprite"<addBillboardSceneNode( NULL, v2f(1, 1), v3f(0,0,0), -1); + m_spritenode->grab(); m_spritenode->setMaterialTexture(0, - tsrc->getTexture("unknown_node.png")); + tsrc->getTextureForMesh("unknown_node.png")); m_spritenode->setMaterialFlag(video::EMF_LIGHTING, false); m_spritenode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false); m_spritenode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); @@ -801,8 +846,7 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, txs, tys, 0, 0); } } - else if(m_prop.visual == "upright_sprite") - { + else if(m_prop.visual == "upright_sprite") { scene::SMesh *mesh = new scene::SMesh(); double dx = BS*m_prop.visual_size.X/2; double dy = BS*m_prop.visual_size.Y/2; @@ -851,17 +895,19 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, buf->drop(); } m_meshnode = smgr->addMeshSceneNode(mesh, NULL); + m_meshnode->grab(); mesh->drop(); // Set it to use the materials of the meshbuffers directly. // This is needed for changing the texture in the future m_meshnode->setReadOnlyMaterials(true); } - else if(m_prop.visual == "cube"){ + else if(m_prop.visual == "cube") { infostream<<"GenericCAO::addToScene(): cube"<addMeshSceneNode(mesh, NULL); + m_meshnode->grab(); mesh->drop(); - + m_meshnode->setScale(v3f(m_prop.visual_size.X, m_prop.visual_size.Y, m_prop.visual_size.X)); @@ -873,12 +919,13 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, m_meshnode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); m_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true); } - else if(m_prop.visual == "mesh"){ + else if(m_prop.visual == "mesh") { infostream<<"GenericCAO::addToScene(): mesh"<getMesh(m_prop.mesh); if(mesh) { m_animated_meshnode = smgr->addAnimatedMeshSceneNode(mesh, NULL); + m_animated_meshnode->grab(); mesh->drop(); // The scene node took hold of it m_animated_meshnode->animateJoints(); // Needed for some animations m_animated_meshnode->setScale(v3f(m_prop.visual_size.X, @@ -887,36 +934,36 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, u8 li = m_last_light; setMeshColor(m_animated_meshnode->getMesh(), video::SColor(255,li,li,li)); + bool backface_culling = m_prop.backface_culling; + if (m_is_player) + backface_culling = false; + m_animated_meshnode->setMaterialFlag(video::EMF_LIGHTING, false); m_animated_meshnode->setMaterialFlag(video::EMF_BILINEAR_FILTER, false); m_animated_meshnode->setMaterialType(video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF); m_animated_meshnode->setMaterialFlag(video::EMF_FOG_ENABLE, true); + m_animated_meshnode->setMaterialFlag(video::EMF_BACK_FACE_CULLING, backface_culling); } else errorstream<<"GenericCAO::addToScene(): Could not load mesh "<= 1){ infostream<<"textures[0]: "<idef(); ItemStack item(m_prop.textures[0], 1, 0, "", idef); - scene::IMesh *item_mesh = idef->getWieldMesh(item.getDefinition(idef).name, m_gamedef); - // Copy mesh to be able to set unique vertex colors - scene::IMeshManipulator *manip = - irr->getVideoDriver()->getMeshManipulator(); - scene::IMesh *mesh = manip->createMeshUniquePrimitives(item_mesh); + m_wield_meshnode = new WieldMeshSceneNode( + smgr->getRootSceneNode(), smgr, -1); + m_wield_meshnode->setItem(item, m_gamedef); - m_meshnode = smgr->addMeshSceneNode(mesh, NULL); - mesh->drop(); - - m_meshnode->setScale(v3f(m_prop.visual_size.X/2, + m_wield_meshnode->setScale(v3f(m_prop.visual_size.X/2, m_prop.visual_size.Y/2, m_prop.visual_size.X/2)); u8 li = m_last_light; - setMeshColor(m_meshnode->getMesh(), video::SColor(255,li,li,li)); + m_wield_meshnode->setColor(video::SColor(255,li,li,li)); } } else { infostream<<"GenericCAO::addToScene(): \""<getGUIEnvironment(); - std::wstring wname = narrow_to_wide(m_name); - m_textnode = smgr->addTextSceneNode(gui->getBuiltInFont(), - wname.c_str(), video::SColor(255,255,255,255), node); + std::wstring wname = utf8_to_wide(m_name); + m_textnode = smgr->addTextSceneNode(gui->getSkin()->getFont(), + wname.c_str(), m_nametag_color, node); + m_textnode->grab(); m_textnode->setPosition(v3f(0, BS*1.1, 0)); + + // Enforce hiding nametag, + // because if freetype is enabled, a grey + // shadow can remain. + m_textnode->setVisible(m_nametag_color.getAlpha() > 0); } updateNodePos(); @@ -945,19 +992,40 @@ void GenericCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc, updateBonePosition(); updateAttachments(); } - + void GenericCAO::updateLight(u8 light_at_pos) +{ + // Don't update light of attached one + if (getParent() != NULL) { + return; + } + + updateLightNoCheck(light_at_pos); + + // Update light of all children + for (std::vector::size_type i = 0; i < m_children.size(); i++) { + ClientActiveObject *obj = m_env->getActiveObject(m_children[i]); + if (obj) { + obj->updateLightNoCheck(light_at_pos); + } + } +} + +void GenericCAO::updateLightNoCheck(u8 light_at_pos) { u8 li = decode_light(light_at_pos); - if(li != m_last_light){ + if (li != m_last_light) { m_last_light = li; video::SColor color(255,li,li,li); - if(m_meshnode) + if (m_meshnode) { setMeshColor(m_meshnode->getMesh(), color); - if(m_animated_meshnode) + } else if (m_animated_meshnode) { setMeshColor(m_animated_meshnode->getMesh(), color); - if(m_spritenode) + } else if (m_wield_meshnode) { + m_wield_meshnode->setColor(color); + } else if (m_spritenode) { m_spritenode->setColor(color); + } } } @@ -968,37 +1036,33 @@ v3s16 GenericCAO::getLightPosition() void GenericCAO::updateNodePos() { - if(getParent() != NULL) + if (getParent() != NULL) return; - v3s16 camera_offset = m_env->getCameraOffset(); - if(m_meshnode){ - m_meshnode->setPosition(pos_translator.vect_show-intToFloat(camera_offset, BS)); - v3f rot = m_meshnode->getRotation(); - rot.Y = -m_yaw; - m_meshnode->setRotation(rot); - } - if(m_animated_meshnode){ - m_animated_meshnode->setPosition(pos_translator.vect_show-intToFloat(camera_offset, BS)); - v3f rot = m_animated_meshnode->getRotation(); - rot.Y = -m_yaw; - m_animated_meshnode->setRotation(rot); - } - if(m_spritenode){ - m_spritenode->setPosition(pos_translator.vect_show-intToFloat(camera_offset, BS)); + scene::ISceneNode *node = getSceneNode(); + + if (node) { + v3s16 camera_offset = m_env->getCameraOffset(); + node->setPosition(pos_translator.vect_show - intToFloat(camera_offset, BS)); + if (node != m_spritenode) { // rotate if not a sprite + v3f rot = node->getRotation(); + rot.Y = -m_yaw; + node->setRotation(rot); + } } } - + void GenericCAO::step(float dtime, ClientEnvironment *env) { // Handel model of local player instantly to prevent lags - if(m_is_local_player) { + if(m_is_local_player) + { LocalPlayer *player = m_env->getLocalPlayer(); - if (player->camera_mode > CAMERA_MODE_FIRST) { + if (m_is_visible) + { int old_anim = player->last_animation; float old_anim_speed = player->last_animation_speed; - m_is_visible = true; m_position = player->getPosition() + v3f(0,BS,0); m_velocity = v3f(0,0,0); m_acceleration = v3f(0,0,0); @@ -1026,7 +1090,8 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) if(controls.sneak && walking) new_speed /= 2; - if(walking && (controls.LMB || controls.RMB)) { + if(walking && (controls.LMB || controls.RMB)) + { new_anim = player->local_animations[3]; player->last_animation = WD_ANIM; } else if(walking) { @@ -1039,7 +1104,8 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) // Apply animations if input detected and not attached // or set idle animation - if ((new_anim.X + new_anim.Y) > 0 && !player->isAttached) { + if ((new_anim.X + new_anim.Y) > 0 && !player->isAttached) + { allow_update = true; m_animation_range = new_anim; m_animation_speed = new_speed; @@ -1047,70 +1113,59 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) } else { player->last_animation = NO_ANIM; - if (old_anim != NO_ANIM) { + if (old_anim != NO_ANIM) + { m_animation_range = player->local_animations[0]; updateAnimation(); } } // Update local player animations - if ((player->last_animation != old_anim || m_animation_speed != old_anim_speed) && + if ((player->last_animation != old_anim || + m_animation_speed != old_anim_speed) && player->last_animation != NO_ANIM && allow_update) updateAnimation(); - } else { - m_is_visible = false; } } if(m_visuals_expired && m_smgr && m_irr){ m_visuals_expired = false; - // Attachments, part 1: All attached objects must be unparented first, or Irrlicht causes a segmentation fault - for(std::vector >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++) + // Attachments, part 1: All attached objects must be unparented first, + // or Irrlicht causes a segmentation fault + for(std::vector::iterator ci = m_children.begin(); + ci != m_children.end();) { - if(ii->Y == getId()) // This is a child of our parent - { - ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child - if(obj) - { - scene::IMeshSceneNode *m_child_meshnode = obj->getMeshSceneNode(); - scene::IAnimatedMeshSceneNode *m_child_animated_meshnode = obj->getAnimatedMeshSceneNode(); - scene::IBillboardSceneNode *m_child_spritenode = obj->getSpriteSceneNode(); - if(m_child_meshnode) - m_child_meshnode->setParent(m_smgr->getRootSceneNode()); - if(m_child_animated_meshnode) - m_child_animated_meshnode->setParent(m_smgr->getRootSceneNode()); - if(m_child_spritenode) - m_child_spritenode->setParent(m_smgr->getRootSceneNode()); - } + if (m_env->attachement_parent_ids[*ci] != getId()) { + ci = m_children.erase(ci); + continue; + } + ClientActiveObject *obj = m_env->getActiveObject(*ci); + if (obj) { + scene::ISceneNode *child_node = obj->getSceneNode(); + if (child_node) + child_node->setParent(m_smgr->getRootSceneNode()); } + ++ci; } removeFromScene(false); addToScene(m_smgr, m_gamedef->tsrc(), m_irr); // Attachments, part 2: Now that the parent has been refreshed, put its attachments back - for(std::vector >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++) - { - if(ii->Y == getId()) // This is a child of our parent - { - ClientActiveObject *obj = m_env->getActiveObject(ii->X); // Get the object of the child - if(obj) - obj->setAttachments(); - } + for (std::vector::size_type i = 0; i < m_children.size(); i++) { + // Get the object of the child + ClientActiveObject *obj = m_env->getActiveObject(m_children[i]); + if (obj) + obj->setAttachments(); } } // Make sure m_is_visible is always applied - if(m_meshnode) - m_meshnode->setVisible(m_is_visible); - if(m_animated_meshnode) - m_animated_meshnode->setVisible(m_is_visible); - if(m_spritenode) - m_spritenode->setVisible(m_is_visible); - if(m_textnode) - m_textnode->setVisible(m_is_visible); + scene::ISceneNode *node = getSceneNode(); + if (node) + node->setVisible(m_is_visible); if(getParent() != NULL) // Attachments should be glued to their parent by Irrlicht { @@ -1126,12 +1181,11 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) player->overridePosition = getParent()->getPosition(); m_env->getLocalPlayer()->parent = getParent(); } - } - else - { + } else { v3f lastpos = pos_translator.vect_show; - if(m_prop.physical){ + if(m_prop.physical) + { core::aabbox3d box = m_prop.collisionbox; box.MinEdge *= BS; box.MaxEdge *= BS; @@ -1156,16 +1210,19 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) } else { m_position += dtime * m_velocity + 0.5 * dtime * dtime * m_acceleration; m_velocity += dtime * m_acceleration; - pos_translator.update(m_position, pos_translator.aim_is_end, pos_translator.anim_time); + pos_translator.update(m_position, pos_translator.aim_is_end, + pos_translator.anim_time); pos_translator.translate(dtime); updateNodePos(); } float moved = lastpos.getDistanceFrom(pos_translator.vect_show); m_step_distance_counter += moved; - if(m_step_distance_counter > 1.5*BS){ + if(m_step_distance_counter > 1.5*BS) + { m_step_distance_counter = 0; - if(!m_is_local_player && m_prop.makes_footstep_sound){ + if(!m_is_local_player && m_prop.makes_footstep_sound) + { INodeDefManager *ndef = m_gamedef->ndef(); v3s16 p = floatToInt(getPosition() + v3f(0, (m_prop.collisionbox.MinEdge.Y-0.5)*BS, 0), BS); @@ -1177,7 +1234,8 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) } m_anim_timer += dtime; - if(m_anim_timer >= m_anim_framelength){ + if(m_anim_timer >= m_anim_framelength) + { m_anim_timer -= m_anim_framelength; m_anim_frame++; if(m_anim_frame >= m_anim_num_frames) @@ -1186,28 +1244,33 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) updateTexturePos(); - if(m_reset_textures_timer >= 0){ + if(m_reset_textures_timer >= 0) + { m_reset_textures_timer -= dtime; if(m_reset_textures_timer <= 0){ m_reset_textures_timer = -1; updateTextures(""); } } - if(getParent() == NULL && fabs(m_prop.automatic_rotate) > 0.001){ + if(getParent() == NULL && fabs(m_prop.automatic_rotate) > 0.001) + { m_yaw += dtime * m_prop.automatic_rotate * 180 / M_PI; updateNodePos(); } if (getParent() == NULL && m_prop.automatic_face_movement_dir && - (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)){ - m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset; + (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) + { + m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + + m_prop.automatic_face_movement_dir_offset; updateNodePos(); } } void GenericCAO::updateTexturePos() { - if(m_spritenode){ + if(m_spritenode) + { scene::ICameraSceneNode* camera = m_spritenode->getSceneManager()->getActiveCamera(); if(!camera) @@ -1226,7 +1289,8 @@ void GenericCAO::updateTexturePos() else if(cam_to_entity.Y < -0.75) col += 4; else{ - float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / M_PI * 180.; + float mob_dir = + atan2(cam_to_entity.Z, cam_to_entity.X) / M_PI * 180.; float dir = mob_dir - m_yaw; dir = wrapDegrees_180(dir); //infostream<<"id="<getMaterialCount(); ++i) + for (u32 i = 0; i < m_prop.textures.size() && + i < m_animated_meshnode->getMaterialCount(); ++i) { std::string texturestring = m_prop.textures[i]; if(texturestring == "") continue; // Empty texture string means don't modify that material texturestring += mod; - video::ITexture* texture = tsrc->getTexture(texturestring); + video::ITexture* texture = tsrc->getTextureForMesh(texturestring); if(!texture) { errorstream<<"GenericCAO::updateTextures(): Could not load texture "<getMaterial(i).setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter); - m_animated_meshnode->getMaterial(i).setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter); - m_animated_meshnode->getMaterial(i).setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter); + m_animated_meshnode->getMaterial(i) + .setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter); + m_animated_meshnode->getMaterial(i) + .setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter); + m_animated_meshnode->getMaterial(i) + .setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter); } - for (u32 i = 0; i < m_prop.colors.size() && i < m_animated_meshnode->getMaterialCount(); ++i) + for (u32 i = 0; i < m_prop.colors.size() && + i < m_animated_meshnode->getMaterialCount(); ++i) { // This allows setting per-material colors. However, until a real lighting // system is added, the code below will have no effect. Once MineTest @@ -1342,7 +1411,7 @@ void GenericCAO::updateTextures(const std::string &mod) material.setFlag(video::EMF_LIGHTING, false); material.setFlag(video::EMF_BILINEAR_FILTER, false); material.setTexture(0, - tsrc->getTexture(texturestring)); + tsrc->getTextureForMesh(texturestring)); material.getTextureMatrix(0).makeIdentity(); // This allows setting per-material colors. However, until a real lighting @@ -1370,7 +1439,7 @@ void GenericCAO::updateTextures(const std::string &mod) tname += mod; scene::IMeshBuffer *buf = mesh->getMeshBuffer(0); buf->getMaterial().setTexture(0, - tsrc->getTexture(tname)); + tsrc->getTextureForMesh(tname)); // This allows setting per-material colors. However, until a real lighting // system is added, the code below will have no effect. Once MineTest @@ -1395,7 +1464,7 @@ void GenericCAO::updateTextures(const std::string &mod) tname += mod; scene::IMeshBuffer *buf = mesh->getMeshBuffer(1); buf->getMaterial().setTexture(0, - tsrc->getTexture(tname)); + tsrc->getTextureForMesh(tname)); // This allows setting per-material colors. However, until a real lighting // system is added, the code below will have no effect. Once MineTest @@ -1425,18 +1494,30 @@ void GenericCAO::updateAnimation() { if(m_animated_meshnode == NULL) return; - m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y); - m_animated_meshnode->setAnimationSpeed(m_animation_speed); + + if (m_animated_meshnode->getStartFrame() != m_animation_range.X || + m_animated_meshnode->getEndFrame() != m_animation_range.Y) + m_animated_meshnode->setFrameLoop(m_animation_range.X, m_animation_range.Y); + if (m_animated_meshnode->getAnimationSpeed() != m_animation_speed) + m_animated_meshnode->setAnimationSpeed(m_animation_speed); m_animated_meshnode->setTransitionTime(m_animation_blend); +// Requires Irrlicht 1.8 or greater +#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 8) || IRRLICHT_VERSION_MAJOR > 1 + if (m_animated_meshnode->getLoopMode() != m_animation_loop) + m_animated_meshnode->setLoopMode(m_animation_loop); +#endif } void GenericCAO::updateBonePosition() { - if(!m_bone_position.size() || m_animated_meshnode == NULL) + if(m_bone_position.empty() || m_animated_meshnode == NULL) return; m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render - for(std::map >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){ + for(std::map >::const_iterator ii = m_bone_position.begin(); + ii != m_bone_position.end(); ++ii) + { std::string bone_name = (*ii).first; v3f bone_pos = (*ii).second.X; v3f bone_rot = (*ii).second.Y; @@ -1448,154 +1529,43 @@ void GenericCAO::updateBonePosition() } } } - + void GenericCAO::updateAttachments() { - m_attached_to_local = getParent() != NULL && getParent()->isLocalPlayer(); - m_is_visible = !m_attached_to_local; // Objects attached to the local player should always be hidden - if(getParent() == NULL || m_attached_to_local) // Detach or don't attach - { - if(m_meshnode) - { - v3f old_position = m_meshnode->getAbsolutePosition(); - v3f old_rotation = m_meshnode->getRotation(); - m_meshnode->setParent(m_smgr->getRootSceneNode()); - m_meshnode->setPosition(old_position); - m_meshnode->setRotation(old_rotation); - m_meshnode->updateAbsolutePosition(); + if (getParent() == NULL) { // Detach or don't attach + scene::ISceneNode *node = getSceneNode(); + if (node) { + v3f old_position = node->getAbsolutePosition(); + v3f old_rotation = node->getRotation(); + node->setParent(m_smgr->getRootSceneNode()); + node->setPosition(old_position); + node->setRotation(old_rotation); + node->updateAbsolutePosition(); } - if(m_animated_meshnode) - { - v3f old_position = m_animated_meshnode->getAbsolutePosition(); - v3f old_rotation = m_animated_meshnode->getRotation(); - m_animated_meshnode->setParent(m_smgr->getRootSceneNode()); - m_animated_meshnode->setPosition(old_position); - m_animated_meshnode->setRotation(old_rotation); - m_animated_meshnode->updateAbsolutePosition(); - } - if(m_spritenode) - { - v3f old_position = m_spritenode->getAbsolutePosition(); - v3f old_rotation = m_spritenode->getRotation(); - m_spritenode->setParent(m_smgr->getRootSceneNode()); - m_spritenode->setPosition(old_position); - m_spritenode->setRotation(old_rotation); - m_spritenode->updateAbsolutePosition(); - } - if(m_is_local_player) - { + if (m_is_local_player) { LocalPlayer *player = m_env->getLocalPlayer(); player->isAttached = false; } } else // Attach { - scene::IMeshSceneNode *parent_mesh = NULL; - if(getParent()->getMeshSceneNode()) - parent_mesh = getParent()->getMeshSceneNode(); - scene::IAnimatedMeshSceneNode *parent_animated_mesh = NULL; - if(getParent()->getAnimatedMeshSceneNode()) - parent_animated_mesh = getParent()->getAnimatedMeshSceneNode(); - scene::IBillboardSceneNode *parent_sprite = NULL; - if(getParent()->getSpriteSceneNode()) - parent_sprite = getParent()->getSpriteSceneNode(); - - scene::IBoneSceneNode *parent_bone = NULL; - if(parent_animated_mesh && m_attachment_bone != "") - parent_bone = parent_animated_mesh->getJointNode(m_attachment_bone.c_str()); - - // The spaghetti code below makes sure attaching works if either the parent or child is a spritenode, meshnode, or animatedmeshnode - // TODO: Perhaps use polymorphism here to save code duplication - if(m_meshnode){ - if(parent_bone){ - m_meshnode->setParent(parent_bone); - m_meshnode->setPosition(m_attachment_position); - m_meshnode->setRotation(m_attachment_rotation); - m_meshnode->updateAbsolutePosition(); - } - else - { - if(parent_mesh){ - m_meshnode->setParent(parent_mesh); - m_meshnode->setPosition(m_attachment_position); - m_meshnode->setRotation(m_attachment_rotation); - m_meshnode->updateAbsolutePosition(); - } - else if(parent_animated_mesh){ - m_meshnode->setParent(parent_animated_mesh); - m_meshnode->setPosition(m_attachment_position); - m_meshnode->setRotation(m_attachment_rotation); - m_meshnode->updateAbsolutePosition(); - } - else if(parent_sprite){ - m_meshnode->setParent(parent_sprite); - m_meshnode->setPosition(m_attachment_position); - m_meshnode->setRotation(m_attachment_rotation); - m_meshnode->updateAbsolutePosition(); - } - } - } - if(m_animated_meshnode){ - if(parent_bone){ - m_animated_meshnode->setParent(parent_bone); - m_animated_meshnode->setPosition(m_attachment_position); - m_animated_meshnode->setRotation(m_attachment_rotation); - m_animated_meshnode->updateAbsolutePosition(); - } - else - { - if(parent_mesh){ - m_animated_meshnode->setParent(parent_mesh); - m_animated_meshnode->setPosition(m_attachment_position); - m_animated_meshnode->setRotation(m_attachment_rotation); - m_animated_meshnode->updateAbsolutePosition(); - } - else if(parent_animated_mesh){ - m_animated_meshnode->setParent(parent_animated_mesh); - m_animated_meshnode->setPosition(m_attachment_position); - m_animated_meshnode->setRotation(m_attachment_rotation); - m_animated_meshnode->updateAbsolutePosition(); - } - else if(parent_sprite){ - m_animated_meshnode->setParent(parent_sprite); - m_animated_meshnode->setPosition(m_attachment_position); - m_animated_meshnode->setRotation(m_attachment_rotation); - m_animated_meshnode->updateAbsolutePosition(); - } - } + scene::ISceneNode *my_node = getSceneNode(); + + scene::ISceneNode *parent_node = getParent()->getSceneNode(); + scene::IAnimatedMeshSceneNode *parent_animated_mesh_node = + getParent()->getAnimatedMeshSceneNode(); + if (parent_animated_mesh_node && m_attachment_bone != "") { + parent_node = parent_animated_mesh_node->getJointNode(m_attachment_bone.c_str()); } - if(m_spritenode){ - if(parent_bone){ - m_spritenode->setParent(parent_bone); - m_spritenode->setPosition(m_attachment_position); - m_spritenode->setRotation(m_attachment_rotation); - m_spritenode->updateAbsolutePosition(); - } - else - { - if(parent_mesh){ - m_spritenode->setParent(parent_mesh); - m_spritenode->setPosition(m_attachment_position); - m_spritenode->setRotation(m_attachment_rotation); - m_spritenode->updateAbsolutePosition(); - } - else if(parent_animated_mesh){ - m_spritenode->setParent(parent_animated_mesh); - m_spritenode->setPosition(m_attachment_position); - m_spritenode->setRotation(m_attachment_rotation); - m_spritenode->updateAbsolutePosition(); - } - else if(parent_sprite){ - m_spritenode->setParent(parent_sprite); - m_spritenode->setPosition(m_attachment_position); - m_spritenode->setRotation(m_attachment_rotation); - m_spritenode->updateAbsolutePosition(); - } - } + + if (my_node && parent_node) { + my_node->setParent(parent_node); + my_node->setPosition(m_attachment_position); + my_node->setRotation(m_attachment_rotation); + my_node->updateAbsolutePosition(); } - if(m_is_local_player) - { + if (m_is_local_player) { LocalPlayer *player = m_env->getLocalPlayer(); player->isAttached = true; } @@ -1649,7 +1619,8 @@ void GenericCAO::processMessage(const std::string &data) if(getParent() != NULL) // Just in case return; - if(do_interpolate){ + if(do_interpolate) + { if(!m_prop.physical) pos_translator.update(m_position, is_end_position, update_interval); } else { @@ -1657,13 +1628,11 @@ void GenericCAO::processMessage(const std::string &data) } updateNodePos(); } - else if(cmd == GENERIC_CMD_SET_TEXTURE_MOD) - { + else if(cmd == GENERIC_CMD_SET_TEXTURE_MOD) { std::string mod = deSerializeString(is); updateTextures(mod); } - else if(cmd == GENERIC_CMD_SET_SPRITE) - { + else if(cmd == GENERIC_CMD_SET_SPRITE) { v2s16 p = readV2S16(is); int num_frames = readU16(is); float framelength = readF1000(is); @@ -1676,8 +1645,7 @@ void GenericCAO::processMessage(const std::string &data) updateTexturePos(); } - else if(cmd == GENERIC_CMD_SET_PHYSICS_OVERRIDE) - { + else if(cmd == GENERIC_CMD_SET_PHYSICS_OVERRIDE) { float override_speed = readF1000(is); float override_jump = readF1000(is); float override_gravity = readF1000(is); @@ -1696,26 +1664,31 @@ void GenericCAO::processMessage(const std::string &data) player->physics_override_sneak_glitch = sneak_glitch; } } - else if(cmd == GENERIC_CMD_SET_ANIMATION) - { + else if(cmd == GENERIC_CMD_SET_ANIMATION) { // TODO: change frames send as v2s32 value v2f range = readV2F1000(is); if (!m_is_local_player) { m_animation_range = v2s32((s32)range.X, (s32)range.Y); m_animation_speed = readF1000(is); m_animation_blend = readF1000(is); + // these are sent inverted so we get true when the server sends nothing + m_animation_loop = !readU8(is); updateAnimation(); } else { LocalPlayer *player = m_env->getLocalPlayer(); - if(player->last_animation == NO_ANIM) { + if(player->last_animation == NO_ANIM) + { m_animation_range = v2s32((s32)range.X, (s32)range.Y); m_animation_speed = readF1000(is); m_animation_blend = readF1000(is); + // these are sent inverted so we get true when the server sends nothing + m_animation_loop = !readU8(is); } // update animation only if local animations present // and received animation is unknown (except idle animation) bool is_known = false; - for (int i = 1;i<4;i++) { + for (int i = 1;i<4;i++) + { if(m_animation_range.Y == player->local_animations[i].Y) is_known = true; } @@ -1726,35 +1699,41 @@ void GenericCAO::processMessage(const std::string &data) } } } - else if(cmd == GENERIC_CMD_SET_BONE_POSITION) - { + else if(cmd == GENERIC_CMD_SET_BONE_POSITION) { std::string bone = deSerializeString(is); v3f position = readV3F1000(is); v3f rotation = readV3F1000(is); m_bone_position[bone] = core::vector2d(position, rotation); updateBonePosition(); - } - else if(cmd == GENERIC_CMD_SET_ATTACHMENT) - { - // If an entry already exists for this object, delete it first to avoid duplicates - for(std::vector >::iterator ii = m_env->attachment_list.begin(); ii != m_env->attachment_list.end(); ii++) - { - if(ii->X == getId()) // This is the ID of our object - { - m_env->attachment_list.erase(ii); - break; - } + } else if (cmd == GENERIC_CMD_ATTACH_TO) { + u16 parentID = readS16(is); + u16 oldparent = m_env->attachement_parent_ids[getId()]; + if (oldparent) { + m_children.erase(std::remove(m_children.begin(), m_children.end(), + getId()), m_children.end()); } - m_env->attachment_list.push_back(core::vector2d(getId(), readS16(is))); + m_env->attachement_parent_ids[getId()] = parentID; + GenericCAO *parentobj = m_env->getGenericCAO(parentID); + + if (parentobj) { + parentobj->m_children.push_back(getId()); + } + m_attachment_bone = deSerializeString(is); m_attachment_position = readV3F1000(is); m_attachment_rotation = readV3F1000(is); + // localplayer itself can't be attached to localplayer + if (!m_is_local_player) { + m_attached_to_local = getParent() != NULL && getParent()->isLocalPlayer(); + // Objects attached to the local player should be hidden by default + m_is_visible = !m_attached_to_local; + } + updateAttachments(); } - else if(cmd == GENERIC_CMD_PUNCHED) - { + else if(cmd == GENERIC_CMD_PUNCHED) { /*s16 damage =*/ readS16(is); s16 result_hp = readS16(is); @@ -1763,8 +1742,10 @@ void GenericCAO::processMessage(const std::string &data) m_hp = result_hp; - if (damage > 0) { - if (m_hp <= 0) { + if (damage > 0) + { + if (m_hp <= 0) + { // TODO: Execute defined fast response // As there is no definition, make a smoke puff ClientSimpleObject *simple = createSmokePuff( @@ -1781,22 +1762,35 @@ void GenericCAO::processMessage(const std::string &data) } } } - else if(cmd == GENERIC_CMD_UPDATE_ARMOR_GROUPS) - { + else if(cmd == GENERIC_CMD_UPDATE_ARMOR_GROUPS) { m_armor_groups.clear(); int armor_groups_size = readU16(is); - for(int i=0; isetTextColor(m_nametag_color); + + // Enforce hiding nametag, + // because if freetype is enabled, a grey + // shadow can remain. + m_textnode->setVisible(m_nametag_color.getAlpha() > 0); + } } } - + +/* \pre punchitem != NULL + */ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem, float time_from_last_punch) { - assert(punchitem); + assert(punchitem); // pre-condition const ToolCapabilities *toolcap = &punchitem->getToolCapabilities(m_gamedef->idef()); PunchDamageResult result = getPunchDamage( @@ -1807,7 +1801,8 @@ bool GenericCAO::directReportPunch(v3f dir, const ItemStack *punchitem, if(result.did_punch && result.damage != 0) { - if(result.damage < m_hp){ + if(result.damage < m_hp) + { m_hp -= result.damage; } else { m_hp = 0; @@ -1835,7 +1830,8 @@ std::string GenericCAO::debugInfoText() os<<"GenericCAO hp="<first<<"="<second<<", "; } os<<"}";