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

Merge Firestorm LGPL

master
Ansariel 2017-08-23 09:35:01 +02:00
parent 0d9b019b42 f3905345b1
commit a2d1b201aa
5 changed files with 26 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcharacter/llmotioncontroller.cpp
View File

@ -129,6 +129,7 @@ LLMotion *LLMotionRegistry::createMotion( const LLUUID &id )
//-----------------------------------------------------------------------------
LLMotionController::LLMotionController()
: mTimeFactor(sCurrentTimeFactor),
mUpdateFactor(1.f), // <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
mCharacter(NULL),
mAnimTime(0.f),
mPrevTimerElapsed(0.f),
@ -828,7 +829,10 @@ void LLMotionController::updateMotions(bool force_update)
// Update timing info for this time step.
if (!mPaused)
{
F32 update_time = mAnimTime + delta_time * mTimeFactor;
// <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
//F32 update_time = mAnimTime + delta_time * mTimeFactor;
F32 update_time = mAnimTime + delta_time * mTimeFactor * mUpdateFactor;
// </FS:Ansariel>
if (use_quantum)
{
F32 time_interval = fmodf(update_time, mTimeStep);

4
indra/llcharacter/llmotioncontroller.h
View File

@ -154,6 +154,9 @@ public:
void setTimeFactor(F32 time_factor);
F32 getTimeFactor() const { return mTimeFactor; }
// <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
void setUpdateFactor(F32 update_factor) { mUpdateFactor = update_factor; }
motion_list_t& getActiveMotions() { return mActiveMotions; }
void incMotionCounts(S32& num_motions, S32& num_loading_motions, S32& num_loaded_motions, S32& num_active_motions, S32& num_deprecated_motions);
@ -191,6 +194,7 @@ protected:
protected:
F32 mTimeFactor; // 1.f for normal speed
static F32 sCurrentTimeFactor; // Value to use for initialization
F32 mUpdateFactor; // <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
static LLMotionRegistry sRegistry;
LLPoseBlender mPoseBlender;

34
indra/lscript/README
View File

@ -1,34 +0,0 @@
We no longer use lscript in Firestorm. legacy LSO compilation is no longer used in
Second Life or OpenSim, and this removes the dependency on Bison for building along
with continued compatibility problems with the build system (OSX 10.8, Opensuse 12.3, etc)
This directory is not used as of Rev 34229.
--
Cinder
Please enjoy this ascii-art.
____
\%%%%%%;.
\%%%%%%%%;..
.\. (%%%%%%%%%%%%;.
.;%%%;. %%%%%%%%%%%%%%%%%;.
%%%%%%%%; %%%%%%%%%%%%%%%%%%%%%;.
%%%%%%%%%)__(%%%%%%%%%%%%%%%%%%%%%%%%;.
;%%%%%% /%%%%%\ %%%%%%%%%%%%%%%%%%%%%%%;
\%% /%/'''\%%%\ %%%%%%%%%%%%%%%%%%%%%%%;
'%%%%%%%\. \%%|/%%%%%%%%%%%%%%%%%%%%%%; %%
.;%%%%%%%%%%\|%%%%%%%%%%%%%%%%%%%%%%%%%% %%%
(%CCC%%%%CCC%\%%%%%%%%%%%%%%%%%%%%%%%%%/ %%%%
%% !/ \%%%%%%%%%%%%%%%%%%%%%%/ %%%%%%
.% %%% \%%%%%%%%%%%%%/'%%%%%%%%%
.__\\/__. .%%% o o %%%% %%%%%%%%%%%/'%%%%%%%%%%%
\.;%%%%%%%%%;.'%% %%%% ,%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%/ %___.!. /%%%% ,%%%%%%%% \%%%%%%%%%%%%%
\%% %%% %%/ %%%%%%\ /%%%% ,%%%%%%%%% |%%%%%%%%%%%%%
/%% %%% %% %%%%%%%)?**&%%%% ,%%%%%%%%%%; |%%%%%%%%%%%%%
%% %%% %% %%%%%%%%%%%%%/ ,%%%%%%%%%%%/ /%%%%%%%%%%%%%%
/%%% %%%%% %%% %%%%%%%;/',;/%%%%%%%%%;;../%%%%%%%%%%%%%%%%%
%%%%%%/'''\%%%%%% ='''\\ \%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//'' ''\\

22
indra/newview/llpanelmaininventory.cpp
View File

@ -1703,28 +1703,6 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
}
LLFloaterReg::showInstance("linkreplace", params);
}
// <FS:Ansariel> Inventory Links Replace
if (command_name == "replace_links")
{
LLSD params;
LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
if (current_item)
{
LLInvFVBridge* bridge = (LLInvFVBridge*)current_item->getViewModelItem();
if (bridge)
{
LLInventoryObject* obj = bridge->getInventoryObject();
if (obj && obj->getType() != LLAssetType::AT_CATEGORY && obj->getActualType() != LLAssetType::AT_LINK_FOLDER)
{
params = LLSD(obj->getUUID());
}
}
}
LLFloaterReg::showInstance("fs_linkreplace", params);
}
// </FS:Ansariel>
}
void LLPanelMainInventory::onVisibilityChange( BOOL new_visibility )

22
indra/newview/llvoavatar.cpp
View File

@ -4102,11 +4102,13 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
// 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
if (!visible && !isSelf())
{
updateMotions(LLCharacter::HIDDEN_UPDATE);
return FALSE;
}
// <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
//if (!visible && !isSelf())
//{
// updateMotions(LLCharacter::HIDDEN_UPDATE);
// return FALSE;
//}
// </FS:Ansariel>
// <FS:Zi> Optionally disable the usage of timesteps, testing if this affects performance or
// creates animation issues - FIRE-3657
@ -4126,6 +4128,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
removeAnimationData("Walk Speed");
}
mMotionController.setTimeStep(time_step);
mMotionController.setUpdateFactor(mUpdatePeriod); // <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
// LL_INFOS() << "Setting timestep to " << time_quantum * pixel_area_scale << LL_ENDL;
}
// <FS:Zi> Optionally disable the usage of timesteps, testing if this affects performance or
@ -4133,9 +4136,18 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
else
{
mMotionController.setTimeStep(0.0f);
mMotionController.setUpdateFactor(mUpdatePeriod); // <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
}
// </FS:Zi>
// <FS:Ansariel> Fix impostered animation speed based on a fix by Henri Beauchamp
if (!visible && !isSelf())
{
updateMotions(LLCharacter::HIDDEN_UPDATE);
return FALSE;
}
// </FS:Ansariel>
if (getParent() && !mIsSitting)
{
sitOnObject((LLViewerObject*)getParent());