diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs index cce35b7bb..f76e12bd5 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs @@ -13,17 +13,11 @@ namespace UniGLTF public class GlbScriptedImporter : ScriptedImporter { [SerializeField] - Axes m_reverseAxis; + ScriptedImporterAxes m_reverseAxis; public override void OnImportAsset(AssetImportContext ctx) { - var asset = AssetDatabase.LoadAssetAtPath(ctx.assetPath); - if (asset == null) - { - // first time. set default setting - m_reverseAxis = UniGLTFPreference.GltfIOAxis; - } - ScriptedImporterImpl.Import(this, ctx, m_reverseAxis); + ScriptedImporterImpl.Import(this, ctx, m_reverseAxis.ToAxes()); } } } diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs index ef417474e..6a079cda2 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs @@ -13,17 +13,11 @@ namespace UniGLTF public class GltfScriptedImporter : ScriptedImporter { [SerializeField] - Axes m_reverseAxis = default; + ScriptedImporterAxes m_reverseAxis = default; public override void OnImportAsset(AssetImportContext ctx) { - var asset = AssetDatabase.LoadAssetAtPath(ctx.assetPath); - if (asset == null) - { - // first time. set default setting - m_reverseAxis = UniGLTFPreference.GltfIOAxis; - } - ScriptedImporterImpl.Import(this, ctx, m_reverseAxis); + ScriptedImporterImpl.Import(this, ctx, m_reverseAxis.ToAxes()); } } } diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterAxes.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterAxes.cs new file mode 100644 index 000000000..42e41c13f --- /dev/null +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterAxes.cs @@ -0,0 +1,34 @@ +namespace UniGLTF +{ + /// + /// ScriptedImporter の Inspector 用の Axes 設定 + /// + public enum ScriptedImporterAxes + { + Default, + Z, + X, + } + + public static class ScriptedImporterAxesExtensions + { + public static Axes ToAxes(this ScriptedImporterAxes axis) + { + switch (axis) + { + case ScriptedImporterAxes.Z: return Axes.Z; + case ScriptedImporterAxes.X: return Axes.X; + case ScriptedImporterAxes.Default: + { +#if UNIGLTF_DEFAULT_AXES_X + return Axes.X; +#else + return Axes.Z; +#endif + } + + default: throw new System.NotImplementedException(); + } + } + } +} diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterAxes.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterAxes.cs.meta new file mode 100644 index 000000000..9891067a1 --- /dev/null +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterAxes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6f9b903cff6f27c4dbee54a9b8e8d1af +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs index 3b382442e..1466fd932 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/Axes.cs @@ -5,7 +5,6 @@ namespace UniGLTF { public enum Axes { - Default, Z, X, } @@ -68,15 +67,6 @@ 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();