X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fcontent_sao.cpp;h=1fb74263ba4b4cb701b3ed5a2bccfcd652832e8b;hb=2153965cf92ab61b0d7e095cf3c2755924fdc221;hp=5ba4f1ad1fc43016955935604193feca0657cf31;hpb=550c0404a8b6fbee857003c961bb802121e88f51;p=minetest.git diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 5ba4f1ad1..1fb74263b 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -28,6 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "server.h" #include "scripting_server.h" #include "genericobject.h" +#include "settings.h" +#include std::map ServerActiveObject::m_types; @@ -59,7 +61,7 @@ class TestSAO : public ServerActiveObject m_age += dtime; if(m_age > 10) { - m_removed = true; + m_pending_removal = true; return; } @@ -67,7 +69,7 @@ class TestSAO : public ServerActiveObject if(m_base_position.Y > 8*BS) m_base_position.Y = 2*BS; - if(send_recommended == false) + if (!send_recommended) return; m_timer1 -= dtime; @@ -155,6 +157,12 @@ void UnitSAO::getAnimation(v2f *frame_range, float *frame_speed, float *frame_bl *frame_loop = m_animation_loop; } +void UnitSAO::setAnimationSpeed(float frame_speed) +{ + m_animation_speed = frame_speed; + m_animation_speed_sent = false; +} + void UnitSAO::setBonePosition(const std::string &bone, v3f position, v3f rotation) { // store these so they can be updated to clients @@ -245,9 +253,8 @@ LuaEntitySAO::~LuaEntitySAO() m_env->getScriptIface()->luaentity_Remove(m_id); } - for (std::unordered_set::iterator it = m_attached_particle_spawners.begin(); - it != m_attached_particle_spawners.end(); ++it) { - m_env->deleteParticleSpawner(*it, false); + for (u32 attached_particle_spawner : m_attached_particle_spawners) { + m_env->deleteParticleSpawner(attached_particle_spawner, false); } } @@ -267,7 +274,7 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s) m_hp = m_prop.hp_max; // Activate entity, supplying serialized state m_env->getScriptIface()-> - luaentity_Activate(m_id, m_init_state.c_str(), dtime_s); + luaentity_Activate(m_id, m_init_state, dtime_s); } else { m_prop.infotext = m_init_name; } @@ -281,7 +288,7 @@ ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos, s16 hp = 1; v3f velocity; float yaw = 0; - if(data != ""){ + if (!data.empty()) { std::istringstream is(data, std::ios::binary); // read version u8 version = readU8(is); @@ -366,20 +373,20 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) m_velocity += dtime * m_acceleration; } - if((m_prop.automatic_face_movement_dir) && - (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) - { - float optimal_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI - + m_prop.automatic_face_movement_dir_offset; + if (m_prop.automatic_face_movement_dir && + (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)) { + + float target_yaw = atan2(m_velocity.Z, m_velocity.X) * 180 / M_PI + + m_prop.automatic_face_movement_dir_offset; float max_rotation_delta = dtime * m_prop.automatic_face_movement_max_rotation_per_sec; + float delta = wrapDegrees_0_360(target_yaw - m_yaw); - if ((m_prop.automatic_face_movement_max_rotation_per_sec > 0) && - (fabs(m_yaw - optimal_yaw) > max_rotation_delta)) { - - m_yaw = optimal_yaw < m_yaw ? m_yaw - max_rotation_delta : m_yaw + max_rotation_delta; + if (delta > max_rotation_delta && 360 - delta > max_rotation_delta) { + m_yaw += (delta < 180) ? max_rotation_delta : -max_rotation_delta; + m_yaw = wrapDegrees_0_360(m_yaw); } else { - m_yaw = optimal_yaw; + m_yaw = target_yaw; } } } @@ -392,17 +399,16 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) { ServerMap *map = dynamic_cast(&m_env->getMap()); assert(map); - if (!m_pending_deactivation && + if (!m_pending_removal && map->saoPositionOverLimit(m_base_position)) { - infostream << "Remove SAO " << m_id << "(" << m_init_name + infostream << "Removing SAO " << m_id << "(" << m_init_name << "), outside of limits" << std::endl; - m_pending_deactivation = true; - m_removed = true; + m_pending_removal = true; return; } } - if(send_recommended == false) + if (!send_recommended) return; if(!isAttached()) @@ -423,7 +429,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) } } - if(m_armor_groups_sent == false){ + if (!m_armor_groups_sent) { m_armor_groups_sent = true; std::string str = gob_cmd_update_armor_groups( m_armor_groups); @@ -432,7 +438,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) m_messages_out.push(aom); } - if(m_animation_sent == false){ + if (!m_animation_sent) { m_animation_sent = true; std::string str = gob_cmd_update_animation( m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop); @@ -441,7 +447,15 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) m_messages_out.push(aom); } - if(m_bone_position_sent == false){ + if (!m_animation_speed_sent) { + m_animation_speed_sent = true; + std::string str = gob_cmd_update_animation_speed(m_animation_speed); + // create message and add to list + ActiveObjectMessage aom(getId(), true, str); + m_messages_out.push(aom); + } + + if (!m_bone_position_sent) { m_bone_position_sent = true; for (std::unordered_map>::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){ @@ -453,7 +467,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended) } } - if(m_attachment_sent == false){ + if (!m_attachment_sent) { m_attachment_sent = true; std::string str = gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation); // create message and add to list @@ -537,9 +551,9 @@ int LuaEntitySAO::punch(v3f dir, ServerActiveObject *puncher, float time_from_last_punch) { - if (!m_registered){ + if (!m_registered) { // Delete unknown LuaEntities when punched - m_removed = true; + m_pending_removal = true; return 0; } @@ -583,12 +597,10 @@ int LuaEntitySAO::punch(v3f dir, } if (getHP() == 0) { - m_removed = true; + m_pending_removal = true; m_env->getScriptIface()->luaentity_on_death(m_id, puncher); } - - return result.wear; } @@ -753,12 +765,12 @@ bool LuaEntitySAO::getCollisionBox(aabb3f *toset) const bool LuaEntitySAO::getSelectionBox(aabb3f *toset) const { - if (!m_prop.is_visible) { + if (!m_prop.is_visible || !m_prop.pointable) { return false; } - toset->MinEdge = m_prop.collisionbox.MinEdge * BS; - toset->MaxEdge = m_prop.collisionbox.MaxEdge * BS; + toset->MinEdge = m_prop.selectionbox.MinEdge * BS; + toset->MaxEdge = m_prop.selectionbox.MaxEdge * BS; return true; } @@ -774,7 +786,7 @@ bool LuaEntitySAO::collideWithObjects() const // No prototype, PlayerSAO does not need to be deserialized -PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_, +PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t peer_id_, bool is_singleplayer): UnitSAO(env_, v3f(0,0,0)), m_player(player_), @@ -783,23 +795,31 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id { assert(m_peer_id != 0); // pre-condition - m_prop.hp_max = PLAYER_MAX_HP; + m_prop.hp_max = PLAYER_MAX_HP_DEFAULT; + m_prop.breath_max = PLAYER_MAX_BREATH_DEFAULT; m_prop.physical = false; m_prop.weight = 75; m_prop.collisionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f); - // start of default appearance, this should be overwritten by LUA + m_prop.selectionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f); + m_prop.pointable = true; + // Start of default appearance, this should be overwritten by Lua m_prop.visual = "upright_sprite"; m_prop.visual_size = v2f(1, 2); m_prop.textures.clear(); - m_prop.textures.push_back("player.png"); - m_prop.textures.push_back("player_back.png"); + m_prop.textures.emplace_back("player.png"); + m_prop.textures.emplace_back("player_back.png"); m_prop.colors.clear(); - m_prop.colors.push_back(video::SColor(255, 255, 255, 255)); + m_prop.colors.emplace_back(255, 255, 255, 255); m_prop.spritediv = v2s16(1,1); - // end of default appearance + m_prop.eye_height = 1.625f; + // End of default appearance m_prop.is_visible = true; m_prop.makes_footstep_sound = true; - m_hp = PLAYER_MAX_HP; + m_prop.stepheight = PLAYER_DEFAULT_STEPHEIGHT * BS; + m_hp = m_prop.hp_max; + m_breath = m_prop.breath_max; + // Disable zoom in survival mode using a value of 0 + m_prop.zoom_fov = g_settings->getBool("creative_mode") ? 15.0f : 0.0f; } PlayerSAO::~PlayerSAO() @@ -818,7 +838,7 @@ void PlayerSAO::finalize(RemotePlayer *player, const std::set &priv v3f PlayerSAO::getEyeOffset() const { - return v3f(0, BS * 1.625f, 0); + return v3f(0, BS * m_prop.eye_height, 0); } std::string PlayerSAO::getDescription() @@ -832,7 +852,7 @@ void PlayerSAO::addedToEnvironment(u32 dtime_s) ServerActiveObject::addedToEnvironment(dtime_s); ServerActiveObject::setBasePosition(m_base_position); m_player->setPlayerSAO(this); - m_player->peer_id = m_peer_id; + m_player->setPeerId(m_peer_id); m_last_good_position = m_base_position; } @@ -842,9 +862,8 @@ void PlayerSAO::removingFromEnvironment() ServerActiveObject::removingFromEnvironment(); if (m_player->getPlayerSAO() == this) { unlinkPlayerSessionAndSave(); - for (std::unordered_set::iterator it = m_attached_particle_spawners.begin(); - it != m_attached_particle_spawners.end(); ++it) { - m_env->deleteParticleSpawner(*it, false); + for (u32 attached_particle_spawner : m_attached_particle_spawners) { + m_env->deleteParticleSpawner(attached_particle_spawner, false); } } } @@ -896,16 +915,16 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version) return os.str(); } -void PlayerSAO::getStaticData(std::string *result) const +void PlayerSAO::getStaticData(std::string * result) const { FATAL_ERROR("Deprecated function"); } void PlayerSAO::step(float dtime, bool send_recommended) { - if (m_drowning_interval.step(dtime, 2.0)) { - // get head position - v3s16 p = floatToInt(m_base_position + v3f(0, BS * 1.6, 0), BS); + if (m_drowning_interval.step(dtime, 2.0f)) { + // Get nose/mouth position, approximate with eye position + v3s16 p = floatToInt(getEyePosition(), BS); MapNode n = m_env->getMap().getNodeNoEx(p); const ContentFeatures &c = m_env->getGameDef()->ndef()->get(n); // If node generates drown @@ -921,32 +940,37 @@ void PlayerSAO::step(float dtime, bool send_recommended) } } - if (m_breathing_interval.step(dtime, 0.5)) { - // get head position - v3s16 p = floatToInt(m_base_position + v3f(0, BS * 1.6, 0), BS); + if (m_breathing_interval.step(dtime, 0.5f)) { + // Get nose/mouth position, approximate with eye position + v3s16 p = floatToInt(getEyePosition(), BS); MapNode n = m_env->getMap().getNodeNoEx(p); const ContentFeatures &c = m_env->getGameDef()->ndef()->get(n); - // If player is alive & no drowning, breath - if (m_hp > 0 && m_breath < PLAYER_MAX_BREATH && c.drowning == 0) + // If player is alive & no drowning, breathe + if (m_hp > 0 && m_breath < m_prop.breath_max && c.drowning == 0) setBreath(m_breath + 1); } - if (m_node_hurt_interval.step(dtime, 1.0)) { - // Feet, middle and head - v3s16 p1 = floatToInt(m_base_position + v3f(0, BS*0.1, 0), BS); - MapNode n1 = m_env->getMap().getNodeNoEx(p1); - v3s16 p2 = floatToInt(m_base_position + v3f(0, BS*0.8, 0), BS); - MapNode n2 = m_env->getMap().getNodeNoEx(p2); - v3s16 p3 = floatToInt(m_base_position + v3f(0, BS*1.6, 0), BS); - MapNode n3 = m_env->getMap().getNodeNoEx(p3); - + if (m_node_hurt_interval.step(dtime, 1.0f)) { u32 damage_per_second = 0; - damage_per_second = MYMAX(damage_per_second, - m_env->getGameDef()->ndef()->get(n1).damage_per_second); - damage_per_second = MYMAX(damage_per_second, - m_env->getGameDef()->ndef()->get(n2).damage_per_second); - damage_per_second = MYMAX(damage_per_second, - m_env->getGameDef()->ndef()->get(n3).damage_per_second); + // Lowest and highest damage points are 0.1 within collisionbox + float dam_top = m_prop.collisionbox.MaxEdge.Y - 0.1f; + + // Sequence of damage points, starting 0.1 above feet and progressing + // upwards in 1 node intervals, stopping below top damage point. + for (float dam_height = 0.1f; dam_height < dam_top; dam_height++) { + v3s16 p = floatToInt(m_base_position + + v3f(0.0f, dam_height * BS, 0.0f), BS); + MapNode n = m_env->getMap().getNodeNoEx(p); + damage_per_second = std::max(damage_per_second, + m_env->getGameDef()->ndef()->get(n).damage_per_second); + } + + // Top damage point + v3s16 ptop = floatToInt(m_base_position + + v3f(0.0f, dam_top * BS, 0.0f), BS); + MapNode ntop = m_env->getMap().getNodeNoEx(ptop); + damage_per_second = std::max(damage_per_second, + m_env->getGameDef()->ndef()->get(ntop).damage_per_second); if (damage_per_second != 0 && m_hp > 0) { s16 newhp = ((s32) damage_per_second > m_hp ? 0 : m_hp - damage_per_second); @@ -964,12 +988,11 @@ void PlayerSAO::step(float dtime, bool send_recommended) } // If attached, check that our parent is still there. If it isn't, detach. - if(m_attachment_parent_id && !isAttached()) - { + if (m_attachment_parent_id && !isAttached()) { m_attachment_parent_id = 0; m_attachment_bone = ""; - m_attachment_position = v3f(0,0,0); - m_attachment_rotation = v3f(0,0,0); + m_attachment_position = v3f(0.0f, 0.0f, 0.0f); + m_attachment_rotation = v3f(0.0f, 0.0f, 0.0f); setBasePosition(m_last_good_position); m_env->getGameDef()->SendMovePlayer(m_peer_id); } @@ -977,8 +1000,8 @@ void PlayerSAO::step(float dtime, bool send_recommended) //dstream<<"PlayerSAO::step: dtime: "<getMaxLagEstimate() * 2.0; + const float LAG_POOL_MIN = 5.0f; + float lag_pool_max = m_env->getMaxLagEstimate() * 2.0f; if(lag_pool_max < LAG_POOL_MIN) lag_pool_max = LAG_POOL_MIN; m_dig_pool.setMax(lag_pool_max); @@ -991,8 +1014,10 @@ void PlayerSAO::step(float dtime, bool send_recommended) m_time_from_last_punch += dtime; m_nocheat_dig_time += dtime; - // Each frame, parent position is copied if the object is attached, otherwise it's calculated normally - // If the object gets detached this comes into effect automatically from the last known origin + // Each frame, parent position is copied if the object is attached, + // otherwise it's calculated normally. + // If the object gets detached this comes into effect automatically from + // the last known origin. if (isAttached()) { v3f pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition(); m_last_good_position = pos; @@ -1002,20 +1027,21 @@ void PlayerSAO::step(float dtime, bool send_recommended) if (!send_recommended) return; - // If the object is attached client-side, don't waste bandwidth sending its position to clients - if(m_position_not_sent && !isAttached()) - { + // If the object is attached client-side, don't waste bandwidth sending its + // position to clients. + if (m_position_not_sent && !isAttached()) { m_position_not_sent = false; float update_interval = m_env->getSendRecommendedInterval(); v3f pos; - if(isAttached()) // Just in case we ever do send attachment position too + if (isAttached()) // Just in case we ever do send attachment position too pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition(); else pos = m_base_position; + std::string str = gob_cmd_update_position( pos, - v3f(0,0,0), - v3f(0,0,0), + v3f(0.0f, 0.0f, 0.0f), + v3f(0.0f, 0.0f, 0.0f), m_yaw, true, false, @@ -1067,7 +1093,7 @@ void PlayerSAO::step(float dtime, bool send_recommended) } } - if (!m_attachment_sent){ + if (!m_attachment_sent) { m_attachment_sent = true; std::string str = gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation); @@ -1170,7 +1196,7 @@ int PlayerSAO::punch(v3f dir, return 0; // No effect if PvP disabled - if (g_settings->getBool("enable_pvp") == false) { + if (!g_settings->getBool("enable_pvp")) { if (puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) { std::string str = gob_cmd_punched(0, getHP()); // create message and add to list @@ -1236,8 +1262,8 @@ void PlayerSAO::setHP(s16 hp) if (hp < 0) hp = 0; - else if (hp > PLAYER_MAX_HP) - hp = PLAYER_MAX_HP; + else if (hp > m_prop.hp_max) + hp = m_prop.hp_max; if (hp < oldhp && !g_settings->getBool("enable_damage")) { return; @@ -1258,7 +1284,7 @@ void PlayerSAO::setBreath(const u16 breath, bool send) if (m_player && breath != m_breath) m_player->setDirty(true); - m_breath = MYMIN(breath, PLAYER_MAX_BREATH); + m_breath = MYMIN(breath, m_prop.breath_max); if (send) m_env->getGameDef()->SendPlayerBreath(this); @@ -1335,17 +1361,16 @@ void PlayerSAO::setWieldIndex(int i) } } -// Erase the peer id and make the object for removal void PlayerSAO::disconnected() { m_peer_id = 0; - m_removed = true; + m_pending_removal = true; } void PlayerSAO::unlinkPlayerSessionAndSave() { assert(m_player->getPlayerSAO() == this); - m_player->peer_id = 0; + m_player->setPeerId(PEER_ID_INEXISTENT); m_env->savePlayer(m_player); m_player->setPlayerSAO(NULL); m_env->removePlayer(m_player); @@ -1427,11 +1452,12 @@ bool PlayerSAO::getCollisionBox(aabb3f *toset) const bool PlayerSAO::getSelectionBox(aabb3f *toset) const { - if (!m_prop.is_visible) { + if (!m_prop.is_visible || !m_prop.pointable) { return false; } - getCollisionBox(toset); + toset->MinEdge = m_prop.selectionbox.MinEdge * BS; + toset->MaxEdge = m_prop.selectionbox.MaxEdge * BS; return true; }