gg.easy.airship 0.1.2151 → 0.1.2154

package/Editor/Artifacts/AirshipPrefabUtility.cs

@@ -17,7 +17,7 @@ namespace Airship.Editor {
                 return false;
             }
 
-            var meshFilter = component.GetComponentsInChildren<MeshFilter>(); // because of 'SendMessage' we can't force reconcile these
+            var meshFilter = component.GetComponentsInChildren<MeshFilter>(true); // because of 'SendMessage' we can't force reconcile these
             if (meshFilter.Length > 0) {
                 prefabComponent = null;
                 return false;

package/Editor/GrayProfilePicture.png.meta

@@ -43,7 +43,7 @@ TextureImporter:
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 2
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -67,9 +67,9 @@ TextureImporter:
   swizzle: 50462976
   cookieLightType: 0
   platformSettings:
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 128
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -80,7 +80,7 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -93,7 +93,7 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Server
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -106,7 +106,7 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
+  - serializedVersion: 4
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
@@ -119,8 +119,8 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
+  - serializedVersion: 4
+    buildTarget: iOS
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
@@ -136,6 +136,7 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
+    customData: 
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
@@ -145,6 +146,8 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
     nameFileIdTable: {}
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0

package/Editor/Toolbar/EditorToolbar.cs

@@ -159,6 +159,7 @@ namespace Airship.Editor
         private static Material profilePicRounded;
         private static Texture signedOutIcon;
         private static Texture2D signedInIcon;
+        private static Texture2D signedInIconRaw;
         public static byte[] signedInIconBytes = new byte[]{};
         /** True when fetching game info for publish (publish shouldn't be clickable during this) */
         private static bool fetchingPublishInfo;
@@ -178,16 +179,13 @@ namespace Airship.Editor
             RunCore.launchInDedicatedServerMode = EditorPrefs.GetBool("AirshipDedicatedServerMode", false);
             ToolbarExtender.RightToolbarGUI.Add(OnRightToolbarGUI);
             ToolbarExtender.LeftToolbarGUI.Add(OnLeftToolbarGUI);
-
+            
             if (EditorAuthManager.localUser != null || !string.IsNullOrEmpty(InternalHttpManager.editorUserId)) {
                 FetchAndUpdateSignedInIcon();
             }
             EditorAuthManager.localUserChanged += (user) => {
                 if (EditorAuthManager.signInStatus != EditorAuthSignInStatus.SIGNED_IN) {
                     signedInIconBytes = new byte[]{};
-                    // EditorIcons.Instance.signedInIcon = new byte[] {};
-                    // EditorUtility.SetDirty(EditorIcons.Instance);
-                    // AssetDatabase.SaveAssetIfDirty(EditorIcons.Instance);
                     RepaintToolbar();
                     return;
                 }
@@ -204,12 +202,8 @@ namespace Airship.Editor
             EditorAuthManager.DownloadProfilePicture().ContinueWith((t) => {
                 if (t.Result == null) return;
 
-                signedInIcon = ResizeTexture(t.Result, 128, 128);
-                AirshipToolbar.signedInIconBytes = signedInIcon.EncodeToPNG();
-                // EditorIcons.Instance.signedInIcon = signedInIcon.EncodeToPNG();
-                // EditorUtility.SetDirty(EditorIcons.Instance);
-                // AssetDatabase.SaveAssetIfDirty(EditorIcons.Instance);
-                RepaintToolbar();
+                signedInIconRaw = t.Result;
+                GetSignedInIcon();
             }, TaskScheduler.FromCurrentSynchronizationContext());
         }
 
@@ -242,24 +236,34 @@ namespace Airship.Editor
             }
         }
         
