From 3f454877a75a9f97087bab59051753310d7367de Mon Sep 17 00:00:00 2001 From: Christian Chomiak Date: Mon, 7 Sep 2015 19:00:52 -0430 Subject: [PATCH] Cleaned-up Singleton class * Revised the singleton class, removing unnecessary code and changing others. * Added an extra level of detail to the version numbers used (from x.y to x.y.z) --- .../Unitilities/Scenes/Examples/TestScript.cs | 1 + .../Unitilities/Scripts/Colors/ColorExtras.cs | 2 +- .../Scripts/Colors/Editor/HSVColorDrawer.cs | 2 +- .../Unitilities/Scripts/Colors/HSVColor.cs | 2 +- .../ReadOnly/Attributes/ReadOnlyAttribute.cs | 4 +- .../ReadOnly/Editor/ReadOnlyDrawer.cs | 2 +- .../Regex/Attributes/RegexAttribute.cs | 2 +- .../Attributes/Regex/Editor/RegexDrawer.cs | 2 +- .../Scripts/Core/Editor/TransformInspector.cs | 2 +- .../Scripts/Core/Editor/UnitilitiesMenu.cs | 8 +- .../Core/Extensions/CollectionExtensions.cs | 2 +- .../Core/Extensions/ColorExtentions.cs | 2 +- .../Core/Extensions/DateTimeExtensions.cs | 2 +- .../Core/Extensions/GameObjectExtensions.cs | 2 +- .../Core/Extensions/IComparableExtensions.cs | 2 +- .../Core/Extensions/PrimitiveExtensions.cs | 2 +- .../Core/Extensions/VectorExtensions.cs | 2 +- .../Scripts/Core/Helpers/ApplicationHelper.cs | 2 +- .../Scripts/Core/Helpers/ColorHelper.cs | 2 +- .../Scripts/Core/Helpers/EnumHelper.cs | 2 +- .../Scripts/Core/Helpers/MathHelper.cs | 2 +- .../Scripts/Core/Helpers/PrimitiveHelper.cs | 2 +- .../Scripts/Core/Helpers/RandomHelper.cs | 4 +- .../Scripts/Core/Helpers/TextureHelper.cs | 2 +- .../PlayerPrefs/Editor/PlayerPrefsDataType.cs | 2 - .../PlayerPrefs/Editor/PlayerPrefsEditor.cs | 2 +- .../Unitilities/Scripts/Core/Singleton.cs | 76 ++++++++++-------- .../Editor/InvisibleObjectDrawerEditor.cs | 2 +- .../Editor/ObjectTextDrawerEditor.cs | 2 +- .../Debugging/InvisibleObjectDrawer.cs | 2 +- .../Scripts/Debugging/ObjectTextDrawer.cs | 2 +- .../Localization/LocalizationConfig.cs | 2 +- .../Localization/LocalizationManager.cs | 2 +- .../Scripts/Localization/LocalizedText.cs | 2 +- .../Assets/Unitilities/Scripts/Pools/Pool.cs | 2 +- .../Scripts/Pools/PoolExtensions.cs | 2 +- .../Unitilities/Scripts/Pools/PoolManager.cs | 2 +- .../Scripts/Timers/ManagedTimer.cs | 2 +- .../Unitilities/Scripts/Timers/Timer.cs | 2 +- .../Scripts/Timers/TimerManager.cs | 2 +- .../Scripts/Tuples/Editor/TupleDrawer.cs | 8 +- .../Unitilities/Scripts/Tuples/Tuple.cs | 2 +- .../Scripts/Tuples/TupleExtensions.cs | 2 +- .../Scripts/UI/Editor/GUI3DObjectEditor.cs | 2 +- .../Unitilities/Scripts/UI/GUI3DObject.cs | 2 +- .../Scripts/UI/OrthographicCameraSetup.cs | 2 +- .../ProjectSettings/ProjectSettings.asset | Bin 36233 -> 36697 bytes .../ProjectSettings/ProjectVersion.txt | 2 +- 48 files changed, 96 insertions(+), 87 deletions(-) diff --git a/Unity Utilities/Assets/Unitilities/Scenes/Examples/TestScript.cs b/Unity Utilities/Assets/Unitilities/Scenes/Examples/TestScript.cs index 3f62f3b..e13c31e 100644 --- a/Unity Utilities/Assets/Unitilities/Scenes/Examples/TestScript.cs +++ b/Unity Utilities/Assets/Unitilities/Scenes/Examples/TestScript.cs @@ -21,4 +21,5 @@ public void Awake() { v = p2 + p1; } + } diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Colors/ColorExtras.cs b/Unity Utilities/Assets/Unitilities/Scripts/Colors/ColorExtras.cs index aaa921a..92479b4 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Colors/ColorExtras.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Colors/ColorExtras.cs @@ -1,5 +1,5 @@ /// -/// RandomColor v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// RandomColor v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// API to get random colors a given hue, saturation or value as a starting point. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Colors/Editor/HSVColorDrawer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Colors/Editor/HSVColorDrawer.cs index 31f05b0..6c30400 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Colors/Editor/HSVColorDrawer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Colors/Editor/HSVColorDrawer.cs @@ -1,5 +1,5 @@ /// -/// HSVColorDrawer v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// HSVColorDrawer v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Custom property drawer for the HSVColor struct. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Colors/HSVColor.cs b/Unity Utilities/Assets/Unitilities/Scripts/Colors/HSVColor.cs index 14d9eff..2dad7e7 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Colors/HSVColor.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Colors/HSVColor.cs @@ -1,5 +1,5 @@ /// -/// HSVColor v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// HSVColor v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Struct to represent colors in the HSV (hue, saturation, value) system. /// Includes: diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Attributes/ReadOnlyAttribute.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Attributes/ReadOnlyAttribute.cs index ace768f..8908b38 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Attributes/ReadOnlyAttribute.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Attributes/ReadOnlyAttribute.cs @@ -1,17 +1,15 @@ /// -/// RegexAttribute v1.0 +/// RegexAttribute v1.0.0 /// /// Taken from: http://blogs.unity3d.com/2012/09/07/property-drawers-in-unity-4/ /// - using UnityEngine; namespace Unitilities { public class ReadOnlyAttribute : PropertyAttribute { - public ReadOnlyAttribute() { } diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Editor/ReadOnlyDrawer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Editor/ReadOnlyDrawer.cs index b38f1bf..d39828e 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Editor/ReadOnlyDrawer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/ReadOnly/Editor/ReadOnlyDrawer.cs @@ -1,5 +1,5 @@ /// -/// ReadOnlyDrawer v1.0 +/// ReadOnlyDrawer v1.0.0 /// /// Taken from: http://answers.unity3d.com/questions/489942/how-to-make-a-readonly-property-in-inspector.html /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Attributes/RegexAttribute.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Attributes/RegexAttribute.cs index e2c0cea..111af89 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Attributes/RegexAttribute.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Attributes/RegexAttribute.cs @@ -1,5 +1,5 @@ /// -/// RegexAttribute v1.0 +/// RegexAttribute v1.0.0 /// /// Taken from: http://blogs.unity3d.com/2012/09/07/property-drawers-in-unity-4/ /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Editor/RegexDrawer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Editor/RegexDrawer.cs index 08c9b31..502c70f 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Editor/RegexDrawer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Attributes/Regex/Editor/RegexDrawer.cs @@ -1,5 +1,5 @@ /// -/// RegexDrawer v1.0 +/// RegexDrawer v1.0.0 /// /// When declaring a variable: /// * For IPv4: [Regex(@"^(?:\d{1,3}\.){3}\d{1,3}$", "Invalid IPv4 address!\nExample: '127.0.0.1'")] diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/TransformInspector.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/TransformInspector.cs index 1c8b96b..dfce1d1 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/TransformInspector.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/TransformInspector.cs @@ -1,5 +1,5 @@ /// -/// TransformInspector v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// TransformInspector v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Script to provide shortcuts in the Transform Inspector to reset the Position, /// Scale and Rotation of a GameObject. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/UnitilitiesMenu.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/UnitilitiesMenu.cs index baadc4c..96b0f30 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/UnitilitiesMenu.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Editor/UnitilitiesMenu.cs @@ -1,5 +1,5 @@ /// -/// UnitilitiesMenu v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// UnitilitiesMenu v1.0.1 by Christian Chomiak, christianchomiak@gmail.com /// /// Script to show quick Unitilities-related shortcuts in the Unity Editor. /// @@ -14,14 +14,12 @@ public class UnitilitiesMenu : ScriptableObject // Add a menu item named "Do Something with a Shortcut Key" to MyMenu in the menu bar // and give it a shortcut (ctrl-g on Windows, cmd-g on OS X). [MenuItem("Unitilities/GameObject/Enable-Disable %h")] - static void DoIt() + static void ChangeEnableStatus() { foreach (GameObject go in Selection.gameObjects) { //EditorUtility.DisplayDialog("MyTool", "Do It in C# !", "OK", ""); - bool activeStatus = go.activeSelf; - - go.SetActive(!activeStatus); + go.SetActive(!go.activeSelf); } } diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/CollectionExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/CollectionExtensions.cs index 64ab60f..ceb5a5a 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/CollectionExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/CollectionExtensions.cs @@ -1,5 +1,5 @@ /// -/// CollectionExtensions v1.2 by Christian Chomiak, christianchomiak@gmail.com +/// CollectionExtensions v1.2.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate the use of Collections (arrays, lists, etc.) /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/ColorExtentions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/ColorExtentions.cs index ff3208e..6ba4f17 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/ColorExtentions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/ColorExtentions.cs @@ -1,5 +1,5 @@ /// -/// ColorExtensions v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// ColorExtensions v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate the use of Unity's Color. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/DateTimeExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/DateTimeExtensions.cs index 797fb78..3cee0b4 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/DateTimeExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/DateTimeExtensions.cs @@ -1,5 +1,5 @@ /// -/// DateTimeExtensions v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// DateTimeExtensions v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions for manipulating Date/Time. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/GameObjectExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/GameObjectExtensions.cs index 9188a47..f64cae3 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/GameObjectExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/GameObjectExtensions.cs @@ -1,5 +1,5 @@ /// -/// GameObjectExtensions v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// GameObjectExtensions v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate the use of GameObjects /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/IComparableExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/IComparableExtensions.cs index 385484b..e598d4d 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/IComparableExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/IComparableExtensions.cs @@ -1,5 +1,5 @@ /// -/// IComparableExtensions v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// IComparableExtensions v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate the use of IComparable objects. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/PrimitiveExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/PrimitiveExtensions.cs index 0809a5e..6ed850a 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/PrimitiveExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/PrimitiveExtensions.cs @@ -1,5 +1,5 @@ /// -/// PrimitiveExtensions v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// PrimitiveExtensions v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate the use of C# primitives. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/VectorExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/VectorExtensions.cs index 96c0d9f..20e89a0 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/VectorExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Extensions/VectorExtensions.cs @@ -1,5 +1,5 @@ /// -/// VectorExtensions v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// VectorExtensions v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate the use of Vectors /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ApplicationHelper.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ApplicationHelper.cs index ebfc3ce..d4b0bfe 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ApplicationHelper.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ApplicationHelper.cs @@ -1,5 +1,5 @@ // -/// ApplicationHelper v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// ApplicationHelper v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Shortcuts for common queries to Unity's Application. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ColorHelper.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ColorHelper.cs index d457c8f..fa3c75e 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ColorHelper.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/ColorHelper.cs @@ -1,5 +1,5 @@ /// -/// ColorHelper v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// ColorHelper v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate the manipulation of Unitiy's Color. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/EnumHelper.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/EnumHelper.cs index 2b22134..cfb61cb 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/EnumHelper.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/EnumHelper.cs @@ -1,5 +1,5 @@ // -/// EnumHelper v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// EnumHelper v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Useful functions related to enums. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/MathHelper.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/MathHelper.cs index fbfc2dc..4f83a85 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/MathHelper.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/MathHelper.cs @@ -1,5 +1,5 @@ /// -/// ColorHelper v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// ColorHelper v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Set of useful mathematical functions. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/PrimitiveHelper.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/PrimitiveHelper.cs index 5aa6c38..5063a77 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/PrimitiveHelper.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/PrimitiveHelper.cs @@ -1,5 +1,5 @@ // -/// PrimitiveHelper v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// PrimitiveHelper v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Useful functions for C# primitives. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/RandomHelper.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/RandomHelper.cs index f54466a..67755d6 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/RandomHelper.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/RandomHelper.cs @@ -1,5 +1,5 @@ /// -/// RandomHelper v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// RandomHelper v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Useful functions for random labors. /// @@ -8,10 +8,8 @@ namespace Unitilities { - public static class RandomHelper { - #region int /// /// Returns 1 or -1 at random. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/TextureHelper.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/TextureHelper.cs index 0739b8d..ed859dc 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/TextureHelper.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Helpers/TextureHelper.cs @@ -1,5 +1,5 @@ /// -/// ColorHelper v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// ColorHelper v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Functions that facilitate working with Unity Textures. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsDataType.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsDataType.cs index 30c6116..9a53d7e 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsDataType.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsDataType.cs @@ -1,9 +1,7 @@ using UnityEngine; - namespace Unitilities.Debugging { - public enum PlayerPrefsType { Int, Float, String }; public class PlayerPrefsDataType diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsEditor.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsEditor.cs index e49fc60..2928c10 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsEditor.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/PlayerPrefs/Editor/PlayerPrefsEditor.cs @@ -1,5 +1,5 @@ /// -/// PlayerPrefsEditor v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// PlayerPrefsEditor v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// PlayerPrefs editor and reader. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Core/Singleton.cs b/Unity Utilities/Assets/Unitilities/Scripts/Core/Singleton.cs index 2c98b0d..8585c9c 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Core/Singleton.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Core/Singleton.cs @@ -1,5 +1,5 @@ /// -/// Singleton v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// Singleton v1.2.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Base class to provide a singleton status to an object. /// @@ -33,38 +33,54 @@ public class Singleton : MonoBehaviour where T : MonoBehaviour [SerializeField] bool isPersistent = true; - #region Unity protected virtual void Awake() { - if (Exists) //(instance != null && !IsCurrentSingleton()) + if (Exists) { - if (!IsCurrentSingleton()) + if (!IsCurrentSingleton) { - Debug.LogWarning("Warning: More than one instance of singleton " + typeof(T) + " existing."); + Debug.LogWarning("Warning: More than one instance of singleton " + typeof(T) + " exists in the scene. The newest one will be destroyed."); Destroy(gameObject); } } - else //if (instance == null) + else { - instance = gameObject.GetComponent(); // AddComponent(typeof(T)) as T; + // Previously, it was `instance = gameObject.GetComponent();` but this should be more efficient + instance = this as T; if (isPersistent) DontDestroyOnLoad(gameObject); } } - public virtual void OnDestroy() + //Only the true singleton can reset the global reference + protected virtual void OnDestroy() { - if (IsCurrentSingleton()) - { + if (IsCurrentSingleton) instance = null; + } + + #endregion + + #region Private & Protected + + /// + /// Determines whether the current instance is the one true singleton + /// + /// + protected bool IsCurrentSingleton + { + get + { + return Exists && instance.gameObject.GetInstanceID() == gameObject.GetInstanceID(); } } #endregion + #region Public API /// @@ -72,7 +88,14 @@ public virtual void OnDestroy() /// public static bool Exists { - get { return ((object)instance != null); } + get + { + #if UNITY_EDITOR + return (instance != null); + #else + return ((object) instance != null); + #endif + } } /// @@ -84,33 +107,20 @@ public static T Instance { if (!Exists) { - instance = (T)FindObjectOfType(typeof(T)); - - if (!Exists) - { - Debug.Log("An instance of " + typeof(T) + " is needed in the scene, but there is none. Generated automatically."); - - GameObject obj = new GameObject("Singleton_" + typeof(T)); - instance = obj.AddComponent(typeof(T)) as T; - } + //We could first check inside the scene for an existing instance + //but because how this script is constructed, asking if it `Exists` should be enough. + //instance = (T) FindObjectOfType(typeof(T)); + + Debug.Log("An instance of " + typeof(T).ToString() + " is needed in the scene, but there was none found.\nOne was generated automatically for you."); + + GameObject obj = new GameObject("Singleton_" + typeof(T)); + instance = obj.AddComponent(typeof(T)) as T; } return instance; } } - - /// - /// Determines whether the current instance is the one true singleton - /// - /// - public bool IsCurrentSingleton() - { - if (!Exists) // instance == null - return false; - - return instance.gameObject.GetInstanceID() == gameObject.GetInstanceID(); - } - + #endregion } diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/InvisibleObjectDrawerEditor.cs b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/InvisibleObjectDrawerEditor.cs index 7def45d..e8551d2 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/InvisibleObjectDrawerEditor.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/InvisibleObjectDrawerEditor.cs @@ -1,5 +1,5 @@ /// -/// InvisibleObjectDrawerEditor v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// InvisibleObjectDrawerEditor v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Custom editor for InvisibleObjectDrawer. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/ObjectTextDrawerEditor.cs b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/ObjectTextDrawerEditor.cs index 69d1c0b..af09678 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/ObjectTextDrawerEditor.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/Editor/ObjectTextDrawerEditor.cs @@ -1,5 +1,5 @@ /// -/// ObjectTextDrawerEditor v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// ObjectTextDrawerEditor v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Custom editor for ObjectTextDrawer. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/InvisibleObjectDrawer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/InvisibleObjectDrawer.cs index 10fcdc2..b86a074 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/InvisibleObjectDrawer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/InvisibleObjectDrawer.cs @@ -1,5 +1,5 @@ /// -/// InvisibleObjectDrawer v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// InvisibleObjectDrawer v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Script to show a GameObject's position ingame. /// Meant to be used on objects that are have no meshrender. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/ObjectTextDrawer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/ObjectTextDrawer.cs index 2e124bf..8cda075 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Debugging/ObjectTextDrawer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Debugging/ObjectTextDrawer.cs @@ -1,5 +1,5 @@ /// -/// ObjectTextDrawer v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// ObjectTextDrawer v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Script to show a text, above a GameObject, ingame. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationConfig.cs b/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationConfig.cs index d71888a..7a02239 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationConfig.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationConfig.cs @@ -1,5 +1,5 @@ /// -/// LocalizationConfig v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// LocalizationConfig v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// MonoBehaviour that makes use of the LocalizationManager and modify /// the sibling UI Text as needed. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationManager.cs b/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationManager.cs index a5aec10..e438bc8 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationManager.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizationManager.cs @@ -1,5 +1,5 @@ /// -/// LocalizationManager v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// LocalizationManager v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Manager in charge of translating the LocalizedTexts. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizedText.cs b/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizedText.cs index eed876b..651a83d 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizedText.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Localization/LocalizedText.cs @@ -1,5 +1,5 @@ /// -/// LocalizedText v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// LocalizedText v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// MonoBehaviour that makes use of the LocalizationManager and modify /// the sibling UI Text as needed. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Pools/Pool.cs b/Unity Utilities/Assets/Unitilities/Scripts/Pools/Pool.cs index 697ac7f..bdbe3c4 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Pools/Pool.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Pools/Pool.cs @@ -1,5 +1,5 @@ /// -/// Pool v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// Pool v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Structure that holds blueprints of gameobjects and handles /// the spawned and recycled objects. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolExtensions.cs index 574765c..8400566 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolExtensions.cs @@ -1,5 +1,5 @@ /// -/// PoolExtensions v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// PoolExtensions v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Group of extensions that facilitate working with the provided Pool class. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolManager.cs b/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolManager.cs index 21070a3..1077222 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolManager.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Pools/PoolManager.cs @@ -1,5 +1,5 @@ /// -/// PoolManager v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// PoolManager v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Manager in charge of handling the pools that the developer may need. /// It's not necessary but highly recommended. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Timers/ManagedTimer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Timers/ManagedTimer.cs index d85b752..4c49e93 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Timers/ManagedTimer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Timers/ManagedTimer.cs @@ -1,5 +1,5 @@ /// -/// ManagedTimer v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// ManagedTimer v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Timer to keep track of time. It uses a manager to update itself and trigger its listeners. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Timers/Timer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Timers/Timer.cs index 967414e..a7138b4 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Timers/Timer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Timers/Timer.cs @@ -1,5 +1,5 @@ /// -/// Timer v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// Timer v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Basic timer to keep track of time. To be used and consulted manually, without a manager. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Timers/TimerManager.cs b/Unity Utilities/Assets/Unitilities/Scripts/Timers/TimerManager.cs index 17ff0d5..dae819c 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Timers/TimerManager.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Timers/TimerManager.cs @@ -1,5 +1,5 @@ /// -/// TimerManager v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// TimerManager v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Entity in charge of updating any ManagedTimer. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Editor/TupleDrawer.cs b/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Editor/TupleDrawer.cs index 0fed691..ca71e36 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Editor/TupleDrawer.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Editor/TupleDrawer.cs @@ -1,4 +1,10 @@ -using UnityEngine; +/// +/// Singleton v1.0.0 by Christian Chomiak, christianchomiak@gmail.com +/// +/// Custom drawer for the Tuple class included in Unitilities +/// + +using UnityEngine; using UnityEditor; namespace Unitilities.Tuples diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Tuple.cs b/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Tuple.cs index 16b3c18..2d6449f 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Tuple.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Tuples/Tuple.cs @@ -1,5 +1,5 @@ /// -/// Tuples v1.1 by Christian Chomiak, christianchomiak@gmail.com +/// Tuples v1.1.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Structure that holds a certain amount of elements. /// Similar to a Vector2/3/4 but generic. diff --git a/Unity Utilities/Assets/Unitilities/Scripts/Tuples/TupleExtensions.cs b/Unity Utilities/Assets/Unitilities/Scripts/Tuples/TupleExtensions.cs index 9237d6f..2832ccc 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/Tuples/TupleExtensions.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/Tuples/TupleExtensions.cs @@ -1,5 +1,5 @@ /// -/// TupleExtensions v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// TupleExtensions v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Some functions to help find the Min and Max values of a Tuple. /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/UI/Editor/GUI3DObjectEditor.cs b/Unity Utilities/Assets/Unitilities/Scripts/UI/Editor/GUI3DObjectEditor.cs index fd73bab..130928e 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/UI/Editor/GUI3DObjectEditor.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/UI/Editor/GUI3DObjectEditor.cs @@ -1,5 +1,5 @@ /// -/// GUI3DObjectEditor v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// GUI3DObjectEditor v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Custom editor for GUI3DObject /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/UI/GUI3DObject.cs b/Unity Utilities/Assets/Unitilities/Scripts/UI/GUI3DObject.cs index 2fd5efc..a629ddf 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/UI/GUI3DObject.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/UI/GUI3DObject.cs @@ -1,5 +1,5 @@ /// -/// GUI3DObject v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// GUI3DObject v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Script to position a gameobject relative to the screen (like an UI element). /// diff --git a/Unity Utilities/Assets/Unitilities/Scripts/UI/OrthographicCameraSetup.cs b/Unity Utilities/Assets/Unitilities/Scripts/UI/OrthographicCameraSetup.cs index e3d8305..ee7e620 100644 --- a/Unity Utilities/Assets/Unitilities/Scripts/UI/OrthographicCameraSetup.cs +++ b/Unity Utilities/Assets/Unitilities/Scripts/UI/OrthographicCameraSetup.cs @@ -1,5 +1,5 @@ /// -/// OrthographicCameraSetup v1.0 by Christian Chomiak, christianchomiak@gmail.com +/// OrthographicCameraSetup v1.0.0 by Christian Chomiak, christianchomiak@gmail.com /// /// Script to facilitate the setup of an ortographic camera. /// diff --git a/Unity Utilities/ProjectSettings/ProjectSettings.asset b/Unity Utilities/ProjectSettings/ProjectSettings.asset index 16a95abc052e128af77b0f39dd630deaca497fc6..a1aacce0df5ce5312ed3556fdd2385f353600412 100644 GIT binary patch literal 36697 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 diff --git a/Unity Utilities/ProjectSettings/ProjectVersion.txt b/Unity Utilities/ProjectSettings/ProjectVersion.txt index 8c353d8..c609863 100644 --- a/Unity Utilities/ProjectSettings/ProjectVersion.txt +++ b/Unity Utilities/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.2f1 +m_EditorVersion: 5.1.3f1 m_StandardAssetsVersion: 0