From 7ae7aff51dbe9312a849c9b7e4200f4045ba3a9e Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 30 Jun 2021 15:23:46 +0900 Subject: [PATCH] ScriptedImporterImpl to GltfScriptedImporterBase --- .../ScriptedImporter/GlbScriptedImporter.cs | 9 ++------- .../ScriptedImporter/GltfScriptedImporter.cs | 9 ++------- ...mporterImpl.cs => GltfScriptedImporterBase.cs} | 15 +++++++++++---- ...l.cs.meta => GltfScriptedImporterBase.cs.meta} | 2 +- .../ZipArchivedGltfScriptedImporter.cs | 9 ++------- 5 files changed, 18 insertions(+), 26 deletions(-) rename Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/{ScriptedImporterImpl.cs => GltfScriptedImporterBase.cs} (84%) rename Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/{ScriptedImporterImpl.cs.meta => GltfScriptedImporterBase.cs.meta} (83%) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs index b733d413c..f14ff3e0b 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporter.cs @@ -1,5 +1,3 @@ -using UnityEngine; -using UnityEditor; #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else @@ -10,14 +8,11 @@ using UnityEditor.Experimental.AssetImporters; namespace UniGLTF { [ScriptedImporter(1, "glb")] - public class GlbScriptedImporter : ScriptedImporter + public class GlbScriptedImporter : GltfScriptedImporterBase { - [SerializeField] - public ScriptedImporterAxes m_reverseAxis; - public override void OnImportAsset(AssetImportContext ctx) { - ScriptedImporterImpl.Import(this, ctx, m_reverseAxis.ToAxes()); + 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 0ed062141..2ab443cd6 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporter.cs @@ -1,5 +1,3 @@ -using UnityEngine; -using UnityEditor; #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else @@ -10,14 +8,11 @@ using UnityEditor.Experimental.AssetImporters; namespace UniGLTF { [ScriptedImporter(1, "gltf")] - public class GltfScriptedImporter : ScriptedImporter + public class GltfScriptedImporter : GltfScriptedImporterBase { - [SerializeField] - public ScriptedImporterAxes m_reverseAxis = default; - public override void OnImportAsset(AssetImportContext ctx) { - ScriptedImporterImpl.Import(this, ctx, m_reverseAxis.ToAxes()); + Import(this, ctx, m_reverseAxis.ToAxes()); } } } diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs similarity index 84% rename from Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs rename to Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs index 26822ac07..cbb75086e 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs @@ -1,5 +1,6 @@ -using System.Linq; using UnityEngine; +using UnityEditor; +using System.Linq; using VRMShaders; #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; @@ -10,15 +11,21 @@ using UnityEditor.Experimental.AssetImporters; namespace UniGLTF { - public static class ScriptedImporterImpl + /// + /// ScriptedImporterImpl から改め + /// + public abstract class GltfScriptedImporterBase : ScriptedImporter { + [SerializeField] + public ScriptedImporterAxes m_reverseAxis = default; + /// /// glb をパースして、UnityObject化、さらにAsset化する /// /// /// /// - public static void Import(ScriptedImporter scriptedImporter, AssetImportContext context, Axes reverseAxis) + protected static void Import(ScriptedImporter scriptedImporter, AssetImportContext context, Axes reverseAxis) { #if VRM_DEVELOP Debug.Log("OnImportAsset to " + scriptedImporter.assetPath); @@ -28,7 +35,7 @@ namespace UniGLTF // Parse(parse glb, parser gltf json) // var data = new AmbiguousGltfFileParser(scriptedImporter.assetPath).Parse(); - + // // Import(create unity objects) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs.meta b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs.meta similarity index 83% rename from Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs.meta rename to Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs.meta index 0581f26f1..b583b8078 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs.meta +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85bf14b48ed135743828ee49a830b1c6 +guid: ae1df0d1926e49f489c74bdf6ca369b5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs index af7819a75..668cbe3a2 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporter.cs @@ -1,5 +1,3 @@ -using UnityEngine; -using UnityEditor; #if UNITY_2020_2_OR_NEWER using UnityEditor.AssetImporters; #else @@ -12,14 +10,11 @@ namespace UniGLTF #if UNIGLTF_ENABLE_ZIPARCHVIE_IMPORTER [ScriptedImporter(1, "zip")] #endif - public class ZipArchivedGltfScriptedImporter : ScriptedImporter + public class ZipArchivedGltfScriptedImporter : GltfScriptedImporterBase { - [SerializeField] - public ScriptedImporterAxes m_reverseAxis = default; - public override void OnImportAsset(AssetImportContext ctx) { - ScriptedImporterImpl.Import(this, ctx, m_reverseAxis.ToAxes()); + Import(this, ctx, m_reverseAxis.ToAxes()); } } }