Merge pull request #53 from techno-dwarf-works/dev

Update v1.2.3
techno-dwarf-works · Feb 24, 2024 · 34e8729 · 34e8729
1 parent af3caa3
commit 34e8729
Show file tree

Hide file tree

Showing 10 changed files with 198 additions and 7 deletions.
diff --git a/Runtime/BetterExtensions.Runtime.asmdef b/Runtime/BetterExtensions.Runtime.asmdef
@@ -1,6 +1,6 @@
 {
     "name": "BetterExtensions.Runtime",
-    "rootNamespace": "Better.Extensions",
+    "rootNamespace": "Better.Extensions.Runtime",
     "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/Runtime/Extension/ExceptionExtensions.cs b/Runtime/Extension/ExceptionExtensions.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Reflection;
+
+namespace Better.Extensions.Runtime
+{
+    public static class ExceptionExtensions
+    {
+        private const string ExceptionMessageFieldName = "_message";
+        private static readonly FieldInfo _messageField;
+
+        static ExceptionExtensions()
+        {
+            _messageField = GetExceptionMessageField();
+        }
+
+        private static FieldInfo GetExceptionMessageField()
+        {
+            var type = typeof(Exception);
+            const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
+            return type.GetField(ExceptionMessageFieldName, flags);
+        }
+
+        public static void ReplaceExceptionMessageField(this Exception exception, string message)
+        {
+            _messageField.SetValue(exception, message);
+        }
+
+        public static void ReplaceExceptionMessageField(this Exception exception, object message)
+        {
+            exception.ReplaceExceptionMessageField(message.ToString());
+        }
+    }
+}
diff --git a/Runtime/Extension/ExceptionExtensions.cs.meta b/Runtime/Extension/ExceptionExtensions.cs.meta
diff --git a/Runtime/Extension/PlayerLoopSystemExtensions.cs b/Runtime/Extension/PlayerLoopSystemExtensions.cs
@@ -1,8 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.LowLevel;
 
-namespace Better.Extensions
+namespace Better.Extensions.Runtime
 {
     // TODO: Add summary for possible result self-ref
     public static class PlayerLoopSystemExtensions
@@ -141,7 +142,7 @@ public static bool RemoveSubSystem(this ref PlayerLoopSystem loopSystem, Type su
             var subSystems = loopSystem.subSystemList.ToList();
             for (var i = subSystems.Count - 1; i >= 0; i--)
             {
-                if (subSystems[i].type != subSystemType)
+                if (subSystems[i].type == subSystemType)
                 {
                     subSystems.RemoveAt(i);
                     anyRemoved = true;
@@ -254,5 +255,25 @@ public static bool UnsubscribeRecursive<TLoop>(this ref PlayerLoopSystem loopSys
             var loopType = typeof(TLoop);
             return loopSystem.UnsubscribeRecursive(loopType, updateFunction);
         }
+
+        public static Type[] GetTypes(this ref PlayerLoopSystem loopSystem)
+        {
+            var loopTypes = new List<Type>();
+            loopSystem.CollectTypesRecursive(ref loopTypes);
+            return loopTypes.ToArray();
+        }
+
+        private static void CollectTypesRecursive(this ref PlayerLoopSystem loopSystem, ref List<Type> loopTypes)
+        {
+            loopTypes.Add(loopSystem.type);
+
+            var subSystems = loopSystem.subSystemList;
+            if (subSystems == null) return;
+
+            for (int i = 0; i < subSystems.Length; i++)
+            {
+                subSystems[i].CollectTypesRecursive(ref loopTypes);
+            }
+        }
     }
 }
diff --git a/Runtime/Extension/StringBuilderExtensions.cs b/Runtime/Extension/StringBuilderExtensions.cs
@@ -0,0 +1,12 @@
+using System.Text;
+
+namespace Better.Extensions.Runtime
+{
+    public static class StringBuilderExtensions
+    {
+        public static StringBuilder AppendLine(this StringBuilder builder, int value)
+        {
+            return builder.AppendLine(value.ToString());
+        }
+    }
+}
diff --git a/Runtime/Extension/StringBuilderExtensions.cs.meta b/Runtime/Extension/StringBuilderExtensions.cs.meta
diff --git a/Runtime/Utility/DebugUtility.cs b/Runtime/Utility/DebugUtility.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Diagnostics;
+using Debug = UnityEngine.Debug;
+using Object = UnityEngine.Object;
+
+namespace Better.Extensions.Runtime
+{
+    public static class DebugUtility
+    {
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException<T>(string message) where T : Exception, new()
+        {
+            var exception = new T();
+            exception.ReplaceExceptionMessageField(message);
+            Debug.LogException(exception);
+        }
+
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException<T>(object message) where T : Exception, new()
+        {
+            LogException<T>(message.ToString());
+        }
+
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException<T>(string message, Object context) where T : Exception, new()
+        {
+            var exception = new T();
+            exception.ReplaceExceptionMessageField(message);
+            Debug.LogException(exception, context);
+        }
+
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException<T>(object message, Object context) where T : Exception, new()
+        {
+            LogException<T>(message.ToString(), context);
+        }
+
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException(string message)
+        {
+            var exception = new Exception(message);
+            Debug.LogException(exception);
+        }
+
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException(object message)
+        {
+            LogException(message.ToString());
+        }
+
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException(string message, Object context)
+        {
+            var exception = new Exception(message);
+            Debug.LogException(exception, context);
+        }
+
+        [DebuggerHidden]
+        [DebuggerNonUserCode]
+        public static void LogException(object message, Object context)
+        {
+            LogException(message.ToString(), context);
+        }
+    }
+}
diff --git a/Runtime/Utility/DebugUtility.cs.meta b/Runtime/Utility/DebugUtility.cs.meta
diff --git a/Runtime/Utility/PlayerLoopUtility.cs b/Runtime/Utility/PlayerLoopUtility.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Linq;
+using System.Text;
 using UnityEngine;
 using UnityEngine.LowLevel;
 
-namespace Better.Extensions
+namespace Better.Extensions.Runtime
 {
     public static class PlayerLoopUtility
     {
@@ -71,7 +72,7 @@ public static void Unsubscribe(PlayerLoopSystem.UpdateFunction updateFunction)
         public static void AddSubLoop(Type sourceLoopType, Type destinationLoopType, PlayerLoopSystem.UpdateFunction updateFunction)
         {
             var currentSystem = PlayerLoop.GetCurrentPlayerLoop();
-            ref var sourceSystem = ref currentSystem.GetSubSystem(sourceLoopType);
+            ref var sourceSystem = ref currentSystem.GetSubSystemRecursive(sourceLoopType);
             if (sourceSystem.type != sourceLoopType)
             {
                 var message = $"[{nameof(PlayerLoopUtility)}] {nameof(AddSubLoop)}: not found {nameof(sourceLoopType)}({sourceLoopType.Name})";
@@ -146,7 +147,7 @@ private static void InsertLoopWithOffset(Type sourceLoopType, Type destinationLo
             ref var parentSystem = ref currentSystem.GetParentSystemRecursiveOf(sourceLoopType);
 
             var sourceSubIndex = parentSystem.FindSubSystemIndex(sourceLoopType);
-            if (sourceSubIndex < 0)
+            if (sourceSubIndex == -1)
             {
                 var message = $"[{nameof(PlayerLoopUtility)}] {nameof(InsertLoopWithOffset)}: not found {nameof(sourceLoopType)}({sourceLoopType.Name})";
                 Debug.LogWarning(message);
@@ -205,5 +206,32 @@ public static bool RemoveLoop<TLoop>()
         }
 
         #endregion
+
+        #region Logging
+
+        public static void LogCurrentPlayerLoopTypes(string message, LogType logType = LogType.Log)
+        {
+            var currentLoop = PlayerLoop.GetCurrentPlayerLoop();
+            var loopTypes = currentLoop.GetTypes();
+
+            var stringBuilder = new StringBuilder();
+            stringBuilder.AppendLine(message);
+            stringBuilder.Append("Loops count: ");
+            stringBuilder.AppendLine(loopTypes.Length);
+            foreach (var loopType in loopTypes)
+            {
+                if (loopType == null)
+                {
+                    stringBuilder.AppendLine("Empty(null)");
+                    continue;
+                }
+
+                stringBuilder.AppendLine(loopType.Name);
+            }
+
+            Debug.unityLogger.Log(logType, stringBuilder);
+        }
+
+        #endregion
     }
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "com.uurha.betterextensions",
   "displayName": "Better Extensions",
   "description": "Unity extensions, serialize extension, async extension, string extension and UI extensions",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "unity": "2020.1",
   "author": {
     "name": "Better Plugins",