From 46c5ac7180b90780e9dc7102c8ed66842574026f Mon Sep 17 00:00:00 2001 From: Harrison Hough Date: Thu, 11 Jan 2024 12:07:28 +0200 Subject: [PATCH] chore: fix naming and namespaces --- .../Editor/AvatarCreatorStateMachineEditor.cs | 4 +- ...Samples.LegacyAvatarCreator.Editor.asmdef} | 4 +- ...es.LegacyAvatarCreator.Editor.asmdef.meta} | 2 +- ...ayerMe.Samples.LegacyAvatarCreator.asmdef} | 2 +- ...e.Samples.LegacyAvatarCreator.asmdef.meta} | 2 +- .../Scripts/Data/AvatarCreatorData.cs | 2 +- .../Scripts/GameManager.cs | 2 +- .../Scripts/ProfileManager.cs | 2 +- .../Scripts/UI/AssetButtonCreator.cs | 2 +- .../Scripts/UI/AvatarCreatorStateMachine.cs | 2 +- .../Scripts/UI/Buttons/AssetButton.cs | 2 +- .../Scripts/UI/Buttons/AvatarButton.cs | 2 +- .../Scripts/UI/Buttons/CategoryButton.cs | 2 +- .../Scripts/UI/CategoryUICreator.cs | 2 +- .../Scripts/UI/DebugPanel.cs | 2 +- .../Scripts/UI/LoadingManager.cs | 2 +- .../Scripts/UI/PanelSwitcher.cs | 2 +- .../Scripts/UI/ProfileUI.cs | 2 +- .../AvatarCreatorSelection.cs | 2 +- .../UI/SelectionScreens/AvatarSelection.cs | 2 +- .../UI/SelectionScreens/BodyTypeSelection.cs | 2 +- .../SelectionScreens/CameraPhotoSelection.cs | 2 +- .../DefaultAvatarSelection.cs | 2 +- .../UI/SelectionScreens/GenderSelection.cs | 2 +- .../LoginWithEmailSelection.cs | 119 +++++++++--------- .../UI/SelectionScreens/SeflieSelection.cs | 2 +- .../Scripts/UI/StateMachine/State.cs | 2 +- .../Scripts/UI/StateMachine/StateMachine.cs | 2 +- .../Scripts/Utils/CameraZoom.cs | 2 +- .../Scripts/Utils/LoadingAnimation.cs | 2 +- 30 files changed, 92 insertions(+), 89 deletions(-) rename Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/{ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef => ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor.asmdef} (77%) rename Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/{ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef.meta => ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor.asmdef.meta} (76%) rename Samples~/AvatarCreatorSamples/LegacyAvatarCreator/{Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef => ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef} (87%) rename Samples~/AvatarCreatorSamples/LegacyAvatarCreator/{Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef.meta => ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef.meta} (76%) diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/AvatarCreatorStateMachineEditor.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/AvatarCreatorStateMachineEditor.cs index 591b5480..2eb78f40 100644 --- 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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor.asmdef similarity index 77% rename from Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef rename to Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor.asmdef index c5c6355b..ca985144 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef +++ b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef.meta b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor.asmdef.meta similarity index 76% rename from Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef.meta rename to Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor.asmdef.meta index 84cceb40..aab6305c 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Core.LegacyAvatarCreator.Editor.asmdef.meta +++ b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Editor/ReadyPlayerMe.Samples.LegacyAvatarCreator.Editor.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b58525057a520304697187df0e071425 +guid: a91dd27599936b647ab0ceef15259968 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef similarity index 87% rename from Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef rename to Samples~/AvatarCreatorSamples/LegacyAvatarCreator/ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef index cb3f0dab..a51f3c24 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef +++ b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef @@ -1,5 +1,5 @@ { - "name": "ReadyPlayerMe.Core.LegacyAvatarCreator", + "name": "ReadyPlayerMe.Samples.LegacyAvatarCreator", "rootNamespace": "", "references": [ "ReadyPlayerMe.Core", diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef.meta b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef.meta similarity index 76% rename from Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef.meta rename to Samples~/AvatarCreatorSamples/LegacyAvatarCreator/ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef.meta index 9d76910f..5549d5fb 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/ReadyPlayerMe.Core.LegacyAvatarCreator.asmdef.meta +++ b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/ReadyPlayerMe.Samples.LegacyAvatarCreator.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a17cca4edcc7a8b4c8aaa0fe38801f7d +guid: 84c2366a7d4a3f44783485159d5782e6 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Data/AvatarCreatorData.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Data/AvatarCreatorData.cs index 801b4a16..93a33427 100644 --- 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 index e1bcae2a..f07e7bd3 100644 --- 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 index a83419b7..10411586 100644 --- 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 index def52a23..65015d71 100644 --- 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 index 277158bc..c9b1bc02 100644 --- 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 index 6a9d98c4..10aa48a3 100644 --- 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 index 6f50ddfe..5433c5e1 100644 --- 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 index f0118774..d705eb7d 100644 --- 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 index c1651c8b..a446d5a1 100644 --- 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 index 48c21d78..fb8c1de2 100644 --- 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 index 566d8a01..525bf597 100644 --- 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 index fd8df82c..6ac35b7c 100644 --- 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 index 3f7edb4c..6a741405 100644 --- 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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs index ac611fb4..1b03f60d 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarCreatorSelection.cs +++ b/Samples~/AvatarCreatorSamples/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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarSelection.cs index 2beb4606..8b87bab6 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/AvatarSelection.cs +++ b/Samples~/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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/BodyTypeSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/BodyTypeSelection.cs index debe371a..fd7fbd36 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/BodyTypeSelection.cs +++ b/Samples~/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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/CameraPhotoSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/CameraPhotoSelection.cs index 74d631a2..fcffc4b8 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/CameraPhotoSelection.cs +++ b/Samples~/AvatarCreatorSamples/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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/DefaultAvatarSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/DefaultAvatarSelection.cs index 11715932..73bc86a3 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/DefaultAvatarSelection.cs +++ b/Samples~/AvatarCreatorSamples/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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/GenderSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/GenderSelection.cs index 0c882527..8468c1be 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/GenderSelection.cs +++ b/Samples~/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/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/LoginWithEmailSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/LoginWithEmailSelection.cs index af66266b..1def0694 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/LoginWithEmailSelection.cs +++ b/Samples~/AvatarCreatorSamples/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}"); + } } -} +} \ No newline at end of file diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/SeflieSelection.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/SeflieSelection.cs index a512e8d3..702ab5cf 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/UI/SelectionScreens/SeflieSelection.cs +++ b/Samples~/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 index 0b00270f..65e3af6d 100644 --- 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 index 8d7f9b70..1711f38d 100644 --- 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 index 03f00036..415f8468 100644 --- 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 { diff --git a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Utils/LoadingAnimation.cs b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Utils/LoadingAnimation.cs index 242d1910..5aa08b0b 100644 --- a/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Utils/LoadingAnimation.cs +++ b/Samples~/AvatarCreatorSamples/LegacyAvatarCreator/Scripts/Utils/LoadingAnimation.cs @@ -4,7 +4,7 @@ using ReadyPlayerMe.AvatarCreator; using UnityEngine; -namespace ReadyPlayerMe +namespace ReadyPlayerMe.Samples.LegacyAvatarCreator { public class LoadingAnimation : MonoBehaviour {