Skip to content

Beta #101

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

Merged
Luc1412 merged 7 commits into from
Dec 1, 2024
Merged

Beta #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01026b5
bump dependencies
Luc1412 Nov 11, 2024
38cb622
Add lossless option for locker image
Luc1412 Nov 11, 2024
5770bca
Upgrade to .net 9
Luc1412 Nov 13, 2024
f16b11f
Bump dependencies
Luc1412 Nov 16, 2024
c6d1c1c
Bump AsyncKeyedLock and AspNetCore
Luc1412 Dec 1, 2024
40366a5
Update formula for calculating map positions
Luc1412 Dec 1, 2024
b322fd0
Merge pull request #100 from EasySystem-Development/main
Luc1412 Dec 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
4 changes: 2 additions & 2 deletions Controllers/LockerImageController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public AccountImageController(IHttpClientFactory clientFactory, AsyncKeyedLocker
}

[HttpPost]
public async Task<IActionResult> Post(Locker locker)
public async Task<IActionResult> Post(Locker locker, [FromQuery] bool? lossless)
{
Console.WriteLine(
$"Locker image request | Name = {locker.PlayerName} | Locale = {locker.Locale} | Items = {locker.Items.Length}");
Expand All @@ -48,7 +48,7 @@ public async Task<IActionResult> 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");
}

Expand Down
10 changes: 5 additions & 5 deletions Controllers/UtilsImageController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
10 changes: 5 additions & 5 deletions EasyFortniteStats-ImageApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>EasyFortniteStats_ImageApi</RootNamespace>
Expand All @@ -10,10 +10,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AsyncKeyedLock" Version="7.0.2" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
<PackageReference Include="AsyncKeyedLock" Version="7.1.4" />
<PackageReference Include="SkiaSharp" Version="2.88.9" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.1.0" />
</ItemGroup>

<!-- Include asset files -->
Expand Down