gg.easy.airship 0.1.2164 → 0.1.2166

package/Runtime/Code/Analytics/ClientFolderUploader.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Threading.Tasks;
@@ -57,46 +58,71 @@ namespace Code.Analytics {
                 }
 
                 var playerLogFile = Path.Combine(path, "Player.log");
+                var tempCurPlayerLogFile = Path.Combine(path, "Player-cur.log");
                 var playerPrevLogFile = Path.Combine(path, "Player-prev.log");
                 var editorLogFile = Path.Combine(path, "Editor.log");
+                var tempCurEditorLogFile = Path.Combine(path, "Editor-cur.log");
                 var editorPrevLogFile = Path.Combine(path, "Editor-prev.log");
 
-                Debug.Log("[ClientFolderUploader] Creating zip archive");
-                try {
-                    using (var archive = ZipFile.Open(zipPath, ZipArchiveMode.Create)) {
-                        var fileExists = false;
-                        if (File.Exists(playerLogFile)) {
-                            fileExists = true;
-                            Debug.Log("[ClientFolderUploader] Adding Player.log");
-                            archive.CreateEntryFromFile(playerLogFile, "Player.log");
-                        }
+                var logMessages = new List<string>();
 
-                        if (File.Exists(playerPrevLogFile)) {
-                            fileExists = true;
-                            Debug.Log("[ClientFolderUploader] Adding Player-prev.log");
-                            archive.CreateEntryFromFile(playerPrevLogFile, "Player-prev.log");
-                        }
+                Action printDebugLines = () => {
+                    foreach (var message in logMessages) {
+                        Debug.Log(message);
+                    }
+                    logMessages.Clear();
+                };
 
-                        if (File.Exists(editorLogFile)) {
-                            fileExists = true;
-                            Debug.Log("[ClientFolderUploader] Adding Editor.log");
-                            archive.CreateEntryFromFile(editorLogFile, "Editor.log");
-                        }
+                var cleanupFiles = new List<string>() {
+                    zipPath,
+                };
 
-                        if (File.Exists(editorPrevLogFile)) {
-                            fileExists = true;
-                            Debug.Log("[ClientFolderUploader] Adding Editor-prev.log");
-                            archive.CreateEntryFromFile(editorPrevLogFile, "Editor-prev.log");
+                Debug.Log("[ClientFolderUploader] Creating zip archive");
+                try {
+                        if (File.Exists(zipPath)) {
+                            File.Delete(zipPath);
                         }
-
-                        if (!fileExists) {
-                            return;
+                        using (var archive = ZipFile.Open(zipPath, ZipArchiveMode.Create)) {
+                            var fileExists = false;
+                            if (File.Exists(playerLogFile)) {
+                                fileExists = true;
+                                File.Copy(playerLogFile, tempCurPlayerLogFile, true);
+                                logMessages.Add("[ClientFolderUploader] Adding Player.log");
+                                archive.CreateEntryFromFile(tempCurPlayerLogFile, "Player.log");
+                                cleanupFiles.Add(tempCurPlayerLogFile);
+                            }
+
+                            if (File.Exists(playerPrevLogFile)) {
+                                fileExists = true;
+                                logMessages.Add("[ClientFolderUploader] Adding Player-prev.log");
+                                archive.CreateEntryFromFile(playerPrevLogFile, "Player-prev.log");
+                            }
+
+                            if (File.Exists(editorLogFile)) {
+                                fileExists = true;
+                                File.Copy(editorLogFile, tempCurEditorLogFile, true);
+                                logMessages.Add("[ClientFolderUploader] Adding Editor.log");
+                                archive.CreateEntryFromFile(tempCurEditorLogFile, "Editor.log");
+                                cleanupFiles.Add(tempCurEditorLogFile);
+                            }
+
+                            if (File.Exists(editorPrevLogFile)) {
+                                fileExists = true;
+                                logMessages.Add("[ClientFolderUploader] Adding Editor-prev.log");
+                                archive.CreateEntryFromFile(editorPrevLogFile, "Editor-prev.log");
+                            }
+
+                            if (!fileExists) {
+                                return;
+                            }
                         }
+                    } catch (Exception ex) {
+                        printDebugLines();
+                        Debug.LogError($"[ClientFolderUploader] Zip creation failed: {ex.Message}");
+                        throw;
                     }
-                } catch (Exception ex) {
-                    Debug.LogError($"[ClientFolderUploader] Zip creation failed: {ex.Message}");
-                    throw;
-                }
+
+                printDebugLines();
 
                 var contentType = "application/zip";
                 var contentLength = new FileInfo(zipPath).Length;
@@ -135,7 +161,12 @@ namespace Code.Analytics {
                     },
                 }, "");
 
-                File.Delete(zipPath);
+                Debug.Log("[ClientFolderUploader] Deleting temporary files");
+                foreach (var file in cleanupFiles) {
+                    if (File.Exists(file)) {
+                        File.Delete(file);
+                    }
+                }
             } catch (Exception ex) {
                 Debug.LogError($"[ClientFolderUploader] Error during upload process: {ex.Message}");
                 throw;

package/Runtime/Code/Bundles/AssetBridge.cs

@@ -259,7 +259,7 @@ public class AssetBridge : IAssetBridge
 #endif
 
 		if (printErrorOnFail) {
-			Debug.LogError("AssetBundle file not found: " + path + " (No asset bundle understood this path - is this asset bundle loaded?)");
+			Debug.LogError($"Failed to load asset at path \"{path}\". Are you sure it exists?");
 		}
 		return null;
 	}

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -35,6 +35,7 @@ public class SystemRoot : Singleton<SystemRoot> {
 	public List<AssetBundleCreateRequest> extraBundleLoadRequests = new();
 	public static bool startedLoadingExtraBundle = false;
 	public static bool preWarmedCoreShaders = false;
+	private static bool disableCoreMaterialsBundle = false;
 	public AssetBundle coreMaterialsAssetBundle;
 	private bool loadInProgress = false;
 
@@ -105,16 +106,18 @@ public class SystemRoot : Singleton<SystemRoot> {
 				Debug.Log($"Loaded CoreMaterials bundle in {st.ElapsedMilliseconds} ms.");
 			}
 #else
-			if (File.Exists(path)) {
-				Debug.Log($"Loading CoreMaterials... ({path})");
-				var st = Stopwatch.StartNew();
-				var ao = AssetBundle.LoadFromFileAsync(path);
-				this.extraBundleLoadRequests.Add(ao);
-				await ao;
-				this.coreMaterialsAssetBundle = ao.assetBundle;
-				Debug.Log($"Loaded CoreMaterials bundle in {st.ElapsedMilliseconds} ms.");
-			} else {
-				Debug.LogWarning($"CoreMaterials path not found ({path})");
+			if (!disableCoreMaterialsBundle) {
+				if (File.Exists(path)) {
+					Debug.Log($"Loading CoreMaterials... ({path})");
+					var st = Stopwatch.StartNew();
+					var ao = AssetBundle.LoadFromFileAsync(path);
+					this.extraBundleLoadRequests.Add(ao);
+					await ao;
+					this.coreMaterialsAssetBundle = ao.assetBundle;
+					Debug.Log($"Loaded CoreMaterials bundle in {st.ElapsedMilliseconds} ms.");
+				} else {
+					Debug.LogWarning($"CoreMaterials path not found ({path})");
+				}
 			}
 #endif
 		}
@@ -342,11 +345,13 @@ public class SystemRoot : Singleton<SystemRoot> {
 			yield return this.WaitAll(loadLists[0].ToArray());
 			Debug.Log("Loading game...");
 			yield return this.WaitAll(loadLists[1].ToArray());
-			
-			foreach (var ao in this.extraBundleLoadRequests) {
-				if (!ao.isDone) {
-					Debug.Log("Waiting for shipped asset bundles to load...");
-					yield return ao;
+
+			if (!disableCoreMaterialsBundle) {
+				foreach (var ao in this.extraBundleLoadRequests) {
+					if (!ao.isDone) {
+						Debug.Log("Waiting for shipped asset bundles to load...");
+						yield return ao;
+					}
 				}
 			}
 

package/Runtime/Code/Luau/LuauCoreReflection.cs

@@ -420,7 +420,7 @@ public partial class LuauCore : MonoBehaviour
         LuauPlugin.LuauPushValueToThread(thread, (int)PODTYPE.POD_DOUBLE, new IntPtr(value: &value), 0);
     }
 
-    private static bool WriteArrayToThread(IntPtr thread, IEnumerable array, Type t, int knownSize = 0) {
+    public static bool WriteArrayToThread(IntPtr thread, IEnumerable array, Type t, int knownSize = 0) {
         LuauPluginRaw.NewTable(thread, knownSize);
 
         var i = 0;

package/Runtime/Code/Luau/ReflectionList.cs

@@ -187,6 +187,7 @@ namespace Luau {
             [typeof(MeshFilter)] = LuauContextAll,
             [typeof(Sprite)] = LuauContextAll,
             [typeof(DecalProjector)] = LuauContextAll,
+            [typeof(LODGroup)] = LuauContextAll,
             //Spline
             [typeof(Spline)] = LuauContextAll,
             [typeof(BezierCurve)] = LuauContextAll,

package/Runtime/Code/LuauAPI/FrameTimingManagerAPI.cs

@@ -3,8 +3,28 @@ using UnityEngine;
 
 [LuauAPI]
 public class FrameTimingManagerAPI : BaseLuaAPIClass {
-    public override Type GetAPIType()
-    {
+    public override Type GetAPIType() {
         return typeof(UnityEngine.FrameTimingManager);
     }
+
+    public override int OverrideStaticMethod(LuauContext context, IntPtr thread, string methodName, int numParameters,
+        ArraySegment<int> parameterDataPODTypes, ArraySegment<IntPtr> parameterDataPtrs,
+        ArraySegment<int> parameterDataSizes) {
+        if (methodName is "GetLatestTimings") {
+            if (numParameters != 1) throw new ArgumentException("GetLatestTimings expects 1 parameter.");
+
+            var numTimings = (uint) LuauCore.GetParameterAsInt(0, numParameters, parameterDataPODTypes, parameterDataPtrs,
+                parameterDataSizes);
+            
+            // Arbitrary limit to avoid huge allocations / requests
+            if (numTimings > 1000) throw new ArgumentException("Requested too many frames (>1000) from GetLatestTimings.");
+            
+            // This function will alloc -- we could look to in the future support a non-alloc setup
+            var timings = new FrameTiming[numTimings];
+            var fetchedResults = FrameTimingManager.GetLatestTimings(numTimings, timings);
+            LuauCore.WriteArrayToThread(thread, timings, typeof(FrameTiming), (int) fetchedResults);
+            return 1;
+        }
+        return -1;
+    }
 }

package/Runtime/Code/Player/PlayerInfo.cs

@@ -44,7 +44,7 @@ public class PlayerInfo : NetworkBehaviour {
 
 	private void InitVoiceChat() {
 		var voiceChatGO = new GameObject(
-			$"{this.username}_VoiceChatAudioSourceOutput");
+			$"{this.username}_VoiceChatAudioSource");
 		this.voiceChatAudioSource = voiceChatGO.AddComponent<AudioSource>();
 		voiceChatGO.transform.SetParent(this.transform);
 	}
@@ -57,7 +57,7 @@ public class PlayerInfo : NetworkBehaviour {
 	public override void OnStartClient() {
 		base.OnStartClient();
 
-		if (isClient) {
+		if (isClient && !RunCore.IsServer()) {
 			this.InitVoiceChat();
 		}
 	}

package/Runtime/Code/Player/PlayerManagerBridge.cs

@@ -189,7 +189,7 @@ namespace Code.Player {
 		}
 
 		/**
-		 * Client side logic for when a new client joins.
+		 * Server side logic for when a new client joins.
 		 */
 		private async void NetworkServer_OnConnected(NetworkConnectionToClient conn) {
 			if (playerPrefab == null) {

package/Runtime/Code/Quality/QualityManager.cs

@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Code.Quality {
+    // We should redo this to be a single core number for quality
+    // NOTE: must match FrameHealth in Airship.d.ts
+    public enum FrameHealth {
+        Ok = 0,
+        Unhealthy = 1,
+    }
+
+    public struct QualityReport {
+        public double gpuAvg;
+        public double cpuMainAvg;
+        public double cpuRenderAvg;
+
+        public int numFrames;
+    }
+    
+    [LuauAPI(LuauContext.Game)]
+    public class QualityManager : Singleton<QualityManager> {
+        public static event Action<object, object> OnQualityCheck;
+        
+        private const int SampleCount = 500;
+        /// <summary>
+        /// Time after starting that we'll run a quality check on the client. This
+        /// will be sent to game clients to allow them to configure quality based on
+        /// performance.
+        /// </summary>
+        private const float QualityCheckTimeSec = 15;
+        /// <summary>
+        /// We use this to determine GPU/CPU bound.
+        /// </summary>
+        private const int FrameTimingCount = 50;
+        private short[] _fps = new short[SampleCount];
+        private FrameTiming[] _frameTimings = new FrameTiming[FrameTimingCount];
+        private int currentQualityLevel = 5;
+
+        /// <summary>
+        /// FPS array is circular, this is the front index
+        /// </summary>
+        private int _fpsFront;
+        /// <summary>
+        /// True once we've first loaded all SampleCount samples into _fps
+        /// </summary>
+        private bool _fpsSamplesLoaded;
+        private float _nextQualityCheck;
+
+        /// <summary>
+        /// For now we only run the quality check once after 15 seconds.
+        /// </summary>
+        private bool _hasRunQualityCheck;
+
+        private void Awake() {
+            _nextQualityCheck = Time.unscaledTime + QualityCheckTimeSec;
+        }
+
+        private void Update() {
+            if (_hasRunQualityCheck) return;
+            
+            FrameTimingManager.CaptureFrameTimings();
+            
+            if (!_fpsSamplesLoaded && _fpsFront == SampleCount - 1) _fpsSamplesLoaded = true;
+            _fps[_fpsFront++ % SampleCount] = (short) (1d / Time.unscaledDeltaTime);
+            
+            // Should we do a quality check?
+            if (Time.time > _nextQualityCheck) {
+                _hasRunQualityCheck = true;
+                DoQualityCheck();
+                _nextQualityCheck = Time.time + QualityCheckTimeSec;
+            }
+        }
+
+        private void DoQualityCheck() {
+            var targetFrameRate = Application.targetFrameRate;
+            if (targetFrameRate < 0 || targetFrameRate > Screen.currentResolution.refreshRateRatio.value)
+                targetFrameRate = (int) (1.0 / Screen.currentResolution.refreshRateRatio.value);
+            
+            var currentFivePercent = GetPercentFps(0.05f);
+
+            var frameHealth = FrameHealth.Ok;
+            var avgFrameTimings = GetRecentAverageFrameTimings();
+            
+            // If our 5% is lower than 80% of target we should drop quality
+            if (currentFivePercent < 0.80 * targetFrameRate) {
+                frameHealth = FrameHealth.Unhealthy;
+            }
+            
+            OnQualityCheck?.Invoke(frameHealth, avgFrameTimings);
+        }
+
+        private QualityReport GetRecentAverageFrameTimings() {
+            if (!FrameTimingManager.IsFeatureEnabled()) return default;
+            
+            var numLatestTimings = FrameTimingManager.GetLatestTimings(FrameTimingCount, _frameTimings);
+            if (numLatestTimings <= 0) return default;
+
+            var result = new QualityReport();
+            for (var i = 0; i < numLatestTimings; i++) {
+                result.cpuMainAvg += _frameTimings[i].cpuMainThreadFrameTime;
+                result.cpuRenderAvg += _frameTimings[i].cpuRenderThreadFrameTime;
+                result.gpuAvg += _frameTimings[i].gpuFrameTime;
+            }
+            result.cpuMainAvg /= numLatestTimings;
+            result.cpuRenderAvg /= numLatestTimings;
+            result.gpuAvg /= numLatestTimings;
+            result.numFrames = (int) numLatestTimings;
+            return result;
+        }
+        
+        /// <summary>
+        /// Gets the slowest percent of frames and averages them.
+        /// </summary>
+        private double GetPercentFps(float percent) {
+            var percentSampleCount = (int) Mathf.Ceil(SampleCount * percent);
+            
+            // Load the first N samples and keep samples sorted
+            var samples = new List<short>(_fps.AsSpan(0, percentSampleCount).ToArray());
+            samples.Sort();
+            
+            for (var i = percentSampleCount; i < _fps.Length; i++) {
+                // If we're slower than the best FPS in samples, insert
+                var largestFpsSample = samples[^1];
+                var sample = _fps[i];
+                if (sample < largestFpsSample) {
+                    var index = samples.BinarySearch(sample);
+                    // Will return bitwise compliment if larger than list
+                    if (index < 0) index = ~index;
+                    
+                    samples.Insert(index, sample);
+                    samples.RemoveAt(samples.Count - 1);
+                }
+            }
+
+            var fpsTotal = 0d;
+            foreach (var sample in samples) {
+                fpsTotal += sample;
+            }
+            return fpsTotal / samples.Count;
+        }
+    }
+}

package/Runtime/Code/Quality/QualityManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 61605bf762a14bc2af51dd67d0c8b156
+timeCreated: 1753829150

package/Runtime/Code/Quality.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0c5e40dfbd834a72af5a2e16f55361f7
+timeCreated: 1753829136

package/Runtime/Code/Steam/SteamLuauAPI.cs

@@ -177,42 +177,45 @@ public class SteamLuauAPI : Singleton<SteamLuauAPI> {
         return success;
     }
 
-        public static AirshipSteamFriendInfo[] GetSteamFriends() {
-        Assert.IsTrue(SteamManager.Initialized, "Can't fetch friends: steam is not initialized.");
+        public static async Task<AirshipSteamFriendInfo[]> GetSteamFriends() {
+            Assert.IsTrue(SteamManager.Initialized, "Can't fetch friends: steam is not initialized.");
 
         #if !STEAMWORKS_NET
-            return Array.Empty<AirshipSteamFriendInfo>();
+            return Task.FromResult(Array.Empty<AirshipSteamFriendInfo>());
         #else
-            var friendCount = SteamFriends.GetFriendCount(EFriendFlags.k_EFriendFlagImmediate);
-            var friendInfos = new AirshipSteamFriendInfo[friendCount];
-            for (var i = 0; i < friendCount; i++) {
-                var friendId = SteamFriends.GetFriendByIndex(i, EFriendFlags.k_EFriendFlagImmediate);
-                var friendName = SteamFriends.GetFriendPersonaName(friendId);
-                var personaState = SteamFriends.GetFriendPersonaState(friendId);
-                SteamFriends.GetFriendGamePlayed(friendId, out var friendGameInfo);
-
-                var friendInfoStruct = new AirshipSteamFriendInfo {
-                    steamId = friendId.m_SteamID,
-                    steamName = friendName
-                };
-
-                // Is friend playing Airship?
-                if (friendGameInfo.m_gameID.m_GameID == SteamUtils.GetAppID().m_AppId) {
-                    friendInfoStruct.playingAirship = true;
-                } else if (friendGameInfo.m_gameID.IsValid()) {
-                    friendInfoStruct.playingOtherGame = true;
+            return await Task.Run(() => {
+                var friendCount = SteamFriends.GetFriendCount(EFriendFlags.k_EFriendFlagImmediate);
+                var friendInfos = new AirshipSteamFriendInfo[friendCount];
+                for (var i = 0; i < friendCount; i++) {
+                    var friendId = SteamFriends.GetFriendByIndex(i, EFriendFlags.k_EFriendFlagImmediate);
+                    var friendName = SteamFriends.GetFriendPersonaName(friendId);
+                    var personaState = SteamFriends.GetFriendPersonaState(friendId);
+                    SteamFriends.GetFriendGamePlayed(friendId, out var friendGameInfo);
+
+                    var friendInfoStruct = new AirshipSteamFriendInfo {
+                        steamId = friendId.m_SteamID,
+                        steamName = friendName
+                    };
+
+                    // Is friend playing Airship?
+                    if (friendGameInfo.m_gameID.m_GameID == SteamUtils.GetAppID().m_AppId) {
+                        friendInfoStruct.playingAirship = true;
+                    } else if (friendGameInfo.m_gameID.IsValid()) {
+                        friendInfoStruct.playingOtherGame = true;
+                    }
+
+                    // Check if online
+                    if (personaState != EPersonaState.k_EPersonaStateOffline) {
+                        friendInfoStruct.online = true;
+                    }
+
+                    friendInfos[i] = friendInfoStruct;
                 }
 
-                // Check if online
-                if (personaState != EPersonaState.k_EPersonaStateOffline) {
-                    friendInfoStruct.online = true;
-                }
-
-                friendInfos[i] = friendInfoStruct;
-            }
-            return friendInfos;
-        #endif
-    }
+                return friendInfos;
+            });
+#endif
+        }
 
     /// <summary>
     /// Can return null.

package/Runtime/Code/VoiceChat/AirshipUniVoiceNetwork.cs

@@ -54,6 +54,7 @@ namespace Code.VoiceChat {
         public ChatroomAgent agent;
 
         private uint audioNonce = 0;
+        private bool deafened = false;
         
         
         private void OnDisable() {
@@ -327,6 +328,8 @@ namespace Code.VoiceChat {
         }
 
         private void EmitAudioInScene(short senderPeerId, byte[] bytes) {
+            if (this.deafened) return;
+            
             var segment = FromByteArray<ChatroomAudioSegment>(bytes);
             
             this.PreProcessAudio(segment);
@@ -384,6 +387,10 @@ namespace Code.VoiceChat {
             }
         }
 
+        public void SetDeafened(bool deafened) {
+            this.deafened = deafened;
+        }
+
         /// <summary>
         /// Returns the UniVoice peer Id corresponding to a previously
         /// registered Mirror connection Id

package/Runtime/Code/VoxelWorld/Resources/SampleDerivative.hlsl

@@ -0,0 +1,7 @@
+void SampleWithDerivatives_float(UnityTexture2D tex, UnitySamplerState samplerState, float2 uv, float2 dx, float2 dy, out float4 color) {
+    // The lower our derivative scale the further out we'll see
+    // high quality mips. Because we use a texture atlas that can bleed this needs
+    // to be relatively low.
+    float derivativeScale = 0.05;
+    color = tex.SampleGrad(samplerState, uv, dx * derivativeScale, dy * derivativeScale);
+}

package/Runtime/Code/VoxelWorld/Resources/SampleDerivative.hlsl.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b1f2efc6343734f73a6d29e146797303
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: