Merge pull request #53 from uurha/dev

Dev
techno-dwarf-works · Apr 4, 2023 · bd8950d · bd8950d
1 parent 7d31a2d
commit bd8950d
Show file tree

Hide file tree

Showing 46 changed files with 79 additions and 499 deletions.
diff --git a/Editor/EditorAddons/Drawers/Base.meta b/Editor/EditorAddons/Drawers/Base.meta
diff --git a/Editor/EditorAddons/Drawers/Base/FieldDrawer.cs b/Editor/EditorAddons/Drawers/Base/FieldDrawer.cs
diff --git a/Editor/EditorAddons/Drawers/Base/FieldDrawer.cs.meta b/Editor/EditorAddons/Drawers/Base/FieldDrawer.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Base/MultiFieldDrawer.cs b/Editor/EditorAddons/Drawers/Base/MultiFieldDrawer.cs
diff --git a/Editor/EditorAddons/Drawers/Base/MultiFieldDrawer.cs.meta b/Editor/EditorAddons/Drawers/Base/MultiFieldDrawer.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Base/WrapperCollection.cs b/Editor/EditorAddons/Drawers/Base/WrapperCollection.cs
diff --git a/Editor/EditorAddons/Drawers/Base/WrapperCollection.cs.meta b/Editor/EditorAddons/Drawers/Base/WrapperCollection.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Base/WrapperCollectionValue.cs b/Editor/EditorAddons/Drawers/Base/WrapperCollectionValue.cs
diff --git a/Editor/EditorAddons/Drawers/Base/WrapperCollectionValue.cs.meta b/Editor/EditorAddons/Drawers/Base/WrapperCollectionValue.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Base/WrappersTypeCollection.cs b/Editor/EditorAddons/Drawers/Base/WrappersTypeCollection.cs
diff --git a/Editor/EditorAddons/Drawers/Base/WrappersTypeCollection.cs.meta b/Editor/EditorAddons/Drawers/Base/WrappersTypeCollection.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Comparers.meta b/Editor/EditorAddons/Drawers/Comparers.meta
diff --git a/Editor/EditorAddons/Drawers/Comparers/AssignableFromComparer.cs b/Editor/EditorAddons/Drawers/Comparers/AssignableFromComparer.cs
diff --git a/Editor/EditorAddons/Drawers/Comparers/AssignableFromComparer.cs.meta b/Editor/EditorAddons/Drawers/Comparers/AssignableFromComparer.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Comparers/BaseComparer.cs b/Editor/EditorAddons/Drawers/Comparers/BaseComparer.cs
diff --git a/Editor/EditorAddons/Drawers/Comparers/BaseComparer.cs.meta b/Editor/EditorAddons/Drawers/Comparers/BaseComparer.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Comparers/SerializedPropertyComparer.cs b/Editor/EditorAddons/Drawers/Comparers/SerializedPropertyComparer.cs
diff --git a/Editor/EditorAddons/Drawers/Comparers/SerializedPropertyComparer.cs.meta b/Editor/EditorAddons/Drawers/Comparers/SerializedPropertyComparer.cs.meta
diff --git a/Editor/EditorAddons/Drawers/Comparers/TypeComparer.cs b/Editor/EditorAddons/Drawers/Comparers/TypeComparer.cs
diff --git a/Editor/EditorAddons/Drawers/Comparers/TypeComparer.cs.meta b/Editor/EditorAddons/Drawers/Comparers/TypeComparer.cs.meta
diff --git a/Editor/EditorAddons/Drawers/DrawInspector/DrawInspectorDrawer.cs b/Editor/EditorAddons/Drawers/DrawInspector/DrawInspectorDrawer.cs
@@ -1,8 +1,8 @@
 using System;
-using Better.Attributes.EditorAddons.Drawers.Base;
 using Better.Attributes.EditorAddons.Drawers.Utilities;
 using Better.Attributes.EditorAddons.Drawers.WrapperCollections;
 using Better.Attributes.Runtime.DrawInspector;
+using Better.EditorTools.Drawers.Base;
 using Better.EditorTools.Helpers;
 using UnityEditor;
 using UnityEngine;
@@ -15,17 +15,17 @@ public class DrawInspectorDrawer : MultiFieldDrawer<DrawInspectorWrapper>
         private bool _isOpen;
         private DrawInspectors Collection => _wrappers as DrawInspectors;
 
-        private protected override void Deconstruct()
+        protected override void Deconstruct()
         {
             _wrappers.Deconstruct();
         }
 
-        private protected override Type GetFieldType()
+        protected override Type GetFieldType()
         {
             return fieldInfo.FieldType;
         }
 
-        private protected override bool PreDraw(ref Rect position, SerializedProperty property, GUIContent label)
+        protected override bool PreDraw(ref Rect position, SerializedProperty property, GUIContent label)
         {
             var fieldType = GetFieldType();
             if (fieldType.IsArray || !DrawInspectorUtility.Instance.IsSupported(fieldType))
@@ -55,17 +55,17 @@ private protected override bool PreDraw(ref Rect position, SerializedProperty pr
             return true;
         }
 
-        private protected override Rect PreparePropertyRect(Rect original)
+        protected override Rect PreparePropertyRect(Rect original)
         {
             return original;
         }
 
-        private protected override void PostDraw(Rect position, SerializedProperty property, GUIContent label)
+        protected override void PostDraw(Rect position, SerializedProperty property, GUIContent label)
         {
             Collection.OnGUI(property);
         }
 
-        private protected override WrapperCollection<DrawInspectorWrapper> GenerateCollection()
+        protected override WrapperCollection<DrawInspectorWrapper> GenerateCollection()
         {
             return new DrawInspectors();
         }

diff --git a/Editor/EditorAddons/Drawers/DrawInspector/DrawInspectorWrapper.cs b/Editor/EditorAddons/Drawers/DrawInspector/DrawInspectorWrapper.cs
@@ -1,5 +1,5 @@
 using System;
-using Better.Attributes.EditorAddons.Drawers.Utilities;
+using Better.EditorTools.Utilities;
 using UnityEditor;
 using Object = UnityEngine.Object;
 

diff --git a/Editor/EditorAddons/Drawers/Gizmo/BaseWrappers/GizmoWrapper.cs b/Editor/EditorAddons/Drawers/Gizmo/BaseWrappers/GizmoWrapper.cs
@@ -1,5 +1,6 @@
 using System;
 using Better.Attributes.EditorAddons.Drawers.Utilities;
+using Better.EditorTools.Utilities;
 using UnityEditor;
 using UnityEngine;
 #if UNITY_2022_1_OR_NEWER