Update file(s) "Packages/unity-utils/." from "unity-korea-community/unity-utils"

KorStrix · KorStrix · commit aa3a97f091d1 · 2021-05-31T15:34:57.000Z
diff --git a/Runtime/DataSender/DataSender.cs b/Runtime/DataSender/DataSender.cs
@@ -13,7 +13,9 @@ public class DataSender<T> : IObservable<T>, IDisposable
         public void SendData(T data)
         {
             foreach (var item in _observers)
+            {
                 item.OnNext(data);
+            }
 
             _lastSendedData = data;
         }
@@ -27,7 +29,9 @@ public void Reset()
         public IDisposable Subscribe(IObserver<T> observer)
         {
             if (_observers.Contains(observer) == false)
+            {
                 _observers.Add(observer);
+            }
             observer.OnNext(_lastSendedData);
 
             Unsubscriber<T> unsubscriber = _pool.Spawn();
@@ -63,11 +67,13 @@ public void UnSubscribe(IObserver<T> observer)
         public void Dispose()
         {
             foreach (IObserver<T> observer in _observers)
+            {
                 observer.OnCompleted();
+            }
 
             _observers.Clear();
             _pool.DeSpawnAll();
             _observers = null;
         }
     }
-}
+}
diff --git a/Runtime/DataSender/DataSenderUnityExtension.cs b/Runtime/DataSender/DataSenderUnityExtension.cs
@@ -39,7 +39,9 @@ public static DataSender<T> InitSiblingComponents<T>(this DataSender<T> target,
             {
                 Transform sibling = parnet.GetChild(i);
                 if (sibling == transform)
+                {
                     continue;
+                }
 
                 sibling.GetComponents<IObserver<T>>(siblings);
                 target.Subscribe(siblings);
diff --git a/Runtime/Extension/CollectionExtension.cs b/Runtime/Extension/CollectionExtension.cs
@@ -21,11 +21,11 @@ public static string ToStringCollection<T>(this T[] target)
                 {
                     _stringBuilder.Append(target[i].ToString());
                     if (i < target.Length - 1)
+                    {
                         _stringBuilder.Append(", ");
+                    }
                 }
-
                 _stringBuilder.Append("]");
-
             }
 
             return _stringBuilder.ToString();
diff --git a/Runtime/Extension/RandomExtension.cs b/Runtime/Extension/RandomExtension.cs
@@ -26,7 +26,9 @@ public static T Random<T>(this IEnumerable<T> target, System.Func<T, int> getPer
             {
                 totalvariable += getPercentage(item);
                 if (random < totalvariable)
+                {
                     return item;
+                }
             }
 
             return default;
diff --git a/Runtime/SimplePool.cs b/Runtime/SimplePool.cs
@@ -20,7 +20,7 @@ public SimplePool(T originItem)
             Init(originItem, 0);
         }
 
-        public SimplePool(T originItem, int initializeSize = 0)
+        public SimplePool(T originItem, int initializeSize)
         {
             _OnCreateInstance = (origin) => Activator.CreateInstance<T>();
             Init(originItem, initializeSize);
@@ -61,7 +61,9 @@ public T Spawn()
         public void DeSpawn(T item)
         {
             if (_use.Contains(item) == false)
+            {
                 return;
+            }
 
             OnDespawn(item);
             _use.Remove(item);
@@ -71,7 +73,9 @@ public void DeSpawn(T item)
         public void DeSpawnAll()
         {
             while (_use.Count > 0)
+            {
                 DeSpawn(_use.Last());
+            }
         }
 
         protected virtual T OnRequireNewInstance(T originItem) => _OnCreateInstance(originItem);
@@ -83,7 +87,9 @@ protected void Init(T originItem, int initializeSize)
             _originItem = originItem;
 
             for (int i = 0; i < initializeSize; i++)
+            {
                 Spawn();
+            }
             DeSpawnAll();
         }
     }
diff --git a/Runtime/SingletonComponentBase.cs b/Runtime/SingletonComponentBase.cs
@@ -9,26 +9,30 @@ public static T instance
         {
             get
             {
-                if (s_isQuitApp)
+                if (_isQuitApp)
+                {
                     return default;
+                }
 
-                if (s_instance == null)
+                if (_instance == null)
                 {
-                    s_instance = FindObjectOfType<T>();
-                    s_instance.InitSingleton();
+                    _instance = FindObjectOfType<T>();
+                    _instance.InitSingleton();
                 }
 
-                return s_instance;
+                return _instance;
             }
         }
 
-        private static T s_instance { get; set; }
-        private static bool s_isQuitApp { get; set; }
+        private static T _instance { get; set; }
+        private static bool _isQuitApp { get; set; }
 
-        void Awake()
+        protected virtual void Awake()
         {
-            if (s_instance == null)
+            if (_instance == null)
+            {
                 InitSingleton();
+            }
         }
 
         protected virtual void InitSingleton()
@@ -37,7 +41,7 @@ protected virtual void InitSingleton()
 
         private void OnApplicationQuit()
         {
-            s_isQuitApp = true;
+            _isQuitApp = true;
         }
     }
 }
