Fixing world movement

This commit is contained in:
dingo
2026-02-15 10:20:03 -05:00
parent 054e618e16
commit da271af0d7
+51 -22
View File
@@ -18,7 +18,7 @@ public sealed class WorldHandler : IClientMessageHandler
private const int TileSize = 32;
private const float MoveWalk = 120f;
private const float MoveRun = 180f;
private const float StepSec = 0.05f;
private const float TickStepSec = 0.10f;
private const long PortalCooldownTicks = 8; // 0.8s at 10hz
private readonly ILogger<WorldHandler> _log;
@@ -198,35 +198,25 @@ public sealed class WorldHandler : IClientMessageHandler
}, s.RegionId, s.ConnectionId);
}
private async Task HandleInputAsync(IConnection conn, ulong accountId, ReadOnlyMemory<byte> payload, CancellationToken ct)
private Task HandleInputAsync(IConnection conn, ulong accountId, ReadOnlyMemory<byte> payload, CancellationToken ct)
{
if (!_players.TryGetValue(conn.Id, out var s)) { await SendErrorAsync(conn, "world_not_spawned", ct); return; }
if (s.AccountId != accountId) { await SendErrorAsync(conn, "session_account_mismatch", ct); return; }
if (!_players.TryGetValue(conn.Id, out var s)) { return Task.CompletedTask; }
if (s.AccountId != accountId) { return Task.CompletedTask; }
var req = ParseWorldInput(payload, s.X, s.Y);
if (req == null) { return; }
if (req == null) { return Task.CompletedTask; }
var dx = MathF.Max(-1f, MathF.Min(1f, req.MoveX));
var dy = MathF.Max(-1f, MathF.Min(1f, req.MoveY));
var len = MathF.Sqrt((dx * dx) + (dy * dy));
if (len > 1f) { dx /= len; dy /= len; }
var speed = req.IsRunning ? MoveRun : MoveWalk;
var nextX = s.X + (dx * speed * StepSec);
var nextY = s.Y + (dy * speed * StepSec);
using var scope = _scopeFactory.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<GameDbContext>();
var region = await db.WorldRegions.AsNoTracking().FirstOrDefaultAsync(r => r.Id == s.RegionId && r.IsEnabled, ct);
if (region == null) { s.Errors.Add("region_not_found"); return; }
if (await WalkableAsync(db, region, nextX, s.Y, s.IsVip, ct)) s.X = nextX; else s.Errors.Add("blocked_non_walkable");
if (await WalkableAsync(db, region, s.X, nextY, s.IsVip, ct)) s.Y = nextY; else s.Errors.Add("blocked_non_walkable");
var (zx, zy, cx, cy) = ToChunkPos(region, s.X, s.Y);
s.ZoneX = zx; s.ZoneY = zy; s.ChunkX = cx; s.ChunkY = cy;
s.VelX = dx * speed; s.VelY = dy * speed; s.Speed = speed; s.IsMoving = MathF.Abs(dx) > 0.001f || MathF.Abs(dy) > 0.001f;
s.Facing = Facing(req.Facing, dx, dy, s.Facing); s.Seq = req.Seq;
await TryTriggerPortalAsync(db, region, s, ct);
// Store latest input; movement/collision is applied once per world tick to avoid input backlog.
s.PendingMoveX = dx;
s.PendingMoveY = dy;
s.PendingIsRunning = req.IsRunning;
s.PendingFacing = req.Facing;
s.PendingSeq = req.Seq;
return Task.CompletedTask;
}
private async Task TickLoopAsync(CancellationToken ct)
@@ -255,6 +245,7 @@ public sealed class WorldHandler : IClientMessageHandler
{
var region = await db.WorldRegions.AsNoTracking().FirstOrDefaultAsync(r => r.Id == s.RegionId && r.IsEnabled, ct);
if (region == null) { s.Errors.Add("region_not_found"); continue; }
await ApplyPendingInputAsync(db, region, s, ct);
var updates = await ChunkUpdatesAsync(db, region, s, ct);
var errs = s.Errors.Count == 0 ? null : s.Errors.Distinct().ToArray();
s.Errors.Clear();
@@ -273,6 +264,39 @@ public sealed class WorldHandler : IClientMessageHandler
}
}
private async Task ApplyPendingInputAsync(GameDbContext db, WorldRegion region, SessionState s, CancellationToken ct)
{
var dx = MathF.Max(-1f, MathF.Min(1f, s.PendingMoveX));
var dy = MathF.Max(-1f, MathF.Min(1f, s.PendingMoveY));
var len = MathF.Sqrt((dx * dx) + (dy * dy));
if (len > 1f)
{
dx /= len;
dy /= len;
}
var speed = s.PendingIsRunning ? MoveRun : MoveWalk;
var nextX = s.X + (dx * speed * TickStepSec);
var nextY = s.Y + (dy * speed * TickStepSec);
var moving = MathF.Abs(dx) > 0.001f || MathF.Abs(dy) > 0.001f;
if (moving)
{
if (await WalkableAsync(db, region, nextX, s.Y, s.IsVip, ct)) s.X = nextX; else s.Errors.Add("blocked_non_walkable");
if (await WalkableAsync(db, region, s.X, nextY, s.IsVip, ct)) s.Y = nextY; else s.Errors.Add("blocked_non_walkable");
}
var (zx, zy, cx, cy) = ToChunkPos(region, s.X, s.Y);
s.ZoneX = zx; s.ZoneY = zy; s.ChunkX = cx; s.ChunkY = cy;
s.VelX = moving ? dx * speed : 0f;
s.VelY = moving ? dy * speed : 0f;
s.Speed = moving ? speed : 0f;
s.IsMoving = moving;
s.Facing = Facing(s.PendingFacing, dx, dy, s.Facing);
s.Seq = s.PendingSeq;
await TryTriggerPortalAsync(db, region, s, ct);
}
private IEnumerable<SessionState> VisiblePlayers(SessionState self)
=> _players.Values.Where(p => p.ConnectionId != self.ConnectionId && p.RegionId == self.RegionId && Math.Abs(p.ZoneX - self.ZoneX) <= 1 && Math.Abs(p.ZoneY - self.ZoneY) <= 1 && Math.Abs(p.X - self.X) <= (TileSize * 48) && Math.Abs(p.Y - self.Y) <= (TileSize * 48));
@@ -791,6 +815,11 @@ public sealed class WorldHandler : IClientMessageHandler
public float Speed { get; set; }
public bool IsMoving { get; set; }
public uint Seq { get; set; }
public float PendingMoveX { get; set; }
public float PendingMoveY { get; set; }
public bool PendingIsRunning { get; set; }
public string? PendingFacing { get; set; }
public uint PendingSeq { get; set; }
public Dictionary<string, long> ChunkVersions { get; } = new(StringComparer.Ordinal);
public List<string> Errors { get; } = new();
public object? PendingPortalEvent { get; set; }