Merge pull request #151 from TeamWheelWizard/MiiEditor

feat/Mii editor

Author: patchzyy

WheelWizard.Test/Features/MiiDbServiceTests.cs

@@ -18,8 +18,6 @@ Task<Stream> GetImageAsync(
         int instanceCount = 1,
         int cameraXRotate = 0,
         int cameraYRotate = 0,
-        int cameraZRotate = 0,
-        string lightDirectionMode = "none",
-        string instanceRotationMode = "model"
+        int cameraZRotate = 0
     );
 }

WheelWizard/Features/MiiImages/Domain/IMiiIMagesApi.cs

@@ -6,6 +6,7 @@ namespace WheelWizard.MiiImages.Domain;
 
 public class MiiImageSpecifications
 {
+    // IMPORTANT: if you change this, make sure you also edit the Clone method in the extensions of this feature
     public string Name { get; set; } = string.Empty;
     public ImageSize Size { get; set; } = ImageSize.small;
     public FaceExpression Expression { get; set; } = FaceExpression.normal;
@@ -23,7 +24,11 @@ public class MiiImageSpecifications
     public override string ToString()
     {
         // If we put all the things in this string, then the Key at least is unique
-        return $"{Name}_{Size}{Expression}{Type}_{BackgroundColor}{InstanceCount}_{CharacterRotate}{CameraRotate}_{CachePriority}";
+        var parts = $"{Name}_{Size}{Expression}{Type}";
+        parts += $"{BackgroundColor}{InstanceCount}";
+        parts += $"{CharacterRotate}{CameraRotate}";
+        parts += $"{CachePriority}";
+        return Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(parts));
     }
 
     #region Enums
@@ -32,12 +37,24 @@ public override string ToString()
     public enum FaceExpression
     {
         normal,
+        normal_open_mouth,
         smile,
+        smile_open_mouth,
         frustrated,
         anger,
+        anger_open_mouth,
         blink,
+        blink_open_mouth,
         sorrow,
+        sorrow_open_mouth,
         surprise,
+        surprise_open_mouth,
+        wink_right,
+        wink_left,
+        like_wink_left,
+        like_wink_right,
+        wink_left_open_mouth,
+        wink_right_open_mouth,
     }
 
     public enum ImageSize
@@ -49,6 +66,7 @@ public enum ImageSize
     public enum BodyType
     {
         face,
+        face_only,
         all_body,
     }
 

WheelWizard/Features/MiiImages/Domain/MiiImageSpecifications.cs

@@ -14,6 +14,14 @@ public static class MiiImageVariants
         CachePriority = CacheItemPriority.High,
     };
 
+    public static readonly MiiImageSpecifications MiiBlockProfile = new()
+    {
+        Name = "MiiBlockProfile",
+        Expression = MiiImageSpecifications.FaceExpression.normal,
+        Type = MiiImageSpecifications.BodyType.face,
+        Size = MiiImageSpecifications.ImageSize.medium,
+    };
+
     public static readonly MiiImageSpecifications OnlinePlayerSmall = new()
     {
         Name = "OnlinePlayerSmall",
@@ -23,8 +31,29 @@ public static class MiiImageVariants
         CachePriority = CacheItemPriority.Low,
     };
 
