cleanup / renaming

UnityGLTF/Assets/UnityGLTF/Editor/Scripts/Humanoid/AvatarUtils.cs → UnityGLTF/Assets/UnityGLTF/Editor/Scripts/InternalUI/AvatarUtils.cs

@@ -3,7 +3,7 @@
 
 namespace UnityGLTF
 {
-	public class AvatarUtils
+	internal class AvatarUtils
 	{
 		// A static dictionary containing the mapping from joint/bones names in the model
 		// to the names Unity uses for them internally.

UnityGLTF/Assets/UnityGLTF/Editor/Scripts/Humanoid/HumanoidSetup.cs → UnityGLTF/Assets/UnityGLTF/Editor/Scripts/InternalUI/HumanoidSetup.cs

@@ -6,11 +6,53 @@
 
 namespace UnityGLTF
 {
-	public static class HumanoidSetup
+	internal static class HumanoidSetup
 	{
-	    // Start is called before the first frame update
 	    private static MethodInfo _SetupHumanSkeleton;
 
+	    internal static Avatar AddAvatarToGameObject(GameObject gameObject)
+	    {
+		    HumanDescription description = AvatarUtils.CreateHumanDescription(gameObject);
+		    var bones = description.human;
+		    SetupHumanSkeleton(gameObject, ref bones, out var skeletonBones, out var hasTranslationDoF);
+		    description.human = bones;
+		    description.skeleton = skeletonBones;
+		    description.hasTranslationDoF = hasTranslationDoF;
+
+		    Avatar avatar = AvatarBuilder.BuildHumanAvatar(gameObject, description);
+		    avatar.name = "Avatar";
+
+		    if (!avatar.isValid)
+		    {
+			    Object.DestroyImmediate(avatar);
+			    return null;
+		    }
+
+		    var animator = gameObject.GetComponent<Animator>();
+		    if (animator) animator.avatar = avatar;
+		    return avatar;
+	    }
+
+	    private static void SetupHumanSkeleton(
+		    GameObject modelPrefab,
+		    ref HumanBone[] humanBoneMappingArray,
+		    out SkeletonBone[] skeletonBones,
+		    out bool hasTranslationDoF)
+	    {
+		    _SetupHumanSkeleton = typeof(AvatarSetupTool).GetMethod(nameof(SetupHumanSkeleton), (BindingFlags)(-1));
+		    skeletonBones = Array.Empty<SkeletonBone>();
+		    hasTranslationDoF = false;
+
+		    _SetupHumanSkeleton?.Invoke(null, new object[]
+		    {
+			    modelPrefab,
+			    humanBoneMappingArray,
+			    skeletonBones,
+			    hasTranslationDoF
+		    });
+	    }
+
+
 	    // AvatarSetupTools
 	    // AvatarBuilder.BuildHumanAvatar
 	    // AvatarConfigurationStage.CreateStage
@@ -56,47 +98,5 @@ static void _OpenEditor(MenuCommand command)
 		    e.SwitchToEditMode();
 	    }
 #endif
-
-	    internal static Avatar AddAvatarToGameObject(GameObject gameObject)
-	    {
-		    HumanDescription description = AvatarUtils.CreateHumanDescription(gameObject);
-		    var bones = description.human;
-		    SetupHumanSkeleton(gameObject, ref bones, out var skeletonBones, out var hasTranslationDoF);
-		    description.human = bones;
-		    description.skeleton = skeletonBones;
-		    description.hasTranslationDoF = hasTranslationDoF;
-
-		    Avatar avatar = AvatarBuilder.BuildHumanAvatar(gameObject, description);
-		    avatar.name = "Avatar";
-
-		    if (!avatar.isValid)
-		    {
-			    Object.DestroyImmediate(avatar);
-			    return null;
-		    }
-
-		    var animator = gameObject.GetComponent<Animator>();
-		    if (animator) animator.avatar = avatar;
-		    return avatar;
-	    }
-
-	    private static void SetupHumanSkeleton(
-		    GameObject modelPrefab,
-		    ref HumanBone[] humanBoneMappingArray,
-		    out SkeletonBone[] skeletonBones,
-		    out bool hasTranslationDoF)
-	    {
-		    _SetupHumanSkeleton = typeof(AvatarSetupTool).GetMethod(nameof(SetupHumanSkeleton), (BindingFlags)(-1));
-		    skeletonBones = Array.Empty<SkeletonBone>();
-		    hasTranslationDoF = false;
-
-		    _SetupHumanSkeleton?.Invoke(null, new object[]
-		    {
-			    modelPrefab,
-			    humanBoneMappingArray,
-			    skeletonBones,
-			    hasTranslationDoF
-		    });
-	    }
 	}
 }

UnityGLTF/Assets/UnityGLTF/Editor/Scripts/Humanoid/AssemblyInfo.cs → UnityGLTF/Assets/UnityGLTF/Editor/Scripts/InternalUI/UnityGLTFTabbedEditor.cs

@@ -12,14 +12,13 @@ namespace UnityGLTF
 {
 	internal class UnityGLTFTabbedEditor : AssetImporterTabbedEditor
 	{
-		private List<GltfAssetImporterTab> _tabs;
+		private readonly List<GltfAssetImporterTab> _tabs = new List<GltfAssetImporterTab>();
 
-		public void AddTab(GltfAssetImporterTab tab)
+		protected void AddTab(GltfAssetImporterTab tab)
 		{
-			if (_tabs == null) _tabs = new List<GltfAssetImporterTab>();
 			if (!_tabs.Contains(tab)) _tabs.Add(tab);
 			tabs = _tabs.Select(x => (BaseAssetImporterTabUI) x).ToArray();
-			m_TabNames = _tabs.Select(t => t.label).ToArray();
+			m_TabNames = _tabs.Select(t => t.Label).ToArray();
 		}
 
 		public GltfAssetImporterTab GetTab(int index)
@@ -30,32 +29,21 @@ public GltfAssetImporterTab GetTab(int index)
 			return _tabs[index];
 		}
 
-		public override void OnEnable()
-		{
-			Debug.Log("Enabling Active Tabs");
-			base.OnEnable();
-		}
+		public override void OnEnable() => base.OnEnable();
 	}
 
 	internal class GltfAssetImporterTab : BaseAssetImporterTabUI
 	{
-		internal string label;
-		private Action tabGui;
+		internal readonly string Label;
+		private readonly Action _tabGui;
 
 		public GltfAssetImporterTab(AssetImporterEditor panelContainer, string label, Action tabGui) : base(panelContainer)
 		{
-			this.label = label;
-			this.tabGui = tabGui;
+			this.Label = label;
+			this._tabGui = tabGui;
 		}
 
-		internal override void OnEnable()
-		{
-		}
-
-		public override void OnInspectorGUI()
-		{
-			if (tabGui != null) tabGui();
-			else EditorGUILayout.LabelField("Name", label);
-		}
+		internal override void OnEnable() { }
+		public override void OnInspectorGUI() => _tabGui?.Invoke();
 	}
 }