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

Improve gliding at non-60FPS #1600

Merged
merged 3 commits into from
Jan 1, 2024
Merged

Improve gliding at non-60FPS #1600

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed38074
Use the frame delta when moving glides
wixoaGit Jan 1, 2024
3970033
Change `MovementPerFrame` name to `MovementSpeed`
wixoaGit Jan 1, 2024
ba0aa92
Merge branch 'master' into improve_gliding
wixoaGit Jan 1, 2024
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
33 changes: 14 additions & 19 deletions OpenDreamClient/Rendering/AtomGlideSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,10 @@ namespace OpenDreamClient.Rendering;
/// Disables RobustToolbox's transform lerping and replaces it with our own gliding
/// </summary>
public sealed class AtomGlideSystem : EntitySystem {
private sealed class Glide {
public readonly TransformComponent Transform;
private sealed class Glide(TransformComponent transform) {
public readonly TransformComponent Transform = transform;
public Vector2 EndPos;
public float MovementPerFrame;

public Glide(TransformComponent transform) {
Transform = transform;
}
public float MovementSpeed;
}

[Dependency] private readonly TransformSystem _transformSystem = default!;
Expand Down Expand Up @@ -48,21 +44,22 @@ public override void FrameUpdate(float frameTime) {
var glide = _currentGlides[i];
var currentPos = glide.Transform.LocalPosition;
var newPos = currentPos;
var movement = glide.MovementSpeed * frameTime;

// Move X towards the end position at a constant speed
if (!MathHelper.CloseTo(currentPos.X, glide.EndPos.X)) {
if (currentPos.X < glide.EndPos.X)
newPos.X = Math.Min(glide.EndPos.X, newPos.X + glide.MovementPerFrame);
newPos.X = Math.Min(glide.EndPos.X, newPos.X + movement);
else if (currentPos.X > glide.EndPos.X)
newPos.X = Math.Max(glide.EndPos.X, newPos.X - glide.MovementPerFrame);
newPos.X = Math.Max(glide.EndPos.X, newPos.X - movement);
}

// Move Y towards the end position at a constant speed
if (!MathHelper.CloseTo(currentPos.Y, glide.EndPos.Y)) {
if (currentPos.Y < glide.EndPos.Y)
newPos.Y = Math.Min(glide.EndPos.Y, newPos.Y + glide.MovementPerFrame);
newPos.Y = Math.Min(glide.EndPos.Y, newPos.Y + movement);
else if (currentPos.Y > glide.EndPos.Y)
newPos.Y = Math.Max(glide.EndPos.Y, newPos.Y - glide.MovementPerFrame);
newPos.Y = Math.Max(glide.EndPos.Y, newPos.Y - movement);
}

if (newPos.EqualsApprox(glide.EndPos)) { // Glide is finished
Expand All @@ -84,7 +81,7 @@ public override void FrameUpdate(float frameTime) {
private void OnTransformMove(ref MoveEvent e) {
if (_ignoreMoveEvent || e.ParentChanged)
return;
if (!_spriteQuery.TryGetComponent(e.Sender, out var sprite))
if (!_spriteQuery.TryGetComponent(e.Sender, out var sprite) || sprite.Icon?.Appearance is null)
return;

_ignoreMoveEvent = true;
Expand Down Expand Up @@ -123,18 +120,16 @@ private void OnTransformMove(ref MoveEvent e) {
_transformSystem.SetLocalPositionNoLerp(e.Sender, startingFrom, e.Component);

glide.EndPos = glidingTo;
glide.MovementPerFrame = CalculateMovementPerFrame(sprite.Icon.Appearance.GlideSize);
glide.MovementSpeed = CalculateMovementSpeed(sprite.Icon.Appearance.GlideSize);
_ignoreMoveEvent = false;
}

private static float CalculateMovementPerFrame(byte glideSize) {
private static float CalculateMovementSpeed(byte glideSize) {
if (glideSize == 0)
glideSize = 4; // TODO: 0 gives us "automated control" over this value, not just setting it to 4

// Assume a 60 FPS client and a 20 TPS server
// TODO: Support other FPS and TPS
var scaling = (60f / 20f);

return glideSize / scaling / EyeManager.PixelsPerMeter;
// Assume a 20 TPS server
// TODO: Support other TPS
return (float)glideSize / EyeManager.PixelsPerMeter * 20f;
}
}
Loading