make big display toggleable

This commit is contained in:
Vinzenz Schroeter 2024-04-07 20:16:22 +02:00
commit dc9ad21a3d
29 changed files with 119 additions and 46 deletions

View file

@ -1,4 +1,5 @@
using TanksServer.Helpers; using TanksServer.Helpers;
using TanksServer.Services;
namespace TanksServer.DrawSteps; namespace TanksServer.DrawSteps;

View file

@ -1,4 +1,6 @@
using TanksServer.Helpers; using TanksServer.Helpers;
using TanksServer.Models;
using TanksServer.Services;
namespace TanksServer.DrawSteps; namespace TanksServer.DrawSteps;

View file

@ -1,6 +1,7 @@
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.PixelFormats;
using TanksServer.Helpers; using TanksServer.Helpers;
using TanksServer.Services;
namespace TanksServer.DrawSteps; namespace TanksServer.DrawSteps;

View file

@ -1,8 +1,7 @@
global using System; global using System;
global using System.Collections.Concurrent;
global using System.Collections.Generic; global using System.Collections.Generic;
global using System.Linq; global using System.Linq;
global using System.Threading; global using System.Threading;
global using System.Threading.Tasks; global using System.Threading.Tasks;
global using Microsoft.Extensions.Options; global using Microsoft.Extensions.Options;
global using TanksServer.Models;
global using TanksServer.Services;

View file

@ -1,4 +1,5 @@
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using TanksServer.Models;
namespace TanksServer.Helpers; namespace TanksServer.Helpers;

View file

@ -1,4 +1,6 @@
using System.Diagnostics; using System.Diagnostics;
using TanksServer.Models;
using TanksServer.Services;
namespace TanksServer.Helpers; namespace TanksServer.Helpers;

View file

@ -1,7 +1,8 @@
namespace TanksServer.Services; namespace TanksServer.Models;
internal sealed class ServicePointDisplayConfiguration internal sealed class ServicePointDisplayConfiguration
{ {
public bool Enable { get; set; } = true;
public string Hostname { get; set; } = string.Empty; public string Hostname { get; set; } = string.Empty;
public int Port { get; set; } public int Port { get; set; }
} }

View file

@ -6,7 +6,9 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
using TanksServer.DrawSteps; using TanksServer.DrawSteps;
using TanksServer.Helpers; using TanksServer.Helpers;
using TanksServer.Models;
using TanksServer.Servers; using TanksServer.Servers;
using TanksServer.Services;
using TanksServer.TickSteps; using TanksServer.TickSteps;
namespace TanksServer; namespace TanksServer;
@ -74,14 +76,17 @@ internal static class Program
options.SerializerOptions.TypeInfoResolverChain.Insert(0, new AppSerializerContext()); options.SerializerOptions.TypeInfoResolverChain.Insert(0, new AppSerializerContext());
}); });
builder.Services.AddOptions();
builder.Services.AddSingleton<MapService>(); builder.Services.AddSingleton<MapService>();
builder.Services.AddSingleton<BulletManager>(); builder.Services.AddSingleton<BulletManager>();
builder.Services.AddSingleton<TankManager>(); builder.Services.AddSingleton<TankManager>();
builder.Services.AddSingleton<SpawnNewTanks>(); builder.Services.AddSingleton<SpawnNewTanks>();
builder.Services.AddSingleton<PixelDrawer>();
builder.Services.AddSingleton<ControlsServer>(); builder.Services.AddSingleton<ControlsServer>();
builder.Services.AddSingleton<PlayerServer>(); builder.Services.AddSingleton<PlayerServer>();
builder.Services.AddSingleton<ClientScreenServer>(); builder.Services.AddSingleton<ClientScreenServer>();
builder.Services.AddSingleton<LastFinishedFrameProvider>();
builder.Services.AddSingleton<SpawnQueueProvider>();
builder.Services.AddHostedService<GameTickService>(); builder.Services.AddHostedService<GameTickService>();
builder.Services.AddHostedService(sp => sp.GetRequiredService<ControlsServer>()); builder.Services.AddHostedService(sp => sp.GetRequiredService<ControlsServer>());
@ -94,7 +99,7 @@ internal static class Program
builder.Services.AddSingleton<ITickStep, MoveTanks>(); builder.Services.AddSingleton<ITickStep, MoveTanks>();
builder.Services.AddSingleton<ITickStep, ShootFromTanks>(); builder.Services.AddSingleton<ITickStep, ShootFromTanks>();
builder.Services.AddSingleton<ITickStep>(sp => sp.GetRequiredService<SpawnNewTanks>()); builder.Services.AddSingleton<ITickStep>(sp => sp.GetRequiredService<SpawnNewTanks>());
builder.Services.AddSingleton<ITickStep>(sp => sp.GetRequiredService<PixelDrawer>()); builder.Services.AddSingleton<ITickStep, DrawStateToFrame>();
builder.Services.AddSingleton<ITickStep, SendToServicePointDisplay>(); builder.Services.AddSingleton<ITickStep, SendToServicePointDisplay>();
builder.Services.AddSingleton<ITickStep, SendToClientScreen>(); builder.Services.AddSingleton<ITickStep, SendToClientScreen>();
@ -102,6 +107,9 @@ internal static class Program
builder.Services.AddSingleton<IDrawStep, TankDrawer>(); builder.Services.AddSingleton<IDrawStep, TankDrawer>();
builder.Services.AddSingleton<IDrawStep, BulletDrawer>(); builder.Services.AddSingleton<IDrawStep, BulletDrawer>();
builder.Services.Configure<ServicePointDisplayConfiguration>(
builder.Configuration.GetSection("ServicePointDisplay"));
return builder.Build(); return builder.Build();
} }
} }

