chore: fix naming and namespaces

readyplayerme · Jan 11, 2024 · 46c5ac7 · 46c5ac7
1 parent 9375eca
commit 46c5ac7
Show file tree

Hide file tree

Showing 30 changed files with 92 additions and 89 deletions.
diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/AvatarCreatorStateMachineEditor.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/AvatarCreatorStateMachineEditor.cs
@@ -3,10 +3,10 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor
 {
     [CustomEditor(typeof(AvatarCreatorStateMachine)), CanEditMultipleObjects]
-    public class AvatarCreatorStateMachineEditor : Editor
+    public class AvatarCreatorStateMachineEditor : UnityEditor.Editor
     {
         private AvatarCreatorStateMachine avatarCreatorStateMachine;
         private string[] genderOptions;

diff --git a/...Me.Core.LegacyAvatarCreator.Editor.asmdef → ...Samples.LegacyAvatarCreator.Editor.asmdef b/...Me.Core.LegacyAvatarCreator.Editor.asmdef → ...Samples.LegacyAvatarCreator.Editor.asmdef
@@ -1,9 +1,9 @@
 {
-    "name": "ReadyPlayerMe.Core.LegacyAvatarCreator.Editor",
+    "name": "ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor",
     "rootNamespace": "",
     "references": [
         "ReadyPlayerMe.Core",
-        "ReadyPlayerMe.Core.LegacyAvatarCreator",
+        "ReadyPlayerMe.Samples.LegacyAvatarCreator",
         "ReadyPlayerMe.AvatarCreator"
     ],
     "includePlatforms": [

diff --git a/...re.LegacyAvatarCreator.Editor.asmdef.meta → ...es.LegacyAvatarCreator.Editor.asmdef.meta b/...re.LegacyAvatarCreator.Editor.asmdef.meta → ...es.LegacyAvatarCreator.Editor.asmdef.meta
diff --git a/...yPlayerMe.Core.LegacyAvatarCreator.asmdef → ...ayerMe.Samples.LegacyAvatarCreator.asmdef b/...yPlayerMe.Core.LegacyAvatarCreator.asmdef → ...ayerMe.Samples.LegacyAvatarCreator.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "ReadyPlayerMe.Core.LegacyAvatarCreator",
+    "name": "ReadyPlayerMe.Samples.LegacyAvatarCreator",
     "rootNamespace": "",
     "references": [
         "ReadyPlayerMe.Core",

diff --git a/...erMe.Core.LegacyAvatarCreator.asmdef.meta → ...e.Samples.LegacyAvatarCreator.asmdef.meta b/...erMe.Core.LegacyAvatarCreator.asmdef.meta → ...e.Samples.LegacyAvatarCreator.asmdef.meta
diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Data/AvatarCreatorData.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Data/AvatarCreatorData.cs
@@ -1,7 +1,7 @@
 using ReadyPlayerMe.AvatarCreator;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     [CreateAssetMenu(fileName = "AvatarCreatorData", menuName = "Ready Player Me/Avatar Creator Data", order = 1)]
     public class AvatarCreatorData : ScriptableObject

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/GameManager.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/GameManager.cs
@@ -2,7 +2,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class GameManager : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ProfileManager.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ProfileManager.cs
@@ -6,7 +6,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class ProfileManager : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/AssetButtonCreator.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/AssetButtonCreator.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class AssetButtonCreator : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/AvatarCreatorStateMachine.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/AvatarCreatorStateMachine.cs
@@ -6,7 +6,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class AvatarCreatorStateMachine : StateMachine
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/Buttons/AssetButton.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/Buttons/AssetButton.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class AssetButton : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/Buttons/AvatarButton.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/Buttons/AvatarButton.cs
@@ -6,7 +6,7 @@
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class AvatarButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/Buttons/CategoryButton.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/Buttons/CategoryButton.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class CategoryButton : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/CategoryUICreator.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/CategoryUICreator.cs
@@ -5,7 +5,7 @@
 using ReadyPlayerMe.Core;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class CategoryUICreator : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/DebugPanel.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/DebugPanel.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class DebugPanel : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/LoadingManager.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/LoadingManager.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class LoadingManager : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/PanelSwitcher.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/PanelSwitcher.cs
@@ -2,7 +2,7 @@
 using ReadyPlayerMe.AvatarCreator;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public static class PanelSwitcher
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/ProfileUI.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/ProfileUI.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class ProfileUI : MonoBehaviour
     {

diff --git a/...rCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs b/...rCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs
@@ -8,7 +8,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class AvatarCreatorSelection : State, IDisposable
     {

diff --git a/...~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarSelection.cs b/...~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarSelection.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class AvatarSelection : State
     {

diff --git a/...AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/BodyTypeSelection.cs b/...AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/BodyTypeSelection.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class BodyTypeSelection : State
     {

diff --git a/...tarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/CameraPhotoSelection.cs b/...tarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/CameraPhotoSelection.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class CameraPhotoSelection : State
     {

diff --git a/...rCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/DefaultAvatarSelection.cs b/...rCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/DefaultAvatarSelection.cs
@@ -6,7 +6,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class DefaultAvatarSelection : State
     {

diff --git a/...~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/GenderSelection.cs b/...~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/GenderSelection.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class GenderSelection : State
     {

diff --git a/...CreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/LoginWithEmailSelection.cs b/...CreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/LoginWithEmailSelection.cs
@@ -4,77 +4,80 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-public class LoginWithEmailSelection : State
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
-    private const string TAG = nameof(LoginWithEmailSelection);
+    public class LoginWithEmailSelection : State
+    {
+        private const string TAG = nameof(LoginWithEmailSelection);
 
-    [SerializeField] private Button sendActivationCodeButton;
-    [SerializeField] private Button haveCodeButton;
-    [SerializeField] private Button changeEmailButton;
-    [SerializeField] private Button loginButton;
+        [SerializeField] private Button sendActivationCodeButton;
+        [SerializeField] private Button haveCodeButton;
+        [SerializeField] private Button changeEmailButton;
+        [SerializeField] private Button loginButton;
 
-    [SerializeField] private InputField emailField;
-    [SerializeField] private InputField codeField;
+        [SerializeField] private InputField emailField;
+        [SerializeField] private InputField codeField;
 
-    [SerializeField] private GameObject emailPanel;
-    [SerializeField] private GameObject codePanel;
+        [SerializeField] private GameObject emailPanel;
+        [SerializeField] private GameObject codePanel;
 
-    public override StateType StateType => StateType.LoginWithCodeFromEmail;
-    public override StateType NextState => StateType.BodyTypeSelection;
+        public override StateType StateType => StateType.LoginWithCodeFromEmail;
+        public override StateType NextState => StateType.BodyTypeSelection;
 
-    public override void ActivateState()
-    {
-        sendActivationCodeButton.onClick.AddListener(OnSendActivationCode);
-        haveCodeButton.onClick.AddListener(OnHaveCodeButton);
-        changeEmailButton.onClick.AddListener(OnChangeEmail);
-        loginButton.onClick.AddListener(OnLogin);
-    }
+        public override void ActivateState()
+        {
+            sendActivationCodeButton.onClick.AddListener(OnSendActivationCode);
+            haveCodeButton.onClick.AddListener(OnHaveCodeButton);
+            changeEmailButton.onClick.AddListener(OnChangeEmail);
+            loginButton.onClick.AddListener(OnLogin);
+        }
 
-    public override void DeactivateState()
-    {
-        sendActivationCodeButton.onClick.RemoveListener(OnSendActivationCode);
-        haveCodeButton.onClick.RemoveListener(OnHaveCodeButton);
-        changeEmailButton.onClick.RemoveListener(OnChangeEmail);
-        loginButton.onClick.RemoveListener(OnLogin);
-    }
+        public override void DeactivateState()
+        {
+            sendActivationCodeButton.onClick.RemoveListener(OnSendActivationCode);
+            haveCodeButton.onClick.RemoveListener(OnHaveCodeButton);
+            changeEmailButton.onClick.RemoveListener(OnChangeEmail);
+            loginButton.onClick.RemoveListener(OnLogin);
+        }
 
-    private void OnSendActivationCode()
-    {
-        AuthManager.SendEmailCode(emailField.text);
-        OnHaveCodeButton();
-    }
+        private void OnSendActivationCode()
+        {
+            AuthManager.SendEmailCode(emailField.text);
+            OnHaveCodeButton();
+        }
 
-    private void OnHaveCodeButton()
-    {
-        emailPanel.SetActive(false);
-        codePanel.SetActive(true);
-    }
+        private void OnHaveCodeButton()
+        {
+            emailPanel.SetActive(false);
+            codePanel.SetActive(true);
+        }
 
-    private void OnChangeEmail()
-    {
-        emailPanel.SetActive(true);
-        codePanel.SetActive(false);
-    }
+        private void OnChangeEmail()
+        {
+            emailPanel.SetActive(true);
+            codePanel.SetActive(false);
+        }
 
-    private async void OnLogin()
-    {
-        LoadingManager.EnableLoading("Signing In");
+        private async void OnLogin()
+        {
+            LoadingManager.EnableLoading("Signing In");
 
-        AuthManager.OnSignInError += OnSignInError;
+            AuthManager.OnSignInError += OnSignInError;
 
-        if (await AuthManager.LoginWithCode(codeField.text))
-        {
-            OnChangeEmail();
-            LoadingManager.DisableLoading();
-            StateMachine.SetState(StateType.AvatarSelection);
-            SDKLogger.Log(TAG, "Login successful");
+            if (await AuthManager.LoginWithCode(codeField.text))
+            {
+                OnChangeEmail();
+                LoadingManager.DisableLoading();
+                StateMachine.SetState(StateType.AvatarSelection);
+                SDKLogger.Log(TAG, "Login successful");
+            }
         }
-    }
 
-    private void OnSignInError(string error)
-    {
-        AuthManager.OnSignInError -= OnSignInError;
-        LoadingManager.EnableLoading(error, LoadingManager.LoadingType.Popup, false);
-        SDKLogger.Log(TAG, $"Login failed with error: {error}");
+        private void OnSignInError(string error)
+        {
+            AuthManager.OnSignInError -= OnSignInError;
+            LoadingManager.EnableLoading(error, LoadingManager.LoadingType.Popup, false);
+            SDKLogger.Log(TAG, $"Login failed with error: {error}");
+        }
     }
-}
+}
diff --git a/...~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/SeflieSelection.cs b/...~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/SeflieSelection.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class SeflieSelection : State
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/StateMachine/State.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/StateMachine/State.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public enum StateType
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/StateMachine/StateMachine.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/StateMachine/StateMachine.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public abstract class StateMachine : MonoBehaviour
     {

diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Utils/CameraZoom.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Utils/CameraZoom.cs
@@ -2,7 +2,7 @@
 using ReadyPlayerMe.AvatarCreator;
 using UnityEngine;
 
-namespace ReadyPlayerMe
+namespace ReadyPlayerMe.Samples.LegacyAvatarCreator
 {
     public class CameraZoom : MonoBehaviour
     {