Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix gliding #1575

Merged
merged 2 commits into from
Dec 30, 2023
Merged

Fix gliding #1575

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8085c96
Fix gliding
Dec 28, 2023
ce0191b
Merge branch 'master' into glidefixtime
ike709 Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions OpenDreamClient/Rendering/AtomGlideSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ public Glide(TransformComponent transform) {
public override void Initialize() {
_spriteQuery = _entityManager.GetEntityQuery<DMISpriteComponent>();

SubscribeLocalEvent<TransformComponent, MoveEvent>(OnTransformMove);

_transformSystem.OnGlobalMoveEvent += OnTransformMove;
}

public override void Shutdown() {
Expand Down Expand Up @@ -80,18 +81,18 @@ public override void FrameUpdate(float frameTime) {
/// <summary>
/// Disables RT lerping and sets up the entity's glide
/// </summary>
private void OnTransformMove(EntityUid entity, TransformComponent transform, ref MoveEvent e) {
private void OnTransformMove(ref MoveEvent e) {
if (_ignoreMoveEvent || e.ParentChanged)
return;
if (!_spriteQuery.TryGetComponent(entity, out var sprite))
if (!_spriteQuery.TryGetComponent(e.Sender, out var sprite))
return;

_ignoreMoveEvent = true;

// Look for any in-progress glides on this transform
Glide? glide = null;
foreach (var potentiallyThisTransform in _currentGlides) {
if (potentiallyThisTransform.Transform != transform)
if (potentiallyThisTransform.Transform != e.Component)
continue;

glide = potentiallyThisTransform;
Expand All @@ -113,13 +114,13 @@ private void OnTransformMove(EntityUid entity, TransformComponent transform, ref
}

if (glide == null) {
glide = new(transform);
glide = new(e.Component);
_currentGlides.Add(glide);
}

// Move the transform to our starting point
// Also serves the function of disabling RT's lerp
_transformSystem.SetLocalPositionNoLerp(transform, startingFrom);
_transformSystem.SetLocalPositionNoLerp(e.Sender, startingFrom, e.Component);

glide.EndPos = glidingTo;
glide.MovementPerFrame = CalculateMovementPerFrame(sprite.Icon.Appearance.GlideSize);
Expand Down
Loading