livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer 

# Conflicts:
#	indra/newview/llvoavatar.cpp
meow-7.2.2
Ansariel 2020-05-19 11:31:26 +02:00
parent 73eabcb943 b43c1a2656
commit ce68c75e58
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lldrawable.cpp
View File

@ -1205,7 +1205,8 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
{
U32 partition_type = mSpatialBridge->asPartition()->mPartitionType;
bool is_hud = mVObjp->isHUDAttachment();
bool is_attachment = mVObjp->isAttachment() && !is_hud;
bool is_animesh = mVObjp->isAnimatedObject() && mVObjp->getControlAvatar() != NULL;
bool is_attachment = mVObjp->isAttachment() && !is_hud && !is_animesh;
if ((partition_type == LLViewerRegion::PARTITION_HUD) != is_hud)
{
// Was/became HUD
@ -1213,7 +1214,7 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
mSpatialBridge->markDead();
setSpatialBridge(NULL);
}
else if ((partition_type == LLViewerRegion::PARTITION_CONTROL_AV) != (mVObjp->isAnimatedObject() && mVObjp->getControlAvatar() != NULL))
else if ((partition_type == LLViewerRegion::PARTITION_CONTROL_AV) != is_animesh)
{
// Was/became part of animesh
// remove obsolete bridge

35
indra/newview/llvoavatar.cpp
View File

@ -4546,16 +4546,15 @@ void LLVOAvatar::updateFootstepSounds()
}
//------------------------------------------------------------------------
// computeUpdatePeriodAndVisibility()
// computeUpdatePeriod()
// Factored out from updateCharacter()
// Set new value for mUpdatePeriod based on distance and various other factors.
// Returs true if character needs an update
//------------------------------------------------------------------------
BOOL LLVOAvatar::computeUpdatePeriodAndVisibility()
void LLVOAvatar::computeUpdatePeriod()
{
bool visually_muted = isVisuallyMuted();
BOOL is_visible = isVisible(); // includes drawable check
if ( is_visible
if (mDrawable.notNull()
&& isVisible()
&& (!isSelf() || visually_muted)
&& !isUIAvatar()
// <FS:Ansariel> Fix LL impostor hacking; Adjust update period for muted avatars if using no impostors
@ -4604,12 +4603,10 @@ BOOL LLVOAvatar::computeUpdatePeriodAndVisibility()
//nearby avatars, update the impostors more frequently.
mUpdatePeriod = 4;
}
return (LLDrawable::getCurrentFrame() + mID.mData[0]) % mUpdatePeriod == 0 ? TRUE : FALSE;
}
else
{
mUpdatePeriod = 1;
return is_visible;
}
}
@ -4994,16 +4991,17 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
// The rest should only be done occasionally for far away avatars.
// Set mUpdatePeriod and visible based on distance and other criteria.
//--------------------------------------------------------------------
visible = computeUpdatePeriodAndVisibility();
computeUpdatePeriod();
bool needs_update = (LLDrawable::getCurrentFrame()+mID.mData[0])%mUpdatePeriod == 0 ? TRUE : FALSE;
//--------------------------------------------------------------------
// Early out if not visible and not self
// Early out if does not need update and not self
// don't early out for your own avatar, as we rely on your animations playing reliably
// for example, the "turn around" animation when entering customize avatar needs to trigger
// even when your avatar is offscreen
//--------------------------------------------------------------------
// <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
//if (!visible && !isSelf())
//if (!needs_update && !isSelf())
//{
// updateMotions(LLCharacter::HIDDEN_UPDATE);
// return FALSE;
@ -5020,7 +5018,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
// This was originally done in updateTimeStep(), but since that is globally disabled for now, we do it here
mMotionController.setUpdateFactor(mUpdatePeriod);
if (!visible && !isSelf())
if (!needs_update && !isSelf())
{
updateMotions(LLCharacter::HIDDEN_UPDATE);
return FALSE;
@ -5064,7 +5062,11 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
mSpeed = speed;
// update animations
if (mSpecialRenderMode == 1) // Animation Preview
if (!visible)
{
updateMotions(LLCharacter::HIDDEN_UPDATE);
}
else if (mSpecialRenderMode == 1) // Animation Preview
{
updateMotions(LLCharacter::FORCE_UPDATE);
}
@ -5098,10 +5100,13 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
// Update child joints as needed.
mRoot->updateWorldMatrixChildren();
// System avatar mesh vertices need to be reskinned.
mNeedsSkin = TRUE;
if (visible)
{
// System avatar mesh vertices need to be reskinned.
mNeedsSkin = TRUE;
}
return TRUE;
return visible;
}
//-----------------------------------------------------------------------------

2
indra/newview/llvoavatar.h
View File

@ -269,7 +269,7 @@ public:
virtual void updateDebugText();
virtual BOOL updateCharacter(LLAgent &agent);
void updateFootstepSounds();
BOOL computeUpdatePeriodAndVisibility();
void computeUpdatePeriod();
void updateOrientation(LLAgent &agent, F32 speed, F32 delta_time);
void updateTimeStep();
void updateRootPositionAndRotation(LLAgent &agent, F32 speed, bool was_sit_ground_constrained);