View file

@ -1,4 +1,3 @@
using System.Collections.Concurrent;
using System.Diagnostics; using System.Diagnostics;
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Threading.Channels; using System.Threading.Channels;

View file

@ -2,6 +2,7 @@ using System.Net.WebSockets;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using TanksServer.Helpers; using TanksServer.Helpers;
using TanksServer.Models;
namespace TanksServer.Servers; namespace TanksServer.Servers;

View file

@ -1,11 +1,11 @@
using System.Collections.Concurrent;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using TanksServer.TickSteps; using TanksServer.Models;
using TanksServer.Services;
namespace TanksServer.Servers; namespace TanksServer.Servers;
internal sealed class PlayerServer(ILogger<PlayerServer> logger, SpawnNewTanks spawnNewTanks) internal sealed class PlayerServer(ILogger<PlayerServer> logger, SpawnQueueProvider spawnQueueProvider)
{ {
private readonly ConcurrentDictionary<string, Player> _players = new(); private readonly ConcurrentDictionary<string, Player> _players = new();
@ -33,7 +33,7 @@ internal sealed class PlayerServer(ILogger<PlayerServer> logger, SpawnNewTanks s
private Player AddAndSpawn(string name) private Player AddAndSpawn(string name)
{ {
var player = new Player(name); var player = new Player(name);
spawnNewTanks.SpawnTankForPlayer(player); spawnQueueProvider.Queue.Enqueue(player);
return player; return player;
} }
} }

View file

@ -1,3 +1,5 @@
using TanksServer.Models;
namespace TanksServer.Services; namespace TanksServer.Services;
internal sealed class BulletManager internal sealed class BulletManager

View file

@ -1,9 +1,12 @@
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using TanksServer.TickSteps; using TanksServer.TickSteps;
namespace TanksServer.Services; namespace TanksServer.Services;
internal sealed class GameTickService(IEnumerable<ITickStep> steps) : IHostedService, IDisposable internal sealed class GameTickService(
IEnumerable<ITickStep> steps, IHostApplicationLifetime lifetime, ILogger<GameTickService> logger
) : IHostedService, IDisposable
{ {
private readonly CancellationTokenSource _cancellation = new(); private readonly CancellationTokenSource _cancellation = new();
private readonly List<ITickStep> _steps = steps.ToList(); private readonly List<ITickStep> _steps = steps.ToList();
@ -17,11 +20,19 @@ internal sealed class GameTickService(IEnumerable<ITickStep> steps) : IHostedSer
private async Task RunAsync() private async Task RunAsync()
{ {
while (!_cancellation.IsCancellationRequested) try
{ {
foreach (var step in _steps) while (!_cancellation.IsCancellationRequested)
await step.TickAsync(); {
await Task.Delay(1000/25); foreach (var step in _steps)
await step.TickAsync();
await Task.Delay(1000 / 25);
}
}
catch (Exception ex)
{
logger.LogError(ex, "game tick service crashed");
lifetime.StopApplication();
} }
} }

View file

@ -0,0 +1,14 @@
using TanksServer.Helpers;
namespace TanksServer.Services;
internal sealed class LastFinishedFrameProvider
{
private DisplayPixelBuffer? _lastFrame;
public DisplayPixelBuffer LastFrame
{
get => _lastFrame ?? throw new InvalidOperationException("first frame not yet drawn");
set => _lastFrame = value;
}
}

View file

@ -1,3 +1,5 @@
using TanksServer.Models;
namespace TanksServer.Services; namespace TanksServer.Services;
internal sealed class MapService internal sealed class MapService

View file

@ -0,0 +1,8 @@
using TanksServer.Models;
namespace TanksServer.Services;
internal sealed class SpawnQueueProvider
{
public ConcurrentQueue<Player> Queue { get; } = new();
}

View file

@ -1,6 +1,6 @@
using System.Collections; using System.Collections;
using System.Collections.Concurrent;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using TanksServer.Models;
namespace TanksServer.Services; namespace TanksServer.Services;

View file

@ -16,6 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
</ItemGroup> </ItemGroup>

View file

@ -1,4 +1,6 @@
using TanksServer.Helpers; using TanksServer.Helpers;
using TanksServer.Models;
using TanksServer.Services;
namespace TanksServer.TickSteps; namespace TanksServer.TickSteps;

View file

@ -1,3 +1,6 @@
using TanksServer.Models;
using TanksServer.Services;
namespace TanksServer.TickSteps; namespace TanksServer.TickSteps;
internal sealed class CollideBulletsWithTanks(BulletManager bullets) : ITickStep internal sealed class CollideBulletsWithTanks(BulletManager bullets) : ITickStep

Some files were not shown because too many files have changed in this diff Show more