+    public static readonly MiiImageSpecifications MiiEditorSmall = new()
+    {
+        Name = "MiiEditorPreviewSmall",
+        Expression = MiiImageSpecifications.FaceExpression.normal,
+        Type = MiiImageSpecifications.BodyType.face,
+        Size = MiiImageSpecifications.ImageSize.medium,
+        ExpirationSeconds = TimeSpan.FromSeconds(30),
+        CachePriority = CacheItemPriority.Low,
+    };
+    public static readonly MiiImageSpecifications MiiEditorPreviewCarousel = new()
+    {
+        Name = "MiiEditorPreviewCarousel",
+        Expression = MiiImageSpecifications.FaceExpression.normal,
+        Type = MiiImageSpecifications.BodyType.all_body,
+        Size = MiiImageSpecifications.ImageSize.medium,
+        CachePriority = CacheItemPriority.Low,
+        ExpirationSeconds = TimeSpan.FromSeconds(30),
+        InstanceCount = 8,
+    };
+
     public static readonly MiiImageSpecifications CurrentUserSideProfile = new()
     {
+        Name = "CurrentUserSideProfile",
         Expression = MiiImageSpecifications.FaceExpression.normal,
         Type = MiiImageSpecifications.BodyType.face,
         Size = MiiImageSpecifications.ImageSize.medium,
@@ -33,6 +62,7 @@ public static class MiiImageVariants
     };
     public static readonly MiiImageSpecifications FriendsSideProfile = new()
     {
+        Name = "FriendsSideProfile",
         Expression = MiiImageSpecifications.FaceExpression.normal,
         Type = MiiImageSpecifications.BodyType.face,
         Size = MiiImageSpecifications.ImageSize.medium,
@@ -43,9 +73,11 @@ public static class MiiImageVariants
 
     public static readonly MiiImageSpecifications FullBodyCarousel = new()
     {
+        Name = "FullBodyCarousel",
         Expression = MiiImageSpecifications.FaceExpression.normal,
         Type = MiiImageSpecifications.BodyType.all_body,
         Size = MiiImageSpecifications.ImageSize.medium,
+        ExpirationSeconds = TimeSpan.FromMinutes(10),
         InstanceCount = 8,
     };
 }

WheelWizard/Features/MiiImages/Domain/MiiImageVariants.cs

@@ -1,3 +1,4 @@
+using System.Numerics;
 using WheelWizard.MiiImages.Domain;
 using WheelWizard.Services;
 
@@ -13,4 +14,24 @@ public static IServiceCollection AddMiiImages(this IServiceCollection services)
 
         return services;
     }
+
+    public static MiiImageSpecifications Clone(this MiiImageSpecifications specifications)
+    {
+        return new MiiImageSpecifications
+        {
+            Name = specifications.Name,
+            Size = specifications.Size,
+            Expression = specifications.Expression,
+            Type = specifications.Type,
+            BackgroundColor = specifications.BackgroundColor,
+            InstanceCount = specifications.InstanceCount,
+            CharacterRotate = new(specifications.CharacterRotate.X, specifications.CharacterRotate.Y, specifications.CharacterRotate.Z),
+            CameraRotate = new(specifications.CameraRotate.X, specifications.CameraRotate.Y, specifications.CameraRotate.Z),
+            ExpirationSeconds =
+                specifications.ExpirationSeconds?.TotalSeconds == null
+                    ? null
+                    : TimeSpan.FromSeconds(specifications.ExpirationSeconds.Value.TotalSeconds),
+            CachePriority = specifications.CachePriority,
+        };
+    }
 }

WheelWizard/Features/MiiImages/MiiImagesExtensions.cs

@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using Avalonia.Media.Imaging;
 using Microsoft.Extensions.Caching.Memory;
 using WheelWizard.MiiImages.Domain;
