From 3f2f2bbff11d9cae928c47e1ad0041d5fcd7e019 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Wed, 19 May 2021 18:00:41 +0900
Subject: [PATCH] add Axes.Default

---
 .../UniGLTF/Editor/UniGLTF/UniGLTFPreference.cs   | 12 ++----------
 Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs         | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Assets/UniGLTF/Editor/UniGLTF/UniGLTFPreference.cs b/Assets/UniGLTF/Editor/UniGLTF/UniGLTFPreference.cs
index 3e8681f7a..cf7d4fcbf 100644
--- a/Assets/UniGLTF/Editor/UniGLTF/UniGLTFPreference.cs
+++ b/Assets/UniGLTF/Editor/UniGLTF/UniGLTFPreference.cs
@@ -10,19 +10,12 @@ namespace UniGLTF
         [PreferenceItem("UniGLTF")]
         private static void OnPreferenceGUI()
         {
-            EditorGUI.BeginChangeCheck();
-
             // language
             M17N.LanguageGetter.OnGuiSelectLang();
             EditorGUILayout.HelpBox($"Custom editor language setting", MessageType.Info, true);
 
             // default axis
-            GltfIOAxis = (Axes)EditorGUILayout.EnumPopup("Default Invert axis", GltfIOAxis);
-            EditorGUILayout.HelpBox($"Default invert axis when glb/gltf import/export", MessageType.Info, true);
-
-            if (EditorGUI.EndChangeCheck())
-            {
-            }
+            ToggleSymbol("Use X axis for default invert axis", "UNIGLTF_DEFAULT_AXES_X");
         }
 
         const string AXIS_KEY = "UNIGLTF_IO_AXIS";
@@ -64,9 +57,8 @@ namespace UniGLTF
             var target = EditorUserBuildSettings.selectedBuildTargetGroup;
             var current = PlayerSettings.GetScriptingDefineSymbolsForGroup(target).Split(';');
             PlayerSettings.SetScriptingDefineSymbolsForGroup(target,
-            string.Join(";", current.Concat(new[] { symbol }))
+                string.Join(";", current.Concat(new[] { symbol }))
             );
-
         }
 
         public static void RemoveSymbol(string symbol)
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs
index 0396138df..3b382442e 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs
@@ -5,13 +5,9 @@ namespace UniGLTF
 {
     public enum Axes
     {
-#if UNIGLTF_DEFAULT_AXES_X
-        X,
-        Z,
-#else
+        Default,
         Z,
         X,
-#endif
     }
 
     public interface IAxisInverter
@@ -72,6 +68,15 @@ namespace UniGLTF
     {
         public static IAxisInverter Create(this Axes axis)
         {
+            if (axis == Axes.Default)
+            {
+#if UNIGLTF_DEFAULT_AXES_X
+                axis = Axes.X;
+#else
+                axis = Axes.Z;
+#endif
+            }
+
             switch (axis)
             {
                 case Axes.Z: return new ReverseZ();