space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-06 17:58:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sprite orientation improvements (#917)

Browse Source 
* Fold animation delays into a single set for all directions.

* Update systems to use new RSI animations API.

* Fetching layer directions now done in sprite render.

* Allow overriding direction in SpriteView.
This commit is contained in:
Pieter-Jan Briers
2019-12-24 01:15:44 +01:00
committed by GitHub
parent 761b06d68a
commit 3c08f56619
11 changed files with 607 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Client/GameObjects/EntitySystems/EffectSystem.cs
+4 -4
View File
@@ -297,13 +297,13 @@ namespace Robust.Client.GameObjects
}
// Calculate RSI animations.
var delayCount = RsiState.DelayCount(RSI.State.Direction.South);
var delayCount = RsiState.DelayCount;
if (delayCount > 0 && (AnimationLoops || AnimationIndex < delayCount - 1))
{
AnimationTime += frameTime;
while (RsiState.GetFrame(RSI.State.Direction.South, AnimationIndex).delay < AnimationTime)
while (RsiState.GetDelay(AnimationIndex) < AnimationTime)
{
var (_, delay) = RsiState.GetFrame(RSI.State.Direction.South, AnimationIndex);
var delay = RsiState.GetDelay(AnimationIndex);
AnimationIndex += 1;
AnimationTime -= delay;
if (AnimationIndex == delayCount)
@@ -318,7 +318,7 @@ namespace Robust.Client.GameObjects
}
}
EffectSprite = RsiState.GetFrame(RSI.State.Direction.South, AnimationIndex).icon;
EffectSprite = RsiState.GetFrame(RSI.State.Direction.South, AnimationIndex);
}
}
}