diff --git a/Runtime/StateMachineGeneric.cs b/Runtime/StateMachineGeneric.cs
@@ -105,7 +105,9 @@ public void Start(MonoBehaviour owner, STATE_ID startState, params STATE_ID[] ne
         public void ChangeState(STATE_ID state)
         {
             if (_debug)
+            {
                 Debug.Log($"{_owner.name}.FSM.ChangeState changeState:{state}, wait:{_waitQueue.ToStringCollection()}", _owner);
+            }
 
             _commandQueue.Add(new Command(CommandType.Change, state));
         }
@@ -125,7 +127,9 @@ public void FinishState()
         public void EnqueueToWaitQueue(params STATE_ID[] nextStates)
         {
             if (_waitQueue.Count > 10)
+            {
                 Debug.LogWarning($"{_owner.name} _waitQueue.Count > 10, wait:{_waitQueue.ToStringCollection()}", _owner);
+            }
             nextStates.Foreach(state => _waitQueue.Add(state));
         }
 
@@ -158,10 +162,14 @@ IEnumerator UpdateCoroutine()
             while (true)
             {
                 while (_commandQueue.Count > 0)
+                {
                     ProcessCommand(_commandQueue.Dequeue());
+                }
 
                 if (currentState == null && _waitQueue.Count > 0)
+                {
                     OnStartState(_waitQueue.Dequeue());
+                }
 
                 yield return null;
             }
@@ -187,7 +195,9 @@ private void ProcessCommand(Command command)
         private void OnStartState(STATE_ID stateID)
         {
             if (_debug)
+            {
                 Debug.Log($"{_owner.name}.FSM.OnStartState.Entry current:{currentStateID}, new:{stateID}, wait:{_waitQueue.ToStringCollection()}", _owner);
+            }
 
             if (_stateInstance.TryGetValue(stateID, out TSTATE state) == false)
             {
@@ -196,10 +206,14 @@ private void OnStartState(STATE_ID stateID)
             }
 
             if (state.Equals(currentState))
+            {
                 return;
+            }
 
             if (_debug)
+            {
                 Debug.Log($"{_owner.name}.FSM.OnStartState.Execute current:{currentStateID}, new:{stateID}, wait:{_waitQueue.ToStringCollection()}", _owner);
+            }
 
             currentState?.OnChangeState(state);
             state.OnAwake();
@@ -212,10 +226,14 @@ private void OnStartState(STATE_ID stateID)
         private void OnFinishState()
         {
             if (_debug)
+            {
                 Debug.Log($"{_owner.name}.FSM.OnFinishState current:{currentStateID}, wait:{_waitQueue.ToStringCollection()}");
+            }
 
             if (_currentCoroutine != null)
+            {
                 _owner.StopCoroutine(_currentCoroutine);
+            }
             currentState?.OnFinishState();
             currentState = null;
             _currentStateID = default;
diff --git a/Runtime/UnitytComponentPool.cs b/Runtime/UnitytComponentPool.cs
@@ -8,12 +8,21 @@ public class UnitytComponentPool<T> : SimplePool<T>
     {
         Transform _parent;
 
-        public UnitytComponentPool(T originItem, int initializeSize = 0) : base(originItem, initializeSize)
+        public UnitytComponentPool(T originItem) : base(originItem)
         {
             originItem.gameObject.SetActive(false);
         }
 
-        public UnitytComponentPool(Func<T> onCreateInstance, int initializeSize = 0) : base(onCreateInstance, initializeSize)
+        public UnitytComponentPool(T originItem, int initializeSize) : base(originItem, initializeSize)
+        {
+            originItem.gameObject.SetActive(false);
+        }
+
+        public UnitytComponentPool(Func<T> onCreateInstance) : base(onCreateInstance)
+        {
+        }
+
+        public UnitytComponentPool(Func<T> onCreateInstance, int initializeSize) : base(onCreateInstance, initializeSize)
         {
         }
 
@@ -28,7 +37,9 @@ protected override T OnRequireNewInstance(T originItem)
         {
             T newInstance = base.OnRequireNewInstance(originItem);
             if (_parent != null)
+            {
                 newInstance.transform.SetParent(_parent);
+            }
 
             newInstance.gameObject.SetActive(false);
             return newInstance;
diff --git a/Runtime/Unsubscriber.cs b/Runtime/Unsubscriber.cs
@@ -27,9 +27,11 @@ public void Reset(HashSet<IObserver<T>> observers, IObserver<T> observer, Action
         public void Dispose()
         {
             if (_observer != null)
+            {
                 _observers.Remove(_observer);
+            }
 
             _onDisplose?.Invoke(this);
         }
     }
-}
+}
diff --git a/Tests/Runtime/DataSenderTests.cs b/Tests/Runtime/DataSenderTests.cs
@@ -7,8 +7,8 @@ public class DataSenderTests
 {
     public class TestData
     {
-        public string stringData;
-        public int numberData;
+        public string stringData { get; private set; }
+        public int numberData { get; private set; }
 
         public TestData(int numberData)
         {
@@ -59,4 +59,4 @@ public void 사용예시()
         Assert.AreEqual(receiverComponent.data.stringData, testData.stringData);
         Assert.AreEqual(receiverComponent.data.numberData, testData.numberData);
     }
-}
+}
diff --git a/Tests/Runtime/SimplePoolTests.cs b/Tests/Runtime/SimplePoolTests.cs
@@ -19,7 +19,7 @@ static public class Factory
         {
             static public SimplePoolTarget CreateInstance_FromFactory()
             {
-                return new SimplePoolTarget() { isCreateFromFactory = true };
+                return new SimplePoolTarget { isCreateFromFactory = true };
             }
         }
 
@@ -56,10 +56,14 @@ public void 사용예시()
             int spawnCount = Random.Range(2, totalInstanceCount);
             HashSet<SimplePoolTarget> set = new HashSet<SimplePoolTarget>();
             for (int j = 0; j < spawnCount; j++)
+            {
                 set.Add(pool.Spawn());
+            }
 
             foreach (var item in set)
+            {
                 pool.DeSpawn(item);
+            }
         }
 
         Assert.AreEqual(pool.allInstance.Count, totalInstanceCount);

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ public class DataSender<T> : IObservable<T>, IDisposable`
`13`	`13`	`public void SendData(T data)`
`14`	`14`	`{`
`15`	`15`	`foreach (var item in _observers)`
	`16`	`+ {`
`16`	`17`	`item.OnNext(data);`
	`18`	`+ }`
`17`	`19`
`18`	`20`	`_lastSendedData = data;`
`19`	`21`	`}`
`@@ -27,7 +29,9 @@ public void Reset()`
`27`	`29`	`public IDisposable Subscribe(IObserver<T> observer)`
`28`	`30`	`{`
`29`	`31`	`if (_observers.Contains(observer) == false)`
	`32`	`+ {`
`30`	`33`	`_observers.Add(observer);`
	`34`	`+ }`
`31`	`35`	`observer.OnNext(_lastSendedData);`
`32`	`36`
`33`	`37`	`Unsubscriber<T> unsubscriber = _pool.Spawn();`
`@@ -63,11 +67,13 @@ public void UnSubscribe(IObserver<T> observer)`
`63`	`67`	`public void Dispose()`
`64`	`68`	`{`
`65`	`69`	`foreach (IObserver<T> observer in _observers)`
	`70`	`+ {`
`66`	`71`	`observer.OnCompleted();`
	`72`	`+ }`
`67`	`73`
`68`	`74`	`_observers.Clear();`
`69`	`75`	`_pool.DeSpawnAll();`
`70`	`76`	`_observers = null;`
`71`	`77`	`}`
`72`	`78`	`}`
`73`		`-}`
	`79`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ public static DataSender<T> InitSiblingComponents<T>(this DataSender<T> target,`
`39`	`39`	`{`
`40`	`40`	`Transform sibling = parnet.GetChild(i);`
`41`	`41`	`if (sibling == transform)`
	`42`	`+ {`
`42`	`43`	`continue;`
	`44`	`+ }`
`43`	`45`
`44`	`46`	`sibling.GetComponents<IObserver<T>>(siblings);`
`45`	`47`	`target.Subscribe(siblings);`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ public static string ToStringCollection<T>(this T[] target)`
`21`	`21`	`{`
`22`	`22`	`_stringBuilder.Append(target[i].ToString());`
`23`	`23`	`if (i < target.Length - 1)`
	`24`	`+ {`
`24`	`25`	`_stringBuilder.Append(", ");`
	`26`	`+ }`
`25`	`27`	`}`
`26`		`-`
`27`	`28`	`_stringBuilder.Append("]");`
`28`		`-`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`return _stringBuilder.ToString();`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ public static T Random<T>(this IEnumerable<T> target, System.Func<T, int> getPer`
`26`	`26`	`{`
`27`	`27`	`totalvariable += getPercentage(item);`
`28`	`28`	`if (random < totalvariable)`
	`29`	`+ {`
`29`	`30`	`return item;`
	`31`	`+ }`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`return default;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public SimplePool(T originItem)`
`20`	`20`	`Init(originItem, 0);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public SimplePool(T originItem, int initializeSize = 0)`
	`23`	`+ public SimplePool(T originItem, int initializeSize)`
`24`	`24`	`{`
`25`	`25`	`_OnCreateInstance = (origin) => Activator.CreateInstance<T>();`
`26`	`26`	`Init(originItem, initializeSize);`
`@@ -61,7 +61,9 @@ public T Spawn()`
`61`	`61`	`public void DeSpawn(T item)`
`62`	`62`	`{`
`63`	`63`	`if (_use.Contains(item) == false)`
	`64`	`+ {`
`64`	`65`	`return;`
	`66`	`+ }`
`65`	`67`
`66`	`68`	`OnDespawn(item);`
`67`	`69`	`_use.Remove(item);`
`@@ -71,7 +73,9 @@ public void DeSpawn(T item)`
`71`	`73`	`public void DeSpawnAll()`
`72`	`74`	`{`
`73`	`75`	`while (_use.Count > 0)`
	`76`	`+ {`
`74`	`77`	`DeSpawn(_use.Last());`
	`78`	`+ }`
`75`	`79`	`}`
`76`	`80`
`77`	`81`	`protected virtual T OnRequireNewInstance(T originItem) => _OnCreateInstance(originItem);`
`@@ -83,7 +87,9 @@ protected void Init(T originItem, int initializeSize)`
`83`	`87`	`_originItem = originItem;`
`84`	`88`
`85`	`89`	`for (int i = 0; i < initializeSize; i++)`
	`90`	`+ {`
`86`	`91`	`Spawn();`
	`92`	`+ }`
`87`	`93`	`DeSpawnAll();`
`88`	`94`	`}`
`89`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,30 @@ public static T instance`
`9`	`9`	`{`
`10`	`10`	`get`
`11`	`11`	`{`
`12`		`- if (s_isQuitApp)`
	`12`	`+ if (_isQuitApp)`
	`13`	`+ {`
`13`	`14`	`return default;`
	`15`	`+ }`
`14`	`16`
`15`		`- if (s_instance == null)`
	`17`	`+ if (_instance == null)`
`16`	`18`	`{`
`17`		`- s_instance = FindObjectOfType<T>();`
`18`		`- s_instance.InitSingleton();`
	`19`	`+ _instance = FindObjectOfType<T>();`
	`20`	`+ _instance.InitSingleton();`
`19`	`21`	`}`
`20`	`22`
`21`		`- return s_instance;`
	`23`	`+ return _instance;`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`
`25`		`- private static T s_instance { get; set; }`
`26`		`- private static bool s_isQuitApp { get; set; }`
	`27`	`+ private static T _instance { get; set; }`
	`28`	`+ private static bool _isQuitApp { get; set; }`
`27`	`29`
`28`		`- void Awake()`
	`30`	`+ protected virtual void Awake()`
`29`	`31`	`{`
`30`		`- if (s_instance == null)`
	`32`	`+ if (_instance == null)`
	`33`	`+ {`
`31`	`34`	`InitSingleton();`
	`35`	`+ }`
`32`	`36`	`}`
`33`	`37`
`34`	`38`	`protected virtual void InitSingleton()`
`@@ -37,7 +41,7 @@ protected virtual void InitSingleton()`
`37`	`41`
`38`	`42`	`private void OnApplicationQuit()`
`39`	`43`	`{`
`40`		`- s_isQuitApp = true;`
	`44`	`+ _isQuitApp = true;`
`41`	`45`	`}`
`42`	`46`	`}`
`43`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,21 @@ public class UnitytComponentPool<T> : SimplePool<T>`
`8`	`8`	`{`
`9`	`9`	`Transform _parent;`
`10`	`10`
`11`		`- public UnitytComponentPool(T originItem, int initializeSize = 0) : base(originItem, initializeSize)`
	`11`	`+ public UnitytComponentPool(T originItem) : base(originItem)`
`12`	`12`	`{`
`13`	`13`	`originItem.gameObject.SetActive(false);`
`14`	`14`	`}`
`15`	`15`
`16`		`- public UnitytComponentPool(Func<T> onCreateInstance, int initializeSize = 0) : base(onCreateInstance, initializeSize)`
	`16`	`+ public UnitytComponentPool(T originItem, int initializeSize) : base(originItem, initializeSize)`
	`17`	`+ {`
	`18`	`+ originItem.gameObject.SetActive(false);`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ public UnitytComponentPool(Func<T> onCreateInstance) : base(onCreateInstance)`
	`22`	`+ {`
	`23`	`+ }`
	`24`	`+`
	`25`	`+ public UnitytComponentPool(Func<T> onCreateInstance, int initializeSize) : base(onCreateInstance, initializeSize)`
`17`	`26`	`{`
`18`	`27`	`}`
`19`	`28`
`@@ -28,7 +37,9 @@ protected override T OnRequireNewInstance(T originItem)`
`28`	`37`	`{`
`29`	`38`	`T newInstance = base.OnRequireNewInstance(originItem);`
`30`	`39`	`if (_parent != null)`
	`40`	`+ {`
`31`	`41`	`newInstance.transform.SetParent(_parent);`
	`42`	`+ }`
`32`	`43`
`33`	`44`	`newInstance.gameObject.SetActive(false);`
`34`	`45`	`return newInstance;`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,11 @@ public void Reset(HashSet<IObserver<T>> observers, IObserver<T> observer, Action`
`27`	`27`	`public void Dispose()`
`28`	`28`	`{`
`29`	`29`	`if (_observer != null)`
	`30`	`+ {`
`30`	`31`	`_observers.Remove(_observer);`
	`32`	`+ }`
`31`	`33`
`32`	`34`	`_onDisplose?.Invoke(this);`
`33`	`35`	`}`
`34`	`36`	`}`
`35`		`-}`
	`37`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ public class DataSenderTests`
`7`	`7`	`{`
`8`	`8`	`public class TestData`
`9`	`9`	`{`
`10`		`- public string stringData;`
`11`		`- public int numberData;`
	`10`	`+ public string stringData { get; private set; }`
	`11`	`+ public int numberData { get; private set; }`
`12`	`12`
`13`	`13`	`public TestData(int numberData)`
`14`	`14`	`{`
`@@ -59,4 +59,4 @@ public void 사용예시()`
`59`	`59`	`Assert.AreEqual(receiverComponent.data.stringData, testData.stringData);`
`60`	`60`	`Assert.AreEqual(receiverComponent.data.numberData, testData.numberData);`
`61`	`61`	`}`
`62`		`-}`
	`62`	`+}`