@@ -13,30 +14,56 @@ public interface IMiiImagesSingletonService
 
 public class MiiImagesSingletonService(IApiCaller<IMiiIMagesApi> apiCaller, IMemoryCache cache) : IMiiImagesSingletonService
 {
+    // Track in-flight requests to prevent duplicate API calls
+    private readonly ConcurrentDictionary<string, SemaphoreSlim> _inFlightRequests = new();
+
     public async Task<OperationResult<Bitmap>> GetImageAsync(Mii? mii, MiiImageSpecifications specifications)
     {
         var data = MiiStudioDataSerializer.Serialize(mii);
         if (data.IsFailure)
             return data.Error;
 
         var miiConfigKey = data.Value + specifications;
-        var isCached = cache.TryGetValue(miiConfigKey, out Bitmap? cachedValue);
-        if (isCached)
+
+        // Even tho we also check it in the semaphore section, we also check here if it's in the cache, just to be tad faster.
+        if (cache.TryGetValue(miiConfigKey, out Bitmap? cachedValue))
             return cachedValue ?? Fail<Bitmap>("Cached image is null.");
 
-        var newImageResult = await apiCaller.CallApiAsync(api => GetBitmapAsync(api, data.Value, specifications));
-        Bitmap? newImage = null;
-        if (newImageResult.IsSuccess)
-            newImage = newImageResult.Value;
+        var requestSemaphore = _inFlightRequests.GetOrAdd(miiConfigKey, _ => new(1, 1));
 
-        using (var entry = cache.CreateEntry(miiConfigKey))
+        try
         {
-            entry.Value = newImage;
-            entry.SlidingExpiration = specifications.ExpirationSeconds;
-            entry.Priority = specifications.CachePriority;
-        }
+            // Wait to acquire the semaphore - only the first request will proceed immediately
+            await requestSemaphore.WaitAsync();
+
+            // Double-check the cache after acquiring the semaphore
+            // Another thread might have completed the request while we were waiting
+            if (cache.TryGetValue(miiConfigKey, out Bitmap? doubleCheckCached))
+                return doubleCheckCached ?? Fail<Bitmap>("Cached image is null.");
+
+            // If we get here, we're the first request and need to call the API
+            var newImageResult = await apiCaller.CallApiAsync(api => GetBitmapAsync(api, data.Value, specifications));
 
-        return newImage ?? Fail<Bitmap>("Failed to get new image.");
+            Bitmap? newImage = null;
+            if (newImageResult.IsSuccess)
+                newImage = newImageResult.Value;
+
+            using (var entry = cache.CreateEntry(miiConfigKey))
+            {
+                entry.Value = newImage;
+                entry.SlidingExpiration = specifications.ExpirationSeconds;
+                entry.Priority = specifications.CachePriority;
+            }
+
+            return newImage ?? Fail<Bitmap>("Failed to get new image.");
+        }
+        finally
+        {
+            // We can also do it all without try catch. But we need to make sure that whatever happens, we release the semaphore
+            // So just to be safe, if anything happens, we release the semaphore anyway.
+            requestSemaphore.Release();
+            _inFlightRequests.TryRemove(miiConfigKey, out _);
+        }
     }
 
     private static async Task<Bitmap> GetBitmapAsync(IMiiIMagesApi api, string data, MiiImageSpecifications specifications)

WheelWizard/Features/MiiImages/MiiImagesSingletonService.cs

@@ -35,7 +35,8 @@ public static OperationResult<string> Serialize(Mii? mii)
         visualMiiClone.MiiMole = mii.MiiMole;
         visualMiiClone.MiiFavoriteColor = mii.MiiFavoriteColor;
         visualMiiClone.MiiFacial = mii.MiiFacial;
-        visualMiiClone.MiiId = 1; // Mii ID cant be 0 if you want to serialize it so...
+        // If id is 0, we keep it 0, any other ID will be set to 1.
+        visualMiiClone.MiiId = (uint)(mii.MiiId == 0 ? 0 : 1);
 
         var serialized = MiiSerializer.Serialize(visualMiiClone);
         if (serialized.IsFailure)

WheelWizard/Features/MiiImages/MiiStudioDataSerializer.cs

@@ -12,25 +12,53 @@ public class Mii
     public MiiScale Height { get; set; } = new(1);
     public MiiScale Weight { get; set; } = new(1);
 
-    //Mii ID is also referred as Avatar  ID
-    public uint MiiId { get; set; }
+    public bool IsForeign => (MiiId1 >> 5) == 0b110; // checks if the top 3 bits are set to 110, if so it got blue pants
+
+    //Mii ID is also refered as Avatar  ID
+    public byte MiiId1 { get; set; }
+    public byte MiiId2 { get; set; }
+    public byte MiiId3 { get; set; }
+    public byte MiiId4 { get; set; }
+
+    public uint MiiId
+    {
+        get => (uint)(MiiId1 << 24 | MiiId2 << 16 | MiiId3 << 8 | MiiId4);
+        set
+        {
+            MiiId1 = (byte)(value >> 24);
+            MiiId2 = (byte)(value >> 16);
+            MiiId3 = (byte)(value >> 8);
+            MiiId4 = (byte)(value);
+        }
+    }
 
     //This is also referred as Client ID
     public byte SystemId0 { get; set; }
     public byte SystemId1 { get; set; }
     public byte SystemId2 { get; set; }
     public byte SystemId3 { get; set; }
 
