Merge pull request #20 from uurha/dev

Dev
techno-dwarf-works · Nov 29, 2022 · 17da234 · 17da234
1 parent a8b206a
commit 17da234
Show file tree

Hide file tree

Showing 27 changed files with 50 additions and 30 deletions.
diff --git a/Editor/BetterExtensions.Editor.asmdef b/Editor/BetterExtensions.Editor.asmdef
@@ -1,6 +1,6 @@
 {
     "name": "BetterExtensions.Editor",
-    "rootNamespace": "",
+    "rootNamespace": "Better.Extensions",
     "references": [],
     "includePlatforms": [
         "Editor"

diff --git a/Editor/EditorAddons/ComponentExtension.cs b/Editor/EditorAddons/ComponentExtension.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace BetterExtensions.EditorAddons
+namespace Better.Extensions.EditorAddons
 {
     public static class ComponentExtension
     {

diff --git a/Runtime/BetterExtensions.Runtime.asmdef b/Runtime/BetterExtensions.Runtime.asmdef
@@ -1,6 +1,6 @@
 {
     "name": "BetterExtensions.Runtime",
-    "rootNamespace": "",
+    "rootNamespace": "Better.Extensions",
     "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/Runtime/CustomComponents/TMP_Extensions/LinkOpener.cs b/Runtime/CustomComponents/TMP_Extensions/LinkOpener.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
 
-namespace BetterExtensions.Runtime.CustomComponents
+namespace Runtime.CustomComponents
 {
     /// <summary>
     /// Component to open URL inside TMPro.TMP_Text

diff --git a/Runtime/Extension/ActionExtensions/ActionAwaiter.cs b/Runtime/Extension/ActionExtensions/ActionAwaiter.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using UnityEngine.Events;
 
-namespace BetterExtensions.Runtime.Extension.ActionExtensions
+namespace Better.Extensions.Runtime.Extension.ActionExtensions
 {
     public static class ActionAwaiter
     {

diff --git a/Runtime/Extension/ActionExtensions/BaseActionWrapper.cs b/Runtime/Extension/ActionExtensions/BaseActionWrapper.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace BetterExtensions.Runtime.Extension.ActionExtensions
+namespace Better.Extensions.Runtime.Extension.ActionExtensions
 {
     internal abstract class BaseActionWrapper<T>
     {

diff --git a/Runtime/Extension/ActionExtensions/UnityEventWrapper.cs b/Runtime/Extension/ActionExtensions/UnityEventWrapper.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using UnityEngine.Events;
 
-namespace BetterExtensions.Runtime.Extension.ActionExtensions
+namespace Better.Extensions.Runtime.Extension.ActionExtensions
 {
     internal class UnityEventWrapper<T> : BaseActionWrapper<T>
     {

diff --git a/Runtime/Extension/AsyncExtension/AssetBundleRequestAwaiter.cs b/Runtime/Extension/AsyncExtension/AssetBundleRequestAwaiter.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using Object = UnityEngine.Object;
 
-namespace BetterExtensions.Runtime.Extension.AsyncExtension
+namespace Better.Extensions.Runtime.Extension.AsyncExtension
 {
     [DebuggerNonUserCode]
     public readonly struct AssetBundleRequestAwaiter : INotifyCompletion

diff --git a/Runtime/Extension/AsyncExtension/AsyncOperationAwaiter.cs b/Runtime/Extension/AsyncExtension/AsyncOperationAwaiter.cs
@@ -3,7 +3,7 @@
 using System.Runtime.CompilerServices;
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension.AsyncExtension
+namespace Better.Extensions.Runtime.Extension.AsyncExtension
 {
     [DebuggerNonUserCode]
     public readonly struct AsyncOperationAwaiter : INotifyCompletion

diff --git a/Runtime/Extension/AsyncExtension/ExtensionMethods.cs b/Runtime/Extension/AsyncExtension/ExtensionMethods.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace BetterExtensions.Runtime.Extension.AsyncExtension
+namespace Better.Extensions.Runtime.Extension.AsyncExtension
 {
     public static class ExtensionMethods
     {

diff --git a/Runtime/Extension/AsyncExtension/ResourceRequestAwaiter.cs b/Runtime/Extension/AsyncExtension/ResourceRequestAwaiter.cs
@@ -3,7 +3,7 @@
 using System.Runtime.CompilerServices;
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension.AsyncExtension
+namespace Better.Extensions.Runtime.Extension.AsyncExtension
 {
     [DebuggerNonUserCode]
     public readonly struct ResourceRequestAwaiter : INotifyCompletion

diff --git a/Runtime/Extension/AsyncExtension/UnityWebRequestAwaiter.cs b/Runtime/Extension/AsyncExtension/UnityWebRequestAwaiter.cs
@@ -3,7 +3,7 @@
 using System.Runtime.CompilerServices;
 using UnityEngine.Networking;
 
-namespace BetterExtensions.Runtime.Extension.AsyncExtension
+namespace Better.Extensions.Runtime.Extension.AsyncExtension
 {
     [DebuggerNonUserCode]
     public readonly struct UnityWebRequestAwaiter : INotifyCompletion

diff --git a/Runtime/Extension/AudioClipExtensions.cs b/Runtime/Extension/AudioClipExtensions.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension
+namespace Better.Extensions.Runtime.Extension
 {
     public static class AudioClipExtensions
     {

diff --git a/Runtime/Extension/ClipboardExtension.cs b/Runtime/Extension/ClipboardExtension.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension
+namespace Better.Extensions.Runtime.Extension
 {
     public static class ClipboardExtension
     {

diff --git a/Runtime/Extension/EnumExtensions.cs b/Runtime/Extension/EnumExtensions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace BetterExtensions.Runtime.Extension
+namespace Better.Extensions.Runtime.Extension
 {
     public static class EnumExtensions
     {

diff --git a/Runtime/Extension/MathfExtensions/Range.cs b/Runtime/Extension/MathfExtensions/Range.cs
@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension.MathfExtensions
+namespace Better.Extensions.Runtime.Extension.MathfExtensions
 {
     [Serializable]
     public struct Range<T> where T : new()

diff --git a/Runtime/Extension/MathfExtensions/RangeExtensions.cs b/Runtime/Extension/MathfExtensions/RangeExtensions.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension.MathfExtensions
+namespace Better.Extensions.Runtime.Extension.MathfExtensions
 {
     public static class RangeExtensions
     {

diff --git a/Runtime/Extension/MathfExtensions/RendererExtensions.cs b/Runtime/Extension/MathfExtensions/RendererExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension.MathfExtensions
+namespace Better.Extensions.Runtime.Extension.MathfExtensions
 {
     public static class RendererExtensions
     {

diff --git a/Runtime/Extension/MathfExtensions/TransformStruct.cs b/Runtime/Extension/MathfExtensions/TransformStruct.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension.MathfExtensions
+namespace Better.Extensions.Runtime.Extension.MathfExtensions
 {
     public readonly struct LineIntersection
     {

diff --git a/Runtime/Extension/MathfExtensions/Vector3Math.cs b/Runtime/Extension/MathfExtensions/Vector3Math.cs
@@ -2,7 +2,7 @@
 using Unity.Collections;
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension.MathfExtensions
+namespace Better.Extensions.Runtime.Extension.MathfExtensions
 {
     public struct Vector3Math
     {

diff --git a/Runtime/Extension/NullableExtensions.cs b/Runtime/Extension/NullableExtensions.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BetterExtensions.Runtime.Extension
+namespace Better.Extensions.Runtime.Extension
 {
     public static class NullableExtensions
     {
@@ -20,7 +20,7 @@ public static bool IsNullable(this Type type)
             if (!type.IsValueType) return true;
             return Nullable.GetUnderlyingType(type) != null;
         }
-        
+
         public static bool Cast<T>(this object o, out T value)
         {
             value = default;
@@ -31,7 +31,27 @@ public static bool Cast<T>(this object o, out T value)
                     return true;
                 }
             }
-
+
+            if (o is T casted)
+            {
+                value = casted;
+                return true;
+            }
+
+            return false;
+        }
+
+        public static bool Cast<T1, T>(this T1 o, out T value)
+        {
+            value = default;
+            if (IsNullable<T>())
+            {
+                if (o == null)
+                {
+                    return true;
+                }
+            }
+
             if (o is T casted)
             {
                 value = casted;

diff --git a/Runtime/Extension/SerializeExtensions.cs b/Runtime/Extension/SerializeExtensions.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BetterExtensions.Runtime.Extension
+namespace Better.Extensions.Runtime.Extension
 {
     public static class SerializeExtensions
     {

diff --git a/Runtime/Extension/StringExtensions.cs b/Runtime/Extension/StringExtensions.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 
-namespace BetterExtensions.Runtime.Extension
+namespace Better.Extensions.Runtime.Extension
 {
     public static class StringExtensions
     {

diff --git a/Runtime/Extension/TasksExtension/TaskExtensions.cs b/Runtime/Extension/TasksExtension/TaskExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace BetterExtensions.Runtime.Extension.TasksExtension
+namespace Better.Extensions.Runtime.Extension.TasksExtension
 {
     public static class TaskExtensions
     {

diff --git a/Runtime/Extension/UIExtension.cs b/Runtime/Extension/UIExtension.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using UnityEngine;
 
-namespace BetterExtensions.Runtime.Extension
+namespace Better.Extensions.Runtime.Extension
 {
     /// <summary>
     /// UI state tool for canvas groups

diff --git a/Runtime/Wrappers/DownloadHandlerFile.cs b/Runtime/Wrappers/DownloadHandlerFile.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace BetterExtensions.Runtime.Wrappers
+namespace Better.Extensions.Runtime.Wrappers
 {
     /// <summary>
     /// This class allows to load file directly to file without loading file into memory.

diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
   "changelogUrl": "https://github.com/uurha/BetterExtensions",
   "documentationUrl": "https://github.com/uurha/BetterExtensions/tree/main#readme",
   "license": "MIT",
+  "licensesUrl":"https://github.com/uurha/BetterExtensions/blob/main/LICENSE",
   "keywords": [
     "extensions",
     "asynchronous"