-        private static Texture2D ResizeTexture(Texture2D source, int targetWidth, int targetHeight) {
-            RenderTexture rt = RenderTexture.GetTemporary(targetWidth, targetHeight);
-            rt.filterMode = FilterMode.Bilinear;
-            
-            if (profilePicRounded == null)
-                profilePicRounded = AssetDatabase.LoadAssetAtPath<Material>("Packages/gg.easy.airship/Editor/Hidden_EditorProfilePicRounded.mat");
-
-            RenderTexture.active = rt;
-            Graphics.Blit(source, rt, profilePicRounded);
+        private static Texture2D ResizeAndRoundTexture(Texture2D source, int targetWidth, int targetHeight) {
+            if (source == null || !source.isReadable) {
+                Debug.LogError("Unable to set signed in icon: Source texture is null or unreadable.");
+                return null;
+            }
 
-            Texture2D result = new Texture2D(targetWidth, targetHeight);
+            // Downsize texture and round on CPU. There are problems when using Graphics.Blit to
+            // create this texture (it may not be ready on startup and will cause crashes when not
+            // ready).
+            var result = new Texture2D(targetWidth, targetHeight);
+            var newPixels = new Color[targetHeight * targetWidth];
+            var srcPixels = source.GetPixels();
+            for (var x = 0; x < targetWidth; x++) {
+                for (var y = 0; y < targetHeight; y++) {
+                    var u = x / (float)targetWidth;
+                    var v = y / (float)targetHeight;
+                    // Cut out pixels outside of a circle
+                    if ((u - 0.5) * (u - 0.5) + (v - 0.5) * (v - 0.5) > 0.25) continue;
+                    
+                    var i = x + y * targetWidth;
+                    var srcX = Mathf.Clamp(Mathf.RoundToInt(u * source.width), 0, source.width - 1);
+                    var srcY = Mathf.Clamp(Mathf.RoundToInt(v * source.height), 0, source.height - 1);
+                    newPixels[i] = srcPixels[srcX + srcY * source.width];
+                }
+            }
+            result.SetPixels(newPixels);
             result.filterMode = FilterMode.Bilinear;
-            result.ReadPixels(new Rect(0, 0, targetWidth, targetHeight), 0, 0);
             result.Apply();
-
-            RenderTexture.active = null;
-            RenderTexture.ReleaseTemporary(rt);
-
             return result;
         }
 
@@ -280,14 +284,7 @@ namespace Airship.Editor
             if (gameSettings == null)
                 gameSettings = AssetDatabase.LoadAssetAtPath<Texture2D>(IconSettings);
             if (signedOutIcon == null)
-                signedOutIcon = ResizeTexture(AssetDatabase.LoadAssetAtPath<Texture2D>(SignedOutIcon), 128, 128);
-            if (signedInIcon == null && AirshipToolbar.signedInIconBytes != null && AirshipToolbar.signedInIconBytes.Length > 0) {
-                Texture2D result = new Texture2D(128, 128);
-                result.filterMode = FilterMode.Bilinear;
-                result.LoadImage(AirshipToolbar.signedInIconBytes);
-                result.Apply();
-                signedInIcon = result;
-            }
+                signedOutIcon = AssetDatabase.LoadAssetAtPath<Texture2D>(SignedOutIcon);
 
             if (coreUpdateTexture == null) {
                 coreUpdateTexture = AssetDatabase.LoadAssetAtPath<Texture2D>(coreUpdateIcon);
@@ -327,7 +324,7 @@ namespace Airship.Editor
             GUI.enabled = true;
 
             EditorGUIUtility.SetIconSize(new Vector2(16, 16));
-            Texture profileIcon = signedInIcon;
+            Texture profileIcon = GetSignedInIcon();
             if (profileIcon == null || EditorAuthManager.signInStatus == EditorAuthSignInStatus.SIGNED_OUT) {
                 profileIcon = signedOutIcon;
             }
@@ -466,5 +463,25 @@ namespace Airship.Editor
             
             GUILayout.Space(5);
         }
+
+        private static Texture2D GetSignedInIcon() {
+            if (signedInIcon != null) return signedInIcon;
+            
+            if (AirshipToolbar.signedInIconBytes != null && AirshipToolbar.signedInIconBytes.Length > 0) {
+                Texture2D result = new Texture2D(128, 128);
+                result.filterMode = FilterMode.Bilinear;
+                result.LoadImage(AirshipToolbar.signedInIconBytes);
+                result.Apply();
+                signedInIcon = result;
+                return signedInIcon;
+            }
+
+            if (signedInIconRaw != null) {
+                signedInIcon = ResizeAndRoundTexture(signedInIconRaw, 128, 128);
+                signedInIconBytes = signedInIcon.EncodeToPNG();
+                return signedInIcon;
+            }
+            return null;
+        }
     }
 }

package/Editor/TypescriptServices/Compiler/TypescriptCompilationService.cs

