From 01026b5aa7011ef19b072b090677cc21e00365d9 Mon Sep 17 00:00:00 2001 From: Lucas Hardt Date: Mon, 11 Nov 2024 12:22:44 +0100 Subject: [PATCH 1/6] bump dependencies --- EasyFortniteStats-ImageApi.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EasyFortniteStats-ImageApi.csproj b/EasyFortniteStats-ImageApi.csproj index cdd3079..fe1c4b4 100644 --- a/EasyFortniteStats-ImageApi.csproj +++ b/EasyFortniteStats-ImageApi.csproj @@ -10,9 +10,9 @@ - - - + + + From 38cb62238d0606003a3fb837a81500477dad0999 Mon Sep 17 00:00:00 2001 From: Lucas Hardt Date: Mon, 11 Nov 2024 12:24:42 +0100 Subject: [PATCH 2/6] Add lossless option for locker image --- Controllers/LockerImageController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controllers/LockerImageController.cs b/Controllers/LockerImageController.cs index 1d8814d..d244335 100644 --- a/Controllers/LockerImageController.cs +++ b/Controllers/LockerImageController.cs @@ -35,7 +35,7 @@ public AccountImageController(IHttpClientFactory clientFactory, AsyncKeyedLocker } [HttpPost] - public async Task Post(Locker locker) + public async Task Post(Locker locker, [FromQuery] bool? lossless) { Console.WriteLine( $"Locker image request | Name = {locker.PlayerName} | Locale = {locker.Locale} | Items = {locker.Items.Length}"); @@ -48,7 +48,7 @@ public async Task Post(Locker locker) using var lockerBitmap = await GenerateImage(locker); // Determine the quality of the image based on quality mapping and locker.Items.Length - var quality = QualityMapping.FirstOrDefault(x => locker.Items.Length >= x.Count).Quality; + var quality = lossless == true ? 100 : QualityMapping.FirstOrDefault(x => locker.Items.Length >= x.Count).Quality; return File(lockerBitmap.Encode(SKEncodedImageFormat.Jpeg, quality).AsStream(true), "image/jpeg"); } From 5770bcadc2305c367bdebab76afda006146cd241 Mon Sep 17 00:00:00 2001 From: Lucas Hardt Date: Wed, 13 Nov 2024 22:03:38 +0100 Subject: [PATCH 3/6] Upgrade to .net 9 --- Dockerfile | 4 ++-- EasyFortniteStats-ImageApi.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2121936..698d696 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app ENV ASPNETCORE_HTTP_PORTS=80 EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["EasyFortniteStats-ImageApi.csproj", "./"] RUN dotnet restore "EasyFortniteStats-ImageApi.csproj" diff --git a/EasyFortniteStats-ImageApi.csproj b/EasyFortniteStats-ImageApi.csproj index fe1c4b4..36a1eb6 100644 --- a/EasyFortniteStats-ImageApi.csproj +++ b/EasyFortniteStats-ImageApi.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 enable enable EasyFortniteStats_ImageApi From f16b11fbf4929d1506f97c1547c9f261b501ecac Mon Sep 17 00:00:00 2001 From: Lucas Hardt Date: Sun, 17 Nov 2024 00:19:07 +0100 Subject: [PATCH 4/6] Bump dependencies --- EasyFortniteStats-ImageApi.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EasyFortniteStats-ImageApi.csproj b/EasyFortniteStats-ImageApi.csproj index 36a1eb6..50d37b3 100644 --- a/EasyFortniteStats-ImageApi.csproj +++ b/EasyFortniteStats-ImageApi.csproj @@ -13,7 +13,7 @@ - + From c6d1c1cb09a597d57e6e25a24d076710f382b713 Mon Sep 17 00:00:00 2001 From: Lucas Hardt Date: Mon, 2 Dec 2024 00:42:21 +0100 Subject: [PATCH 5/6] Bump AsyncKeyedLock and AspNetCore --- EasyFortniteStats-ImageApi.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EasyFortniteStats-ImageApi.csproj b/EasyFortniteStats-ImageApi.csproj index 50d37b3..55be9e4 100644 --- a/EasyFortniteStats-ImageApi.csproj +++ b/EasyFortniteStats-ImageApi.csproj @@ -10,10 +10,10 @@ - + - + From 40366a508a4944c65271acc503ae06c0a644a247 Mon Sep 17 00:00:00 2001 From: Lucas Hardt Date: Mon, 2 Dec 2024 00:42:44 +0100 Subject: [PATCH 6/6] Update formula for calculating map positions --- Controllers/UtilsImageController.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Controllers/UtilsImageController.cs b/Controllers/UtilsImageController.cs index e98a32b..57ac989 100644 --- a/Controllers/UtilsImageController.cs +++ b/Controllers/UtilsImageController.cs @@ -103,12 +103,12 @@ await _assets.GetBitmap( await _assets.GetBitmap( $"Assets/Images/Map/Markers/{RandomNumberGenerator.GetInt32(markerAmount - 1)}.png"); // don't dispose - const int worldRadius = 150000; - const int xOffset = 0; - const int yOffset = 30; + const int worldRadius = 150_000; + const int xOffset = -60; + const int yOffset = 0; - var mx = ((float) drop.Y + worldRadius) / (worldRadius * 2) * bitmap.Width + xOffset; - var my = (1 - ((float) drop.X + worldRadius) / (worldRadius * 2)) * bitmap.Height + yOffset; + var mx = (drop.X + worldRadius) / (worldRadius * 2f) * bitmap.Width + xOffset; + var my = (drop.Y + worldRadius) / (worldRadius * 2f) * bitmap.Height + yOffset; canvas.DrawBitmap(markerBitmap, mx - (float) markerBitmap!.Width / 2, my - markerBitmap.Height);