Merge branch 'feature/structure-review' into develop

Editor/AssetTypeFilterDrawer.cs → 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());
 

Editor/AvatarCreator/ReadyPlayerMe.AvatarCreator.Editor.asmdef

@@ -0,0 +1,19 @@
+{
+    "name": "ReadyPlayerMe.AvatarCreator.Editor",
+    "rootNamespace": "",
+    "references": [
+        "ReadyPlayerMe.Core",
+        "ReadyPlayerMe.AvatarCreator"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Editor/Core/Scripts/Extensions/StringExtensions.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace ReadyPlayerMe.Core.Editor
+{
+    public static class StringExtensions
+    {
+        private const string SHORT_CODE_REGEX = "^[A-Z0-9]{6}$";
+
+        public static bool IsUrlShortcodeValid(this string urlString)
+        {
+            return !string.IsNullOrEmpty(urlString) &&
+                   (Regex.Match(urlString, SHORT_CODE_REGEX).Length > 0 || Uri.IsWellFormedUriString(urlString, UriKind.Absolute) && urlString.EndsWith(".glb"));
+        }
+    }
+}

Editor/BuildPreprocessor.cs → Editor/Core/Scripts/Processors/BuildPreprocessor.cs

@@ -19,7 +19,7 @@ public class BuildPreprocessor : IPreprocessBuildWithReport
 
         public void OnPreprocessBuild(BuildReport report)
         {
-            if (!Application.isBatchMode && ShaderVariantHelper.IsMissingVariants())
+            if (!Application.isBatchMode && GraphicsSettingsUtility.IsMissingVariants())
             {
                 var addShaderVariants = EditorUtility.DisplayDialog(BUILD_WARNING,
                     SUBDOMAIN_WARNING,
@@ -28,7 +28,7 @@ public void OnPreprocessBuild(BuildReport report)
 
                 if (addShaderVariants)
                 {
-                    ShaderVariantHelper.AddPreloadShaderVariants();
+                    GraphicsSettingsUtility.AddPreloadShaderVariants();
                 }
                 else
                 {

Editor/Postprocessor.cs → Editor/Core/Scripts/Processors/ModelAssetProcessor.cs

@@ -2,7 +2,7 @@
 
 namespace ReadyPlayerMe.Core.Editor
 {
-    public class Postprocessor : AssetPostprocessor
+    public class ModelAssetProcessor : AssetPostprocessor
     {
         private const string ANIMATION_ASSET_PATH = "Assets/Ready Player Me/Animations";
 

Editor/ReadyPlayerMe.Core.Editor.asmdef → Editor/Core/Scripts/ReadyPlayerMe.Core.Editor.asmdef

@@ -3,7 +3,7 @@
     "rootNamespace": "",
     "references": [
         "ReadyPlayerMe.Core",
-        "ReadyPlayerMe.Core.AvatarCreator"
+        "ReadyPlayerMe.AvatarCreator"
     ],
     "includePlatforms": [
         "Editor"

Editor/EditorAssetGenerator.cs → Editor/Core/Scripts/Settings/AvatarLoaderSettingsCreator.cs

@@ -4,17 +4,17 @@
 namespace ReadyPlayerMe.Core.Editor
 {
     [InitializeOnLoad]
-    public class EditorAssetGenerator
+    public class AvatarLoaderSettingsCreator
     {
         private const string SETTINGS_SAVE_FOLDER = "Ready Player Me/Resources/Settings";
         private const string AVATAR_LOADER_ASSET_NAME = "AvatarLoaderSettings.asset";
 
-        static EditorAssetGenerator()
+        static AvatarLoaderSettingsCreator()
         {
             EditorApplication.delayCall += CreateSettingsAssets;
         }
 
-        ~EditorAssetGenerator()
+        ~AvatarLoaderSettingsCreator()
         {
             EditorApplication.delayCall -= CreateSettingsAssets;
         }
@@ -35,7 +35,7 @@ private static void CreateAvatarLoaderSettings()
             var newSettings = ScriptableObject.CreateInstance<AvatarLoaderSettings>();
             newSettings.AvatarConfig = null;
             newSettings.GLTFDeferAgent = null;
-            newSettings.AvatarCachingEnabled = DefaultSettings.AvatarCachingEnabled;
+            newSettings.AvatarCachingEnabled = true;
 
             AssetDatabase.CreateAsset(newSettings, $"Assets/{SETTINGS_SAVE_FOLDER}/{AVATAR_LOADER_ASSET_NAME}");
             AssetDatabase.SaveAssets();

Editor/ShaderVariantHelper.cs → Editor/Core/Scripts/Settings/GraphicsSettingsUtility.cs

@@ -5,16 +5,16 @@
 namespace ReadyPlayerMe.Core.Editor
 {
     public enum RenderPipeline { Standard, URP, HDRP }
-    public static class ShaderVariantHelper
+    public static class GraphicsSettingsUtility
     {
-        private const string TAG = nameof(ShaderVariantHelper);
+        private const string TAG = nameof(GraphicsSettingsUtility);
         private const string PRELOADED_SHADER_PROPERTY = "m_PreloadedShaders";
         private const string GRAPHICS_SETTING_PATH = "ProjectSettings/GraphicsSettings.asset";
 
 #if RPM_DEVELOPMENT
-        private const string SHADER_VARIANT_FOLDER = "Assets/Ready Player Me/Core/Shaders";
+        private const string SHADER_VARIANT_FOLDER = "Assets/Ready Player Me/Core/Runtime/Core/Shaders";
 #else
-    private const string SHADER_VARIANT_FOLDER = "Packages/com.readyplayerme.core/Shaders";
+    private const string SHADER_VARIANT_FOLDER = "Packages/com.readyplayerme.core/Runtime/Core/Shaders";
 #endif
 
         private const string SHADER_VARIANTS_STANDARD = "glTFastShaderVariants";

Editor/UI/AvatarDataEditor.cs → Editor/Core/Scripts/UI/CustomEditors/AvatarDataEditor.cs

@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace ReadyPlayerMe.Core
+namespace ReadyPlayerMe.Core.Editor
 {
     [CustomEditor(typeof(AvatarData))]
     public class AvatarDataEditor : UnityEditor.Editor

Editor/UI/EyeAnimationHandlerEditor.cs → Editor/Core/Scripts/UI/CustomEditors/EyeAnimationHandlerEditor.cs

@@ -1,11 +1,10 @@
-using ReadyPlayerMe.Core;
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Core.Editor
 {
     [CustomEditor(typeof(EyeAnimationHandler))]
-    public class EyeAnimationHandlerEditor : Editor
+    public class EyeAnimationHandlerEditor : UnityEditor.Editor
     {
         private const string BLINK_DURATION = "blinkDuration";
         private const string BLINK_INTERVAL = "blinkInterval";

Editor/UI/VoiceHandlerEditor.cs → Editor/Core/Scripts/UI/CustomEditors/VoiceHandlerEditor.cs

@@ -1,11 +1,10 @@
-using ReadyPlayerMe.Core;
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Core.Editor
 {
     [CustomEditor(typeof(VoiceHandler))]
-    public class VoiceHandlerEditor : Editor
+    public class VoiceHandlerEditor : UnityEditor.Editor
     {
         private const string AUDIO_CLIP = "AudioClip";
         private const string PROPERTY_PATH = "AudioSource";

Editor/UI/EditorWindows/AvatarLoaderEditor/AvatarLoaderEditor.cs → Editor/Core/Scripts/UI/EditorWindows/AvatarLoaderEditor/AvatarLoaderEditor.cs

@@ -123,7 +123,7 @@ private void Completed(object sender, CompletionEventArgs args)
                 SDKLogger.LogWarning(TAG, "Enable Avatar Caching to generate a prefab in the project folder.");
                 return;
             }
-            GameObject avatar = EditorUtilities.CreateAvatarPrefab(args.Metadata, path);
+            var avatar = PrefabHelper.CreateAvatarPrefab(args.Metadata, path);
             if (useEyeAnimations) avatar.AddComponent<EyeAnimationHandler>();
             if (useVoiceToAnim) avatar.AddComponent<VoiceHandler>();
             DestroyImmediate(args.Avatar, true);

Editor/UI/EditorWindows/Templates/AvatarUrlTemplate.cs → Editor/Core/Scripts/UI/EditorWindows/Templates/AvatarUrlTemplate.cs

@@ -37,7 +37,7 @@ public AvatarUrlTemplate()
             urlField.RegisterValueChangedCallback(OnValueChanged);
 
             errorLabel = this.Q<Label>(ERROR_LABEL);
-            errorLabel.visible = !EditorUtilities.IsUrlShortcodeValid(url);
+            errorLabel.visible = !url.IsUrlShortcodeValid();
             errorLabel.RegisterCallback<MouseDownEvent>(_ =>
             {
                 AnalyticsEditorLogger.EventLogger.LogFindOutMore(HelpSubject.LoadingAvatars);
@@ -54,7 +54,7 @@ public AvatarUrlTemplate()
 
         private void OnValueChanged(ChangeEvent<string> evt)
         {
-            errorLabel.visible = !(!string.IsNullOrEmpty(evt.newValue) && EditorUtilities.IsUrlShortcodeValid(evt.newValue));
+            errorLabel.visible = !(!string.IsNullOrEmpty(evt.newValue) && evt.newValue.IsUrlShortcodeValid());
             EditorPrefs.SetString(URL_SAVE_KEY, evt.newValue);
         }
 

Editor/UI/EditorWindows/Templates/SubdomainTemplate.cs → Editor/Core/Scripts/UI/EditorWindows/Templates/SubdomainTemplate.cs

@@ -92,7 +92,7 @@ private static string ExtractSubdomain(string url)
 
         private bool IsValidSubdomain()
         {
-            return !partnerSubdomain.All(char.IsWhiteSpace) && !partnerSubdomain.Contains('/') && !EditorUtilities.IsUrlShortcodeValid(partnerSubdomain);
+            return !partnerSubdomain.All(char.IsWhiteSpace) && !partnerSubdomain.Contains('/') && !partnerSubdomain.IsUrlShortcodeValid();
         }
 
         private void SaveSubdomain()

Editor/AnimationExtractor.cs → Editor/Core/Scripts/Utilities/FBXAnimationExtractor.cs

@@ -7,9 +7,9 @@
 
 namespace ReadyPlayerMe.Core.Editor
 {
-    public class AnimationExtractor : UnityEditor.Editor
+    public class FBXAnimationExtractor : UnityEditor.Editor
     {
-        private static string FBX_FILE = ".fbx";
+        private const string FBX_FILE_SUFFIX = ".fbx";
         private const string PREVIEW_ANIM_PREFIX = "__preview__";
         private const string ASSET_ANIM_SUFFIX = ".anim";
 
@@ -30,7 +30,7 @@ private static string[] ExtractAnimations()
             {
                 return null;
             }
-            return paths.Where(path => path.Contains(FBX_FILE)).ToArray();
+            return paths.Where(path => path.Contains(FBX_FILE_SUFFIX)).ToArray();
             ;
         }
 
@@ -108,11 +108,11 @@ private static void DeleteFbxFiles(string[] animationFilePaths)
         [MenuItem("Assets/Extract Animations", true), MenuItem("Assets/Extract Animations and Delete File", true)]
         private static bool ExtractAnimationsValidation()
         {
-            Object activeObject = Selection.activeObject;
+            var activeObject = Selection.activeObject;
             if (!activeObject) return false;
 
             var assetPath = AssetDatabase.GetAssetPath(activeObject);
-            var isFbx = Path.GetExtension(assetPath).ToLower() == FBX_FILE;
+            var isFbx = Path.GetExtension(assetPath).ToLower() == FBX_FILE_SUFFIX;
             var isGameObject = activeObject is GameObject;
 
             return isGameObject && isFbx;