chore: more reorg

readyplayerme · Dec 19, 2023 · be75f11 · be75f11
1 parent 3db9957
commit be75f11
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 18 deletions.
diff --git a/Editor/AvatarCreator/AssetTypeFilterDrawer.cs b/Editor/AvatarCreator/AssetTypeFilterDrawer.cs
@@ -3,7 +3,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace ReadyPlayerMe.AvatarCreator
+namespace ReadyPlayerMe.AvatarCreator.Editor
 {
     [CustomPropertyDrawer(typeof(AssetTypeFilterAttribute))]
     public class AssetTypeFilterDrawer : PropertyDrawer
@@ -27,14 +27,14 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
                     var enumFieldInfo = typeof(AssetType).GetField(enumName);
                     var enumAttribute = (AssetTypeFilterAttribute) Attribute.GetCustomAttribute(enumFieldInfo, typeof(AssetTypeFilterAttribute));
                     if (enumAttribute == null) continue;
-                    
-                    var filter =(AssetFilter) Enum.Parse(typeof(AssetFilter), enumAttribute.filter.ToString());
+
+                    var filter = (AssetFilter) Enum.Parse(typeof(AssetFilter), enumAttribute.filter.ToString());
                     if (filter == assetTypeAttribute?.filter)
                     {
                         filteredEnumNames.Add(enumName);
                     }
                 }
-                
+
                 // Display the dropdown with filtered enum values
                 var newIndex = EditorGUI.Popup(position, label.text, Array.IndexOf(filteredEnumNames.ToArray(), currentEnumValue.ToString()), filteredEnumNames.ToArray());
 

diff --git a/Editor/AvatarCreator/ReadyPlayerMe.AvatarCreator.Editor.asmdef b/Editor/AvatarCreator/ReadyPlayerMe.AvatarCreator.Editor.asmdef
@@ -2,9 +2,12 @@
     "name": "ReadyPlayerMe.AvatarCreator.Editor",
     "rootNamespace": "",
     "references": [
-        "ReadyPlayerMe.Core.AvatarCreator"
+        "ReadyPlayerMe.Core",
+        "ReadyPlayerMe.AvatarCreator"
+    ],
+    "includePlatforms": [
+        "Editor"
     ],
-    "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,

diff --git a/Editor/Core/Scripts/ReadyPlayerMe.Core.Editor.asmdef b/Editor/Core/Scripts/ReadyPlayerMe.Core.Editor.asmdef
@@ -3,7 +3,7 @@
     "rootNamespace": "",
     "references": [
         "ReadyPlayerMe.Core",
-        "ReadyPlayerMe.Core.AvatarCreator"
+        "ReadyPlayerMe.AvatarCreator"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/...s/ReadyPlayerMe.Core.AvatarCreator.asmdef → ...cripts/ReadyPlayerMe.AvatarCreator.asmdef b/...s/ReadyPlayerMe.Core.AvatarCreator.asmdef → ...cripts/ReadyPlayerMe.AvatarCreator.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "ReadyPlayerMe.Core.AvatarCreator",
+    "name": "ReadyPlayerMe.AvatarCreator",
     "rootNamespace": "",
     "references": [
         "ReadyPlayerMe.Core"
@@ -13,4 +13,4 @@
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}
diff --git a/...dyPlayerMe.Core.AvatarCreator.asmdef.meta → ...s/ReadyPlayerMe.AvatarCreator.asmdef.meta b/...dyPlayerMe.Core.AvatarCreator.asmdef.meta → ...s/ReadyPlayerMe.AvatarCreator.asmdef.meta
diff --git a/...orSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef b/...orSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef
@@ -2,9 +2,9 @@
     "name": "ReadyPlayerMe.Core.LegacyAvatarCreator.Editor",
     "rootNamespace": "",
     "references": [
-        "ReadyPlayerMe.Core.AvatarCreator",
         "ReadyPlayerMe.Core",
-        "ReadyPlayerMe.Core.LegacyAvatarCreator"
+        "ReadyPlayerMe.Core.LegacyAvatarCreator",
+        "ReadyPlayerMe.AvatarCreator"
     ],
     "includePlatforms": [
         "Editor"
@@ -17,4 +17,4 @@
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}
diff --git a/...rCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef b/...rCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef
@@ -2,8 +2,8 @@
     "name": "ReadyPlayerMe.Core.LegacyAvatarCreator",
     "rootNamespace": "",
     "references": [
-        "ReadyPlayerMe.Core.AvatarCreator",
-        "ReadyPlayerMe.Core"
+        "ReadyPlayerMe.Core",
+        "ReadyPlayerMe.AvatarCreator"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/Tests/Editor/AuthTests.cs b/Tests/Editor/AuthTests.cs
@@ -1,8 +1,7 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
-using ReadyPlayerMe.AvatarCreator;
 
-namespace ReadyPlayerMe.Core.Tests
+namespace ReadyPlayerMe.AvatarCreator.Tests
 {
     public class AuthTests
     {

diff --git a/Tests/Editor/ReadyPlayerMe.Core.Editor.Tests.asmdef b/Tests/Editor/ReadyPlayerMe.Core.Editor.Tests.asmdef
@@ -4,7 +4,7 @@
     "references": [
         "ReadyPlayerMe.Core",
         "ReadyPlayerMe.Core.Editor",
-        "ReadyPlayerMe.Core.AvatarCreator"
+        "ReadyPlayerMe.AvatarCreator"
     ],
     "includePlatforms": [
         "Editor"
@@ -21,4 +21,4 @@
     ],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}