Merge pull request 'add serializable guid' (#5) from serializable-guid into main

Reviewed-on: https://internal.negames.live/gitea/negames/Neg_Utils/pulls/5

AutoSceneChanger.cs

@@ -1,5 +1,4 @@
 using UnityEngine;
-using UnityEngine.SceneManagement;
 
 namespace NEG.Utils
 {

Editor/BuildingUtils.cs

@@ -185,8 +185,10 @@ public static class BuildingUtils
         string command =
             $"cd {Application.dataPath}/../../{Application.productName}-Steam/ContentBuilder && push_build.bat";
         if (demo)
+        {
             command =
                 $"cd {Application.dataPath}/../../{Application.productName}-Steam/ContentBuilder && push_demo.bat";
+        }
 
         var processInfo = new ProcessStartInfo("cmd.exe", $"/c {command}")
         {

Editor/ToolsWindowBase.cs

@@ -102,8 +102,10 @@ namespace NegUtils.Editor
                             return;
 
                         if (EditorPrefs.GetBool("GoToCurrentSceneAfterPlay"))
+                        {
                             EditorSceneManager.LoadSceneInPlayMode(EditorPrefs.GetString("LastOpenedScenePath"),
                                 new LoadSceneParameters(LoadSceneMode.Single));
+                        }
                         else if (EditorPrefs.GetBool("GoToFirstSceneAfterPlay"))
                             SceneManager.LoadScene(1);
                     }

KeyBasedFactory.cs

@@ -31,10 +31,12 @@ namespace NEG.Utils
                 var methodFields =
                     type.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
                 for (int i = 0; i < methodFields.Length; i++)
+                {
                     if (Attribute.GetCustomAttribute(methodFields[i], typeof(FactoryRegistration)) != null)
                         methodFields[i].Invoke(null, Array.Empty<object>());
                 }
             }
+        }
 
         public void Register(T1 key, Type type) => data.Add(key, type);
 

NEG/UI/AssemblyInfo.cs

@@ -1,3 +0,0 @@
-using System.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("NEG.UI.UnityUi")]

NEG/UI/AssemblyInfo.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 1bf54cf2dc934c9b85c514bb01057e64
-timeCreated: 1716843793

NEG/UI/PriorityQueue.cs

@@ -248,8 +248,10 @@ namespace System.Collections.Generic
         public PriorityQueue(int initialCapacity, IComparer<TPriority>? comparer)
         {
             if (initialCapacity < 0)
+            {
                 throw new ArgumentOutOfRangeException(
                     nameof(initialCapacity), initialCapacity, SR.ArgumentOutOfRange_NeedNonNegNum);
+            }
 
             _nodes = new (TElement, TPriority)[initialCapacity];
             _comparer = InitializeComparer(comparer);
@@ -508,9 +510,8 @@ namespace System.Collections.Generic
                 if (_size > 1) Heapify();
             }
             else
-            {
+                foreach (var (element, priority) in items)
-                foreach (var (element, priority) in items) Enqueue(element, priority);
+                    Enqueue(element, priority);
-            }
         }
 
         /// <summary>
@@ -554,9 +555,8 @@ namespace System.Collections.Generic
                 if (i > 1) Heapify();
             }
             else
-            {
+                foreach (var element in elements)
-                foreach (var element in elements) Enqueue(element, priority);
+                    Enqueue(element, priority);
-            }
         }
 
         /// <summary>
@@ -684,12 +684,16 @@ namespace System.Collections.Generic
             int lastParentWithChildren = GetParentIndex(_size - 1);
 
             if (_comparer == null)
+            {
                 for (int index = lastParentWithChildren; index >= 0; --index)
                     MoveDownDefaultComparer(nodes[index], index);
+            }
             else
+            {
                 for (int index = lastParentWithChildren; index >= 0; --index)
                     MoveDownCustomComparer(nodes[index], index);
             }
+        }
 
         /// <summary>
         ///     Moves a node up in the tree to restore heap order.
@@ -715,10 +719,8 @@ namespace System.Collections.Generic
                     nodeIndex = parentIndex;
                 }
                 else
-                {
                     break;
             }
-            }
 
             nodes[nodeIndex] = node;
         }
