com.wallstop-studios.unity-helpers 2.0.0-rc61 → 2.0.0-rc63

package/Runtime/Core/DataStructure/QuadTree.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.DataStructure
+namespace WallstopStudios.UnityHelpers.Core.DataStructure
 {
     using System;
     using System.Collections.Generic;

package/Runtime/Core/DataStructure/RTree.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.DataStructure
+namespace WallstopStudios.UnityHelpers.Core.DataStructure
 {
     using System;
     using System.Collections.Generic;

package/Runtime/Core/DataStructure/StringWrapper.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.DataStructure
+namespace WallstopStudios.UnityHelpers.Core.DataStructure
 {
     using System;
     using System.Collections.Concurrent;

package/Runtime/Core/DataStructure/TimedCache.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.DataStructure
+namespace WallstopStudios.UnityHelpers.Core.DataStructure
 {
     using System;
     using Helper;

package/Runtime/Core/Extension/AnimatorExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using UnityEngine;
 

package/Runtime/Core/Extension/AsyncOperationExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Concurrent;

package/Runtime/Core/Extension/CircleExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System.Collections.Generic;
     using DataStructure;

package/Runtime/Core/Extension/ColorExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System.Collections.Generic;
     using System.ComponentModel;
@@ -20,6 +20,21 @@
     {
         private static readonly Dictionary<Vector3Int, int> ColorBucketCache = new();
 
+        public static string ToHex(this Color color, bool includeAlpha = true)
+        {
+            int r = (int)(Mathf.Clamp01(color.r) * 255f);
+            int g = (int)(Mathf.Clamp01(color.g) * 255f);
+            int b = (int)(Mathf.Clamp01(color.b) * 255f);
+
+            if (!includeAlpha)
+            {
+                return $"#{r:X2}{g:X2}{b:X2}";
+            }
+
+            int a = (int)(Mathf.Clamp01(color.a) * 255f);
+            return $"#{r:X2}{g:X2}{b:X2}{a:X2}";
+        }
+
         public static Color GetAverageColor(
             this Sprite sprite,
             ColorAveragingMethod method = ColorAveragingMethod.LAB,

package/Runtime/Core/Extension/DictionaryExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Concurrent;

package/Runtime/Core/Extension/DirectionExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Generic;

package/Runtime/Core/Extension/EnumExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Runtime.CompilerServices;

package/Runtime/Core/Extension/HashSetExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System.Collections.Generic;
 

package/Runtime/Core/Extension/IEnumerableExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Concurrent;

package/Runtime/Core/Extension/IListExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Generic;

package/Runtime/Core/Extension/LoggingExtensions.cs

@@ -2,21 +2,25 @@
 #define ENABLE_UBERLOGGING
 #endif
 
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using System.Reflection;
-    using System.Runtime.CompilerServices;
     using System.Threading;
-    using JetBrains.Annotations;
+    using Helper;
+    using Helper.Logging;
     using UnityEngine;
     using Utils;
-    using Debug = UnityEngine.Debug;
     using Object = UnityEngine.Object;
 
     public static class LoggingExtensions
     {
+        public static readonly UnityLogTagFormatter LogInstance = new(
+            createDefaultDecorators: true
+        );
+
         private static readonly Thread UnityMainThread;
         private const int LogsPerCacheClean = 5;
 
@@ -24,8 +28,10 @@ namespace UnityHelpers.Core.Extension
         private static long _cacheAccessCount;
 
         private static readonly HashSet<Object> Disabled = new();
-        private static readonly Dictionary<Type, FieldInfo[]> FieldCache = new();
-        private static readonly Dictionary<Type, PropertyInfo[]> PropertyCache = new();
+        private static readonly Dictionary<Type, (string, Func<object, object>)[]> MetadataCache =
+            new();
+
+        private static readonly Dictionary<string, object> GenericObject = new();
 
         static LoggingExtensions()
         {
@@ -33,7 +39,7 @@ namespace UnityHelpers.Core.Extension
             /*
                 Unity throws exceptions if you try to log on something that isn't the main thread.
                 Sometimes, it's nice to log in async Tasks. Assume that the first initialization of
-                this class will be done by the Unity main thread, and then check every time we log.
+                this class will be done by the Unity main thread and then check every time we log.
                 If the logging thread is not the unity main thread, then do nothing
                 (instead of throwing...)
              */
@@ -61,6 +67,7 @@ namespace UnityHelpers.Core.Extension
             Disabled.Add(component);
         }
 
+        [HideInCallstack]
         public static string GenericToString(this Object component)
         {
             if (component == null)
@@ -68,148 +75,114 @@ namespace UnityHelpers.Core.Extension
                 return "null";
             }
 
-            Dictionary<string, object> structure = new();
-            Type type = component.GetType();
-            FieldInfo[] fields = FieldCache.GetOrAdd(
-                type,
-                inType => inType.GetFields(BindingFlags.Public | BindingFlags.Instance)
-            );
-            PropertyInfo[] properties = PropertyCache.GetOrAdd(
-                type,
-                inType => inType.GetProperties(BindingFlags.Public | BindingFlags.Instance)
+            (string, Func<object, object>)[] metadataAccess = MetadataCache.GetOrAdd(
+                component.GetType(),
+                inType =>
+                    inType
+                        .GetFields(BindingFlags.Public | BindingFlags.Instance)
+                        .Select(field => (field.Name, ReflectionHelpers.GetFieldGetter(field)))
+                        .Concat(
+                            inType
+                                .GetProperties(BindingFlags.Public | BindingFlags.Instance)
+                                .Select(property =>
+                                    (property.Name, ReflectionHelpers.GetPropertyGetter(property))
+                                )
+                        )
+                        .ToArray()
             );
-            foreach (FieldInfo field in fields)
-            {
-                structure[field.Name] = ValueFormat(field.GetValue(component));
-            }
-
-            foreach (PropertyInfo property in properties)
-            {
-                structure[property.Name] = ValueFormat(property.GetValue(component));
-            }
-
-            return structure.ToJson();
 
-            object ValueFormat(object value)
+            GenericObject.Clear();
+            foreach ((string name, Func<object, object> access) in metadataAccess)
             {
-                if (value is Object obj)
+                try
+                {
+                    string valueFormat = ValueFormat(access(component));
+                    if (valueFormat != null)
+                    {
+                        GenericObject[name] = valueFormat;
+                    }
+                }
+                catch
                 {
-                    return obj != null ? obj.name : null;
+                    // Skip
                 }
-                return value?.ToString();
             }
-        }
-
-        [StringFormatMethod("message")]
-        public static void Log(this Object component, string message, params object[] args)
-        {
-#if ENABLE_UBERLOGGING
-            LogDebug(component, message, args);
-#endif
-        }
 
-        [StringFormatMethod("message")]
-        public static void LogMethod(this Object component, [CallerMemberName] string caller = "")
-        {
-#if ENABLE_UBERLOGGING
-            LogDebug(component, caller);
-#endif
+            return GenericObject.ToJson();
         }
 
-        [StringFormatMethod("message")]
-        public static void LogDebug(this Object component, string message, params object[] args)
+        [HideInCallstack]
+        private static string ValueFormat(object value)
         {
-#if ENABLE_UBERLOGGING
-            LogDebug(component, message, null, args);
-#endif
-        }
-
-        [StringFormatMethod("message")]
-        public static void LogWarn(this Object component, string message, params object[] args)
-        {
-#if ENABLE_UBERLOGGING
-            LogWarn(component, message, null, args);
-#endif
-        }
-
-        [StringFormatMethod("message")]
-        public static void LogError(this Object component, string message, params object[] args)
-        {
-#if ENABLE_UBERLOGGING
-            LogError(component, message, null, args);
-#endif
+            if (value is Object obj)
+            {
+                return obj != null ? obj.name : "null";
+            }
+            return value?.ToString();
         }
 
-        [StringFormatMethod("message")]
+        [HideInCallstack]
         public static void Log(
             this Object component,
-            string message,
-            Exception e,
-            params object[] args
+            FormattableString message,
+            Exception e = null,
+            bool pretty = true
         )
         {
 #if ENABLE_UBERLOGGING
-            LogDebug(component, message, e, args);
+            LogDebug(component, message, e, pretty);
 #endif
         }
 
-        [StringFormatMethod("message")]
+        [HideInCallstack]
         public static void LogDebug(
             this Object component,
-            string message,
-            Exception e,
-            params object[] args
+            FormattableString message,
+            Exception e = null,
+            bool pretty = true
         )
         {
 #if ENABLE_UBERLOGGING
             if (LoggingAllowed(component))
             {
-                Debug.Log(
-                    Wrap(component, args.Length != 0 ? string.Format(message, args) : message, e),
-                    component
-                );
+                LogInstance.Log(message, component, e, pretty);
             }
 #endif
         }
 
-        [StringFormatMethod("message")]
+        [HideInCallstack]
         public static void LogWarn(
             this Object component,
-            string message,
-            Exception e,
-            params object[] args
+            FormattableString message,
+            Exception e = null,
+            bool pretty = true
         )
         {
 #if ENABLE_UBERLOGGING
             if (LoggingAllowed(component))
             {
-                Debug.LogWarning(
-                    Wrap(component, args.Length != 0 ? string.Format(message, args) : message, e),
-                    component
-                );
+                LogInstance.LogWarn(message, component, e, pretty);
             }
 #endif
         }
 
-        [StringFormatMethod("message")]
+        [HideInCallstack]
         public static void LogError(
             this Object component,
-            string message,
-            Exception e,
-            params object[] args
+            FormattableString message,
+            Exception e = null,
+            bool pretty = true
         )
         {
 #if ENABLE_UBERLOGGING
             if (LoggingAllowed(component))
             {
-                Debug.LogError(
-                    Wrap(component, args.Length != 0 ? string.Format(message, args) : message, e),
-                    component
-                );
+                LogInstance.LogError(message, component, e, pretty);
             }
 #endif
         }
 
+        [HideInCallstack]
         private static bool LoggingAllowed(Object component)
         {
             if (Interlocked.Increment(ref _cacheAccessCount) % LogsPerCacheClean == 0)
@@ -234,31 +207,5 @@ namespace UnityHelpers.Core.Extension
                 && Equals(Thread.CurrentThread, UnityMainThread)
                 && !Disabled.Contains(component);
         }
-
-        private static string Wrap(Object component, string message, Exception e)
-        {
-#if ENABLE_UBERLOGGING
-            float now = Time.time;
-            string componentType;
-            string gameObjectName;
-            if (component != null)
-            {
-                componentType = component.GetType().Name;
-                gameObjectName = component.name;
-            }
-            else
-            {
-                componentType = "NO_TYPE";
-                gameObjectName = "NO_NAME";
-            }
-
-            return e != null
-                ? $"{now}|{gameObjectName}[{componentType}]|{message}\n    {e}"
-                : $"{now}|{gameObjectName}[{componentType}]|{message}";
-
-#else
-            return string.Empty;
-#endif
-        }
     }
 }

package/Runtime/Core/Extension/RandomExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Generic;

package/Runtime/Core/Extension/SerializedPropertyExtensions.cs

@@ -1,9 +1,9 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
 #if UNITY_EDITOR
-    using UnityEditor;
     using System;
     using System.Reflection;
+    using UnityEditor;
 
     public static class SerializedPropertyExtensions
     {

package/Runtime/Core/Extension/StringExtensions.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System.Collections.Generic;
     using System.Text;

package/Runtime/Core/Extension/UnityExtensions.cs

@@ -1,9 +1,8 @@
-namespace UnityHelpers.Core.Extension
+namespace WallstopStudios.UnityHelpers.Core.Extension
 {
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Threading.Tasks;
     using DataStructure;
     using DataStructure.Adapters;
     using Helper;

package/Runtime/Core/Helper/ArrayConverter.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System;
 

package/Runtime/Core/Helper/AssignUtilities.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     public static class AssignUtilities
     {

package/Runtime/Core/Helper/DirectoryHelper.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System;
     using System.IO;

package/Runtime/Core/Helper/Enumerables.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System.Collections.Generic;
 

package/Runtime/Core/Helper/FormattingHelpers.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System;
 

package/Runtime/Core/Helper/Geometry.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System.Collections.Generic;
     using System.Linq;

package/Runtime/Core/Helper/Helpers.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System;
     using System.Collections;
@@ -7,15 +7,12 @@
     using System.Reflection;
     using DataStructure.Adapters;
     using Extension;
+    using Partials;
     using Random;
+    using UnityEditor;
     using UnityEngine;
-    using UnityEngine.SceneManagement;
     using Utils;
     using Object = UnityEngine.Object;
-#if UNITY_EDITOR
-    using UnityEditor;
-    using UnityEditor.SceneManagement;
-#endif
 
     public static partial class Helpers
     {
@@ -411,7 +408,7 @@
                 }
                 catch
                 {
-                    original.LogWarn("Failed to copy public field {0}.", field.Name);
+                    original.LogWarn($"Failed to copy public field {field.Name}.");
                 }
             }
 
@@ -426,7 +423,7 @@
                 }
                 catch
                 {
-                    original.LogWarn("Failed to copy non-public field {0}.", field.Name);
+                    original.LogWarn($"Failed to copy non-public field {field.Name}.");
                 }
             }
 
@@ -443,7 +440,7 @@
                 }
                 catch
                 {
-                    original.LogWarn("Failed to copy property {0}.", property.Name);
+                    original.LogWarn($"Failed to copy property {property.Name}.");
                 }
             }
 

package/Runtime/Core/Helper/IterationHelpers.cs

@@ -1,4 +1,4 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
     using System.Collections.Generic;
 

package/Runtime/Core/Helper/LifetimeHelpers.cs

@@ -1,5 +1,6 @@
-namespace UnityHelpers.Core.Helper
+namespace WallstopStudios.UnityHelpers.Core.Helper
 {
+    using Partials;
     using Object = UnityEngine.Object;
 
     public static class LifetimeHelpers