@@ -475,12 +475,6 @@ using Object = UnityEngine.Object;
                 BuildTypescript(new []{ TypescriptProjectsService.Project }, flags);
             }
             internal static void BuildTypescript(TypescriptProject[] projects, TypeScriptCompileFlags compileFlags = 0) {
-                var gameConfig = GameConfig.Load();
-                if (!gameConfig) {
-                    Debug.LogError("Failed to load gameConfig for compilation step");
-                    return;
-                }
-                
                 var isRunningServices = TypescriptCompilationServicesState.instance.CompilerCount > 0;
                 if (isRunningServices) StopCompilerServices();
 

package/Editor/TypescriptServices/Editor/TypescriptLogService.cs

@@ -140,12 +140,12 @@ namespace Airship.Editor {
         }
 
         internal static void StartLogging() {
+            if (started) return;
+            
             if (!Directory.Exists(LogFolder)) {
                 Directory.CreateDirectory(LogFolder);
             }
             
-            if (started) return;
-            
             string logDir = Path.GetDirectoryName(Application.consoleLogPath);
             logPath = LogFilePath;
             prevLogPath = LogFilePrevPath; // lol

package/Editor/TypescriptServices/TypescriptServices.cs

@@ -48,7 +48,7 @@ namespace Airship.Editor {
     /// <summary>
     /// Main static class for handling the TypeScript services
     /// </summary>
-    public static class TypescriptServices {
+    public class TypescriptServices : AssetPostprocessor {
         internal static event CompilerCrashEvent CompilerCrash;
         
         /// <summary>
@@ -87,10 +87,18 @@ namespace Airship.Editor {
             Debug.LogWarning("[TypescriptServices] Skipped, in Airship Player mode");
             return;
 #endif
+            TypescriptLogService.StartLogging();
+            
             // On project load we'll force a full compile to try and get all the refs up to date
             if (!SessionState.GetBool("TypescriptInitialBoot", false) && IsValidEditorContext) {
                 SessionState.SetBool("TypescriptInitialBoot", true);
-                TypescriptCompilationService.BuildTypescript(TypeScriptCompileFlags.FullClean | TypeScriptCompileFlags.Setup | TypeScriptCompileFlags.DisplayProgressBar);
+                
+                if (HasAllPackagesDownloaded()) {
+                    TypescriptCompilationService.BuildTypescript(TypeScriptCompileFlags.FullClean | TypeScriptCompileFlags.Setup | TypeScriptCompileFlags.DisplayProgressBar);
+                }
+                else {
+                    TypescriptLogService.LogWarning("Skipped precompile due to not having packages downloaded yet");
+                }
             }
             
             // If a server or clone - ignore
@@ -145,20 +153,31 @@ namespace Airship.Editor {
             }
         }
 
+#if !AIRSHIP_PLAYER
+        private static bool assetDbReady = false;
+        // ReSharper disable once Unity.IncorrectMethodSignature
+        private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets,
+            string[] movedFromAssetPaths, bool didDomainReload) {
+            if (!IsValidEditorContext || !didDomainReload) return;
+            if (!assetDbReady) assetDbReady = true;
+        }
+#endif
+        
         private static bool HasAllPackagesDownloaded() {
+            if (!assetDbReady) return false;
+            
             var gameConfig = GameConfig.Load();
-            foreach (var project in gameConfig.packages) {
-                if (!project.localSource && !project.IsDownloaded()) return false;
-            }
-
-            return true;
+            return gameConfig != null && gameConfig.packages.All(project => project.localSource || project.IsDownloaded());
         }
         
         private static IEnumerator InitializeProject() {
             TypescriptProjectsService.ReloadProjects();
             TypescriptCompilationService.ClearIncrementalCache(); // clear incremental cache
+            TypescriptLogService.LogInfo("Checking and waiting for packages to download...");
             yield return new WaitUntil(HasAllPackagesDownloaded);
+            TypescriptLogService.LogInfo("Packages are OK, will now initialize TypeScript");
             yield return InitializeTypeScript();
+            TypescriptLogService.LogInfo("TypeScript initialized, now starting the TypeScript runtime");
             yield return StartTypescriptRuntime();
         }
         
@@ -193,12 +212,13 @@ namespace Airship.Editor {
         
         private  static IEnumerator StartTypescriptRuntime() {
             TypescriptProjectsService.ReloadProject();
+           
             
             // Wait for updates
-            if (AirshipUpdateService.IsUpdatingAirship || AirshipPackagesWindow.IsModifyingPackages) {
+            if (AirshipUpdateService.IsUpdatingAirship || AirshipPackagesWindow.IsModifyingPackages || !HasAllPackagesDownloaded()) {
                 IsAwaitingRestart = true;
                 yield return new WaitUntil(() =>
-                    !AirshipPackagesWindow.IsModifyingPackages && !AirshipUpdateService.IsUpdatingAirship);
+                    !AirshipPackagesWindow.IsModifyingPackages && !AirshipUpdateService.IsUpdatingAirship && HasAllPackagesDownloaded());
                 IsAwaitingRestart = false;
             }
 
@@ -228,6 +248,7 @@ namespace Airship.Editor {
                 return;
             }
 
+            TypescriptLogService.LogInfo("Enforcing default config settings");
             project.EnforceDefaultConfigurationSettings();
             CompilerCrash += OnCrash;
 
@@ -243,6 +264,7 @@ namespace Airship.Editor {
             }
             
             if (!SessionState.GetBool("InitializedTypescriptServices", false)) {
+                TypescriptLogService.LogInfo("Running initial setup for TypeScript services");
                 SessionState.SetBool("InitializedTypescriptServices", true);
                 TypescriptCompilationService.StopCompilerServices();
                 
@@ -259,6 +281,7 @@ namespace Airship.Editor {
                 }
             }
             else {
+                TypescriptLogService.LogInfo("Attempting to resume TypeScript compilation services...");
                 TypescriptCompilationService.StopCompilerServices(shouldRestart: TypescriptCompilationService.IsWatchModeRunning);
             }
             
@@ -324,12 +347,12 @@ namespace Airship.Editor {
                 invokedCrashEvent = false;
             }
 
-            var shouldAutostart = !IsCompilerActive && !TypescriptCompilationService.Crashed &&
-                                  ShouldCompilerBeRunning && !IsAwaitingRestart && !IsCompilerStoppedByUser;
-
-            if (!shouldAutostart) return;
-            TypescriptLogService.LogWarning("Found compiler inactive, doing an automatic restart");
-            EditorCoroutines.Execute(StartTypescriptRuntime());
+            // var shouldAutostart = !IsCompilerActive && !TypescriptCompilationService.Crashed &&
+            //                       ShouldCompilerBeRunning && !IsAwaitingRestart && !IsCompilerStoppedByUser && HasAllPackagesDownloaded();
+            //
+            // if (!shouldAutostart) return;
+            // TypescriptLogService.LogWarning("Found compiler inactive, doing an automatic restart");
+            // EditorCoroutines.Execute(StartTypescriptRuntime());
         }
     }
 }

package/Runtime/Code/Bootstrap/BundleDownloader.cs

@@ -180,6 +180,11 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 				if (i >= bundleFilesToDownload.Count) break; // code.zip requests
 				var remoteBundleFile = bundleFilesToDownload[i];
 				bool success = false;
+				
+				// Test error
+				// Debug.LogError("Forcing download fail.");
+				// onComplete?.Invoke(false);
+				// return false;
 
 				if (request.webRequest.result != UnityWebRequest.Result.Success) {
 					var statusCode = request.webRequest.responseCode;

package/Runtime/Code/Bootstrap/ClientBundleLoader.cs

@@ -55,6 +55,7 @@ namespace Code.Bootstrap {
         [SerializeField]
         public ServerBootstrap serverBootstrap;
         private List<NetworkConnectionToClient> connectionsReadyToLoadGameScene = new();
+        private InitializeGameMessage initMessage;
 
         public bool scriptsReady = false;
         public bool packagesReady = false;
@@ -144,6 +145,10 @@ namespace Code.Bootstrap {
             }
         }
 
+        public void RetryDownload() {
+            StartCoroutine(this.LoadPackages(this.initMessage.startupConfig));
+        }
+
         /// <summary>
         /// Called when client starts but before it's ready.
         /// </summary>
@@ -163,6 +168,7 @@ namespace Code.Bootstrap {
             this.isFinishedPreparing = false;
 
             NetworkClient.RegisterHandler<InitializeGameMessage>(async data => {
+                this.initMessage = data;
                 NetworkManager.networkSceneName = data.startupConfig.StartingSceneName;
 
                 StartCoroutine(this.LoadPackages(data.startupConfig));
@@ -361,16 +367,16 @@ namespace Code.Bootstrap {
             } else {
                 BundleDownloader.Instance.downloadAccepted = false;
                 bool finishedDownload = false;
-                BundleDownloader.Instance.DownloadBundles(
+                var downloadResult = BundleDownloader.Instance.DownloadBundles(
                     startupConfig.CdnUrl,
                     packages.ToArray(),
                     null,
                     loadingScreen,
                     null,
                     false,
-                    result => {
+                    (success) => {
                         finishedDownload = true;
-                        if (!result) {
+                        if (!success) {
                             loadingScreen.SetError("Failed to download game content. An error has occurred.");
                         }
                     }
@@ -379,6 +385,12 @@ namespace Code.Bootstrap {
                 while (!finishedDownload) {
                     yield return null;
                 }
+
+                // Something failed in the bundle downloader.
+                // So we stop and wait for player to press retry (which calls this function again)
+                if (!downloadResult.Result) {
+                    yield break;
+                }
                 
                 yield return new WaitUntil(() => this.scriptsReady);
             }