Skip to content

Commit 7f4a9c8

Browse files
committed
undo
1 parent c66df4c commit 7f4a9c8

File tree

2 files changed

+3
-30
lines changed

2 files changed

+3
-30
lines changed

Assets/FishNet/Runtime/Generated/Component/NetworkAnimator/NetworkAnimator.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -683,10 +683,7 @@ private void InitializeOnce()
683683
{
684684
bool process = !_animator.IsParameterControlledByCurve(item.name);
685685
//PROSTART
686-
/* This is done in a weird way for processing
687-
* to work with the pro tool stripper. */
688-
if (IgnoredParameters.Contains(item.name))
689-
process = false;
686+
690687
//PROEND
691688
if (process)
692689
{

Assets/FishNet/Runtime/Generated/Component/NetworkTransform/NetworkTransform.cs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,25 +1717,7 @@ private void MoveToTarget(float delta)
17171717
else
17181718
{
17191719
//PROSTART
1720-
//Can extrapolate.
1721-
if (td.ExtrapolationState == TransformData.ExtrapolateState.Available)
1722-
{
1723-
rd.TimeRemaining = (float)(_extrapolation * _timeManager.TickDelta);
1724-
td.ExtrapolationState = TransformData.ExtrapolateState.Active;
1725-
if (leftOver > 0f)
1726-
MoveToTarget(leftOver);
1727-
}
1728-
//Ran out of extrapolate.
1729-
else if (td.ExtrapolationState == TransformData.ExtrapolateState.Active)
1730-
{
1731-
rd.TimeRemaining = (float)(_extrapolation * _timeManager.TickDelta);
1732-
td.ExtrapolationState = TransformData.ExtrapolateState.Disabled;
1733-
if (leftOver > 0f)
1734-
MoveToTarget(leftOver);
1735-
}
1736-
//Extrapolation has ended or was never enabled.
1737-
else
1738-
{
1720+
17391721
//PROEND
17401722
/* If everything matches up then end queue.
17411723
* Otherwise let it play out until stuff
@@ -1746,7 +1728,7 @@ private void MoveToTarget(float delta)
17461728
_currentGoalData = null;
17471729
OnInterpolationComplete?.Invoke();
17481730
//PROSTART
1749-
}
1731+
17501732
//PROEND
17511733
}
17521734
}
@@ -2264,13 +2246,7 @@ private void SetExtrapolatedData(TransformData prev, TransformData next, Channel
22642246
next.ExtrapolationState = TransformData.ExtrapolateState.Disabled;
22652247

22662248
//PROSTART
2267-
//Teleports cannot extrapolate.
2268-
if (_extrapolation == 0 || !_synchronizePosition || channel == Channel.Reliable || next.Position == prev.Position)
2269-
return;
22702249

2271-
Vector3 offet = (next.Position - prev.Position) * _extrapolation;
2272-
next.ExtrapolatedPosition = next.Position + offet;
2273-
next.ExtrapolationState = TransformData.ExtrapolateState.Available;
22742250
//PROEND
22752251
}
22762252

0 commit comments

Comments
 (0)