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

SL-726, SL-718 - refactoring updateCharacter()

meow-7.2.2
Brad Payne (Vir Linden) 2017-09-11 21:40:39 +01:00
parent 2aa890da0b
commit fff9dde8a8
4 changed files with 534 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llcontrolavatar.cpp
View File

@ -210,7 +210,6 @@ void LLControlAvatar::markForDeath()
mMarkedForDeath = true;
}
// static
void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
{
if (mMarkedForDeath)
@ -224,6 +223,11 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
}
}
BOOL LLControlAvatar::updateCharacter(LLAgent &agent)
{
return LLVOAvatar::updateCharacter(agent);
}
//virtual
void LLControlAvatar::updateDebugText()
{

1
indra/newview/llcontrolavatar.h
View File

@ -51,6 +51,7 @@ public:
void markForDeath();
virtual void idleUpdate(LLAgent &agent, const F64 &time);
virtual BOOL updateCharacter(LLAgent &agent);
void getAnimatedVolumes(std::vector<LLVOVolume*>& volumes);
void updateAnimations();

961
indra/newview/llvoavatar.cpp
View File

File diff suppressed because it is too large Load Diff

4
indra/newview/llvoavatar.h
View File

@ -245,6 +245,10 @@ private: //aligned members
public:
virtual void updateDebugText();
virtual BOOL updateCharacter(LLAgent &agent);
void updateFootstepSounds();
void computeUpdatePeriod();
void updateOrientation(LLAgent &agent, F32 speed, F32 delta_time);
void updateTimeStep();
void idleUpdateVoiceVisualizer(bool voice_enabled);
void idleUpdateMisc(bool detailed_update);
virtual void idleUpdateAppearanceAnimation();