@@ -748,10 +750,8 @@ namespace System.Collections.Generic
                     nodeIndex = parentIndex;
                 }
                 else
-                {
                     break;
             }
-            }
 
             nodes[nodeIndex] = node;
         }
@@ -894,8 +894,10 @@ namespace System.Collections.Generic
                 if (array.GetLowerBound(0) != 0) throw new ArgumentException(SR.Arg_NonZeroLowerBound, nameof(array));
 
                 if (index < 0 || index > array.Length)
+                {
                     throw new ArgumentOutOfRangeException(nameof(index), index,
                         SR.ArgumentOutOfRange_IndexMustBeLessOrEqual);
+                }
 
                 if (array.Length - index < _queue._size) throw new ArgumentException(SR.Argument_InvalidOffLen);
 

NEG/UI/UiManager.cs

@@ -13,6 +13,31 @@ namespace NEG.UI
     [PublicAPI]
     public abstract class UiManager : IDisposable
     {
+        private IArea currentArea;
+        protected IDefaultPopup currentDefaultPopup;
+        private (PopupData data, int priority) currentShownPopup;
+
+        //TODO: localize
+        private string localizedYes = "Yes", localizedNo = "No", localizedOk = "Ok";
+
+        private List<IWindow> mainWindows;
+
+        private PriorityQueue<PopupData, int> popupsToShow = new();
+
+        protected UiManager(IArea startArea)
+        {
+            if (Instance != null)
+            {
+                Debug.LogError("Only one instance od UiManager is allowed");
+                return;
+            }
+
+            Instance = this;
+
+            CurrentArea = startArea;
+            mainWindows = new List<IWindow>();
+        }
+
         public static UiManager Instance { get; protected set; }
 
         /// <summary>
@@ -38,31 +63,6 @@ namespace NEG.UI
 
         public PopupData CurrentPopup => currentShownPopup.data;
 
-        private IArea currentArea;
-        protected IDefaultPopup currentDefaultPopup;
-        private (PopupData data, int priority) currentShownPopup;
-
-        //TODO: localize
-        private string localizedYes = "Yes", localizedNo = "No", localizedOk = "Ok";
-
-        private List<IWindow> mainWindows;
-
-        private PriorityQueue<PopupData, int> popupsToShow = new();
-        private Dictionary<string, IWindow> registeredWindows = new();
-
-        protected UiManager(IArea startArea = default)
-        {
-            if (Instance != null)
-            {
-                Debug.LogError("Only one instance od UiManager is allowed");
-                return;
-            }
-
-            Instance = this;
-            CurrentArea = startArea;
-            mainWindows = new List<IWindow>();
-        }
-
         public virtual void Dispose() => Instance = null;
 
         /// <summary>
@@ -164,9 +164,6 @@ namespace NEG.UI
 
         public void OnWindowClosed(IWindow window) => MainWindowClosed(window);
 
-        internal void RegisterWindow(IWindow window) => registeredWindows.Add(window.WindowId, window);
-        internal void UnRegisterWindow(IWindow window) => registeredWindows.Remove(window.WindowId);
-
         //TODO: select new main window
         protected void PopupClosed(PopupData data)
         {

NEG/UI/UnityUi/Area/MonoArea.cs

@@ -29,7 +29,7 @@ namespace NEG.UI.Area
 
         private void OnDestroy()
         {
-            if(UiManager.Instance == null)
+            if (UiManager.Instance == null)
                 return;
             if (ReferenceEquals(UiManager.Instance.CurrentArea, this))
                 UiManager.Instance.CurrentArea = null;

NEG/UI/UnityUi/Buttons/BaseButton.cs

@@ -43,10 +43,7 @@ namespace NEG.UI.UnityUi.Buttons
 
         private void Start() => OnDeselect(null);
 
-        private void OnValidate()
+        private void OnValidate() => this.ValidateRefs();
-        {
-            this.ValidateRefs();
-        }
 
         public void OnDeselect(BaseEventData eventData) => OnDeselected?.Invoke(eventData is SilentEventData);
 

NEG/UI/UnityUi/Buttons/Reactions/ExitGame.cs

@@ -1,3 +1,4 @@
+using UnityEditor;
 using UnityEngine;
 
 namespace NEG.UI.UnityUi.Buttons.Reactions
@@ -7,7 +8,7 @@ namespace NEG.UI.UnityUi.Buttons.Reactions
         protected override void OnClicked()
         {
 #if UNITY_EDITOR
-            UnityEditor.EditorApplication.isPlaying = false;
+            EditorApplication.isPlaying = false;
 #endif
             Application.Quit();
         }

NEG/UI/UnityUi/MonoUiInputManger.cs

@@ -74,10 +74,12 @@ namespace NEG.UI.UnityUi
             var data = new PointerEventData(EventSystem.current);
             var currentSelected = EventSystem.current.currentSelectedGameObject;
             if (currentSelected != null)
+            {
                 for (var current = EventSystem.current.currentSelectedGameObject.transform;
                      current != null;
                      current = current.parent)
                     ExecuteEvents.Execute(current.gameObject, data, ExecuteEvents.pointerExitHandler);
+            }
 
             EventSystem.current.SetSelectedGameObject(currentSelected);
         }

NEG/UI/UnityUi/Window/MonoWindow.cs

@@ -12,44 +12,25 @@ namespace NEG.UI.UnityUi.Window
     [DefaultExecutionOrder(10)]
     public class MonoWindow : MonoBehaviour, IWindow
     {
-        public event Action<object> OnOpened;
-        public event Action OnClosed;
-        public event Action<IControllable.BackUsed> OnBackUsed;
-        
-        [field: SerializeField] public string WindowId { get; private set; }
-
-        public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
-        public IWindowSlot Parent { get; private set; }
-        
-        public bool IsOpened { get; protected set; }
-        
-        public bool IsMainWindow { get; }
-
-        public GameObject DefaultSelectedItem => defaultSelectedItem;
-        
         [SerializeField] private List<MonoWindowSlot> windowSlots;
 
-        [SerializeField] private string windowName;
-
         [SerializeField] private GameObject defaultSelectedItem;
 
+        public bool IsMainWindow { get; }
+
+        public bool IsOpened { get; protected set; }
+
         private IWindowSlot DefaultWindowSlot => windowSlots[0];
+        public GameObject DefaultSelectedItem => defaultSelectedItem;
 
-
+        private void Awake() => ((IWindow)this).SetHiddenState();
-        private void Awake()
-        {
-            UiManager.Instance.RegisterWindow(this);
-            ((IWindow)this).SetHiddenState();
-        }
 
         private void OnDestroy()
         {
-            if(UiManager.Instance == null)
+            if (UiManager.Instance == null)
                 return;
             if (IsOpened)
                 UiManager.Instance.OnWindowClosed(this);
-            UiManager.Instance.UnRegisterWindow(this);
-
         }
 
         private void OnValidate()
@@ -60,6 +41,13 @@ namespace NEG.UI.UnityUi.Window
 #endif
         }
 
+        public event Action<object> OnOpened;
+        public event Action OnClosed;
+        public event Action<IControllable.BackUsed> OnBackUsed;
+
+        public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
+        public IWindowSlot Parent { get; private set; }
+
         public void SetOpenedState(IWindowSlot parentSlot, object data)
         {
             gameObject.SetActive(true);

NEG/UI/Window/IWindow.cs

@@ -12,8 +12,6 @@ namespace NEG.UI.Window
         /// </summary>
         IWindowSlot Parent { get; }
 
-        string WindowId { get; }
-
         /// <summary>
         ///     Called internally by slot to open window.
         /// </summary>

NEG/Utils/ReadOnlyAttribute.cs

@@ -5,5 +5,4 @@ namespace NEG.Utils
     public class ReadOnlyAttribute : PropertyAttribute
     {
     }
-
 }

NEG/Utils/SerializableGuid.cs

@@ -0,0 +1,85 @@
+using System;
+using UnityEngine;
+
+namespace NEG.Utils
+{
+    [Serializable]
+    public struct SerializableGuid : IComparable, IComparable<SerializableGuid>, IEquatable<SerializableGuid>
+    {
+        [SerializeField] private uint value0;
+        [SerializeField] private uint value1;
+        [SerializeField] private uint value2;
+        [SerializeField] private uint value3;
+
+        // public SerializableGuid(string hexRepresentation)
+        // {
+        //     value0 = 0U;
+        //     value1 = 0U;
+        //     value2 = 0U;
+        //     value3 = 0U;
+        //     TryParse(hexRepresentation, out this);
+        // }
+
+        public static bool operator ==(SerializableGuid x, SerializableGuid y)
+        {
+            return (int)x.value0 == (int)y.value0 && (int)x.value1 == (int)y.value1 &&
+                   (int)x.value2 == (int)y.value2 && (int)x.value3 == (int)y.value3;
+        }
+
+        public static bool operator !=(SerializableGuid x, SerializableGuid y) => !(x == y);
+
+        public static bool operator <(SerializableGuid x, SerializableGuid y)
+        {
+            if ((int)x.value0 != (int)y.value0)
+                return x.value0 < y.value0;
+            if ((int)x.value1 != (int)y.value1)
+                return x.value1 < y.value1;
+            return (int)x.value2 != (int)y.value2 ? x.value2 < y.value2 : x.value3 < y.value3;
+        }
+
+        public static bool operator > (SerializableGuid x, SerializableGuid y) => !(x < y) && !(x == y);
+
+        public override bool Equals(object obj) => obj is SerializableGuid guid && Equals(guid);
+
+        public bool Equals(SerializableGuid obj) => this == obj;
+
+        public override int GetHashCode()
+        {
+            return ((((((int)value0 * 397) ^ (int)value1) * 397) ^ (int)value2) * 397) ^
+                   (int)value3;
+        }
+
+        public int CompareTo(object obj) => obj == null ? 1 : CompareTo((SerializableGuid)obj);
+
+        public int CompareTo(SerializableGuid rhs)
+        {
+            if (this < rhs)
+                return -1;
+            return this > rhs ? 1 : 0;
+        }
+
+        public bool Empty() => value0 == 0U && value1 == 0U && value2 == 0U && value3 == 0U;
+
+        // public static bool TryParse(string hex, out SerializableGuid result)
+        // {
+        //     result = HexToSerializableGuidInternal(hex);
+        //     return !result.Empty();
+        // }
+
+        public static SerializableGuid Generate()
+        {
+            byte[] array = Guid.NewGuid().ToByteArray();
+
+            var guid = new SerializableGuid
+            {
+                value0 = BitConverter.ToUInt32(new ReadOnlySpan<byte>(array, 0, 4)), 
+                value1 = BitConverter.ToUInt32(new ReadOnlySpan<byte>(array, 4, 4)),
+                value2 = BitConverter.ToUInt32(new ReadOnlySpan<byte>(array, 8, 4)),
+                value3 = BitConverter.ToUInt32(new ReadOnlySpan<byte>(array, 12, 4))
+            };
+            return guid;
+        }
+
+        //public override string ToString() => SerializableGuidToHexInternal(ref this);
+    }
+}

NEG/Utils/SerializableGuid.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a81e7c502db5413194d0ebfc7bad054e
+timeCreated: 1741038901

UiToolkit/MultiSelectChips/MultiSelectChips.cs

@@ -10,9 +10,8 @@ namespace NEG.Utils.UiToolkits
 {
     public class MultiSelectChips : VisualElement
     {
-        private readonly List<MultiSelectChipItem> spawnedItems = new();
-
         private readonly VisualTreeAsset itemPrefab;
+        private readonly List<MultiSelectChipItem> spawnedItems = new();
 
         private ICollection<IMultiSelectChipItem> itemsSource;
 
@@ -86,8 +85,10 @@ namespace NEG.Utils.UiToolkits
             List<IMultiSelectChipItem> itemsToAdd = new(itemsSource);
 
             foreach (var item in spawnedItems)
+            {
                 if (itemsToAdd.Contains(item.ChipItem))
                     itemsToAdd.Remove(item.ChipItem);
+            }
 
             foreach (var item in itemsToAdd)
             {

UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml

@@ -1,4 +1,4 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements"
+<ui:UXML xmlns:ui="UnityEngine.UIElements"
          xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements"
          noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <ui:VisualElement name="VisualElement" class="unity-button"

UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml

@@ -1,4 +1,4 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements"
+<ui:UXML xmlns:ui="UnityEngine.UIElements"
          xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements"
          noNamespaceSchemaLocation="../../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
     <ui:VisualElement style="flex-direction: row; flex-wrap: wrap;">