Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove ISpriteComponent (#13458)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-15 13:38:53 +11:00
committed by GitHub
parent cd10d6fb5e
commit 02aef68dff
40 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/Jittering/JitteringSystem.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Client.Jittering
private void OnStartup(EntityUid uid, JitteringComponent jittering, ComponentStartup args)
{
if (!EntityManager.TryGetComponent(uid, out ISpriteComponent? sprite))
if (!EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
return;
var animationPlayer = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
@@ -52,11 +52,11 @@ namespace Content.Client.Jittering
return;
if(EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer)
&& EntityManager.TryGetComponent(uid, out ISpriteComponent? sprite))
&& EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
animationPlayer.Play(GetAnimation(jittering, sprite), _jitterAnimationKey);
}
private Animation GetAnimation(JitteringComponent jittering, ISpriteComponent sprite)
private Animation GetAnimation(JitteringComponent jittering, SpriteComponent sprite)
{
var amplitude = MathF.Min(4f, jittering.Amplitude / 100f + 1f) / 10f;
var offset = new Vector2(_random.NextFloat(amplitude/4f, amplitude),
@@ -88,8 +88,8 @@ namespace Content.Client.Jittering
{
new AnimationTrackComponentProperty()
{
ComponentType = typeof(ISpriteComponent),
Property = nameof(ISpriteComponent.Offset),
ComponentType = typeof(SpriteComponent),
Property = nameof(SpriteComponent.Offset),
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(sprite.Offset, 0f),