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

Jittering System Fix + Cleanup (#20921)

Browse Source
This commit is contained in:
Psychpsyo
2023-10-12 00:57:09 +02:00
committed by GitHub
parent b53f10fbb2
commit 1508f513bf
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,7 @@
using System;
using System.Collections.Immutable;
using System.Numerics; using System.Numerics;
using Content.Shared.Jittering; using Content.Shared.Jittering;
using Robust.Client.Animations; using Robust.Client.Animations;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Shared.Animations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Random; using Robust.Shared.Random;
namespace Content.Client.Jittering namespace Content.Client.Jittering
@@ -15,6 +9,7 @@ namespace Content.Client.Jittering
public sealed class JitteringSystem : SharedJitteringSystem public sealed class JitteringSystem : SharedJitteringSystem
{ {
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!;
private readonly float[] _sign = { -1, 1 }; private readonly float[] _sign = { -1, 1 };
private readonly string _jitterAnimationKey = "jittering"; private readonly string _jitterAnimationKey = "jittering";
@@ -35,13 +30,13 @@ namespace Content.Client.Jittering
var animationPlayer = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid); var animationPlayer = EntityManager.EnsureComponent<AnimationPlayerComponent>(uid);
animationPlayer.Play(GetAnimation(jittering, sprite), _jitterAnimationKey); _animationPlayer.Play(animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);
} }
private void OnShutdown(EntityUid uid, JitteringComponent jittering, ComponentShutdown args) private void OnShutdown(EntityUid uid, JitteringComponent jittering, ComponentShutdown args)
{ {
if (EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer)) if (EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer))
animationPlayer.Stop(_jitterAnimationKey); _animationPlayer.Stop(animationPlayer, _jitterAnimationKey);
if (EntityManager.TryGetComponent(uid, out SpriteComponent? sprite)) if (EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
sprite.Offset = Vector2.Zero; sprite.Offset = Vector2.Zero;
@@ -52,9 +47,9 @@ namespace Content.Client.Jittering
if(args.Key != _jitterAnimationKey) if(args.Key != _jitterAnimationKey)
return; return;
if(EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer) if (EntityManager.TryGetComponent(uid, out AnimationPlayerComponent? animationPlayer)
&& EntityManager.TryGetComponent(uid, out SpriteComponent? sprite)) && EntityManager.TryGetComponent(uid, out SpriteComponent? sprite))
animationPlayer.Play(GetAnimation(jittering, sprite), _jitterAnimationKey); _animationPlayer.Play(animationPlayer, GetAnimation(jittering, sprite), _jitterAnimationKey);
} }
private Animation GetAnimation(JitteringComponent jittering, SpriteComponent sprite) private Animation GetAnimation(JitteringComponent jittering, SpriteComponent sprite)
@@ -77,8 +72,10 @@ namespace Content.Client.Jittering
offset.Y *= -1; offset.Y *= -1;
} }
// Animation length shouldn't be too high so we will cap it at 2 seconds... var length = 0f;
var length = Math.Min((1f/jittering.Frequency), 2f); // avoid dividing by 0 so animations don't try to be infinitely long
if (jittering.Frequency > 0)
length = 1f / jittering.Frequency;
jittering.LastJitter = offset; jittering.LastJitter = offset;

2
Content.Shared/Jittering/SharedJitteringSystem.cs
View File

@@ -72,7 +72,7 @@ namespace Content.Shared.Jittering
var jitter = EnsureComp<JitteringComponent>(uid); var jitter = EnsureComp<JitteringComponent>(uid);
jitter.Amplitude = amplitude; jitter.Amplitude = amplitude;
jitter.Frequency = frequency; jitter.Frequency = frequency;
Dirty(jitter); Dirty(uid, jitter);
} }
} }
} }