+    public uint SystemId
+    {
+        get => (uint)(SystemId0 << 24 | SystemId1 << 16 | SystemId2 << 8 | SystemId3);
+        set
+        {
+            SystemId0 = (byte)(value >> 24);
+            SystemId1 = (byte)(value >> 16);
+            SystemId2 = (byte)(value >> 8);
+            SystemId3 = (byte)(value);
+        }
+    }
+
     public MiiFacialFeatures MiiFacial { get; set; } = new(MiiFaceShape.Bread, MiiSkinColor.Light, MiiFacialFeature.None, false, false);
 
-    public MiiHair MiiHair { get; set; } = new(0, HairColor.Black, false);
-    public MiiEyebrow MiiEyebrows { get; set; } = new(0, 0, EyebrowColor.Black, 1, 1, 1);
-    public MiiEye MiiEyes { get; set; } = new(0, 0, 0, EyeColor.Black, 0, 0);
-    public MiiNose MiiNose { get; set; } = new(NoseType.Default, 0, 0);
-    public MiiLip MiiLips { get; set; } = new(0, LipColor.Skin, 0, 0);
-    public MiiGlasses MiiGlasses { get; set; } = new(GlassesType.None, GlassesColor.Dark, 0, 0);
-    public MiiFacialHair MiiFacialHair { get; set; } = new(MustacheType.None, BeardType.None, MustacheColor.Black, 0, 0);
+    public MiiHair MiiHair { get; set; } = new(1, HairColor.Black, false);
+    public MiiEyebrow MiiEyebrows { get; set; } = new(1, 0, EyebrowColor.Black, 4, 10, 1);
+    public MiiEye MiiEyes { get; set; } = new(1, 6, 7, EyeColor.Black, 3, 6);
+    public MiiNose MiiNose { get; set; } = new(NoseType.Default, 6, 4);
+    public MiiLip MiiLips { get; set; } = new(1, LipColor.Skin, 4, 9);
+    public MiiGlasses MiiGlasses { get; set; } = new(GlassesType.None, GlassesColor.Dark, 4, 1);
+    public MiiFacialHair MiiFacialHair { get; set; } = new(MustacheType.None, BeardType.None, MustacheColor.Black, 1, 1);
     public MiiMole MiiMole { get; set; } = new(false, 0, 0, 0);
-
     public MiiName CreatorName { get; set; } = new("no name");
 }

WheelWizard/Features/WiiManagement/Domain/Mii/Mii.cs

@@ -5,6 +5,7 @@ public enum MiiFavoriteColor : uint
     Red,
     Orange,
     Yellow,
+    LightGreen,
     Green,
     Blue,
     LightBlue,
@@ -13,16 +14,15 @@ public enum MiiFavoriteColor : uint
     Brown,
     White,
     Black,
-    Gray,
 }
 
 public enum MiiFaceShape
 {
-    RoundPointChin,
+    Teardrop,
     Circle,
     Oval,
-    BlobFatChin,
-    RightAnglePointChin,
+    Glob,
+    Pointy,
     Bread,
     Octagon,
     Square,
@@ -31,8 +31,8 @@ public enum MiiFaceShape
 public enum MiiSkinColor
 {
     Light,
-    LightTan,
-    Tan,
+    Yellow,
+    Red,
     Pink,
     DarkBrown,
     Brown,
@@ -51,7 +51,7 @@ public enum MiiFacialFeature
     EyeShadow,
     Beard,
     MouthCorners,
-    Old,
+    Wrinkles,
 }
 
 public enum HairColor
@@ -82,7 +82,7 @@ public enum EyeColor : uint
 {
     Black,
     Grey,
-    Red,
+    Brown,
     Gold,
     Blue,
     Green,
@@ -95,7 +95,7 @@ public enum NoseType
     Dots,
     VShape,
     FullNose,
-    Triangle,
+    UShape,
     FlatC,
     UpsideDownC,
     Squidward,
@@ -142,16 +142,16 @@ public enum MustacheColor
     LightRed,
     Grey,
     LightBrown,
-    Blonde,
+    Tan,
     White,
 }
 
 public enum MustacheType
 {
     None,
-    Fat,
-    Thin,
-    Goatee,
+    Normal,
+    Lines,
+    Droopy,
 }
 
 public enum BeardType