Use Unity to pack sprites

Source/CustomAvatar/UI/AvatarListViewController.cs

@@ -17,7 +17,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using CustomAvatar.Avatar;
@@ -29,6 +28,7 @@
 using Polyglot;
 using TMPro;
 using UnityEngine;
+using UnityEngine.U2D;
 using UnityEngine.UI;
 using Zenject;
 
@@ -46,21 +46,21 @@ internal class AvatarListViewController : ViewController, TableView.IDataSource
         private PlayerOptionsViewController _playerOptionsViewController;
         private LevelCollectionViewController _levelCollectionViewController;
         private PlatformLeaderboardViewController _leaderboardViewController;
+        private AssetLoader _assetLoader;
 
         private FileSystemWatcher _fileSystemWatcher;
         private TableView _tableView;
 
         private readonly List<AvatarListItem> _avatars = new();
         private AvatarListTableCell _tableCellPrefab;
 
-        private Texture2D _atlas;
         private Sprite _blankAvatarSprite;
         private Sprite _noAvatarSprite;
         private Sprite _reloadSprite;
         private Sprite _loadErrorSprite;
 
         [Inject]
-        internal void Construct(ILogger<AvatarListViewController> logger, PlayerAvatarManager avatarManager, DiContainer container, MirrorViewController mirrorViewController, PlayerOptionsViewController playerOptionsViewController, LevelCollectionViewController levelCollectionViewController, PlatformLeaderboardViewController leaderboardViewController)
+        internal void Construct(ILogger<AvatarListViewController> logger, PlayerAvatarManager avatarManager, DiContainer container, MirrorViewController mirrorViewController, PlayerOptionsViewController playerOptionsViewController, LevelCollectionViewController levelCollectionViewController, PlatformLeaderboardViewController leaderboardViewController, AssetLoader assetLoader)
         {
             _logger = logger;
             _avatarManager = avatarManager;
@@ -69,28 +69,16 @@ internal void Construct(ILogger<AvatarListViewController> logger, PlayerAvatarMa
             _playerOptionsViewController = playerOptionsViewController;
             _levelCollectionViewController = levelCollectionViewController;
             _leaderboardViewController = leaderboardViewController;
+            _assetLoader = assetLoader;
         }
 
         protected void Start()
         {
-            using (Stream fileStream = Assembly.GetExecutingAssembly().GetManifestResourceStream("CustomAvatar.Resources.ui.dds"))
-            {
-                _atlas = SimpleDdsLoader.LoadImage(fileStream);
-                _noAvatarSprite = Sprite.Create(_atlas, new Rect(0, 0, 256, 256), new Vector2(0.5f, 0.5f));
-                _blankAvatarSprite = Sprite.Create(_atlas, new Rect(256, 0, 256, 256), new Vector2(0.5f, 0.5f));
-                _reloadSprite = Sprite.Create(_atlas, new Rect(0, 256, 128, 128), new Vector2(0.5f, 0.5f));
-                _loadErrorSprite = Sprite.Create(_atlas, new Rect(256, 256, 256, 256), new Vector2(0.5f, 0.5f));
-            }
-        }
-
-        protected override void OnDestroy()
-        {
-            Destroy(_noAvatarSprite);
-            Destroy(_blankAvatarSprite);
-            Destroy(_reloadSprite);
-            Destroy(_atlas);
-
-            base.OnDestroy();
+            SpriteAtlas atlas = _assetLoader.uiSpriteAtlas;
+            _noAvatarSprite = atlas.GetSprite("NoAvatarIcon");
+            _blankAvatarSprite = atlas.GetSprite("BlankAvatarIcon");
+            _reloadSprite = atlas.GetSprite("ReloadButtonIcon");
+            _loadErrorSprite = atlas.GetSprite("LoadErrorIcon");
         }
 
         protected override async void DidActivate(bool firstActivation, bool addedToHierarchy, bool screenSystemEnabling)

Source/CustomAvatar/Utilities/AssetLoader.cs

@@ -20,6 +20,7 @@
 using System.Threading.Tasks;
 using CustomAvatar.Logging;
 using UnityEngine;
+using UnityEngine.U2D;
 using Zenject;
 using Object = UnityEngine.Object;
 
@@ -38,6 +39,8 @@ internal AssetLoader(ILogger<AssetLoader> logger)
 
         internal Shader unlitShader { get; private set; }
 
+        internal SpriteAtlas uiSpriteAtlas { get; private set; }
+
         public void Initialize()
         {
             LoadAssetsAsync().ContinueWith((task) => _logger.LogCritical(task.Exception), TaskContinuationOptions.OnlyOnFaulted);
@@ -47,6 +50,7 @@ public void Dispose()
         {
             Object.Destroy(stereoMirrorShader);
             Object.Destroy(unlitShader);
+            Object.Destroy(uiSpriteAtlas);
         }
 
         private async Task LoadAssetsAsync()
@@ -80,6 +84,10 @@ private async Task LoadAssetsAsync()
                         unlitShader = (Shader)asset;
                         break;
 
+                    case "assets/sprites/ui.spriteatlasv2":
+                        uiSpriteAtlas = (SpriteAtlas)asset;
+                        break;
+
                     default:
                         _logger.LogError($"Unexpected asset '{name}'");
                         break;

Unity/BuiltInAssets/Assets/Scripts/Editor/ExportCustomAvatarsAssetBundle.cs

@@ -21,6 +21,7 @@ public static void BuildAssetBundle()
             assetNames = new[] {
                 "Assets/Shaders/StereoRender.shader",
                 "Assets/Shaders/UnlitOverlay.shader",
+                "Assets/Sprites/UI.spriteatlasv2",
             },
         };