From 7fce3654e0d303c4f1306e00ecb5a388cdf0b748 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 30 Mar 2021 12:44:45 +0900 Subject: [PATCH] rename. remove IExternalUnityObject --- .../Editor/ScriptedImporter/IExternalUnityObject.cs | 12 ------------ .../ScriptedImporterExtension.cs.meta | 11 ----------- .../Editor/ScriptedImporter/VrmScriptedImporter.cs | 2 +- ...porterExtension.cs => VrmScriptedImporterImpl.cs} | 2 +- ...bject.cs.meta => VrmScriptedImporterImpl.cs.meta} | 2 +- 5 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs delete mode 100644 Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta rename Assets/VRM10/Editor/ScriptedImporter/{ScriptedImporterExtension.cs => VrmScriptedImporterImpl.cs} (99%) rename Assets/VRM10/Editor/ScriptedImporter/{IExternalUnityObject.cs.meta => VrmScriptedImporterImpl.cs.meta} (83%) diff --git a/Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs b/Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs deleted file mode 100644 index 996e9be8b..000000000 --- a/Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections.Generic; - -namespace UniVRM10 -{ - public interface IExternalUnityObject - { - Dictionary GetExternalUnityObjects() where T : UnityEngine.Object; - void SetExternalUnityObject(UnityEditor.AssetImporter.SourceAssetIdentifier sourceAssetIdentifier, T obj) where T : UnityEngine.Object; - } -} - - diff --git a/Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta deleted file mode 100644 index 8cfda53c8..000000000 --- a/Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: eb950c51864585a4688048266e6c3a00 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs index 3665838f8..3645fa4a1 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs @@ -13,7 +13,7 @@ namespace UniVRM10 { [ScriptedImporter(1, "vrm")] - public class VrmScriptedImporter : ScriptedImporter, IExternalUnityObject + public class VrmScriptedImporter : ScriptedImporter { const string TextureDirName = "Textures"; const string MaterialDirName = "Materials"; diff --git a/Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs similarity index 99% rename from Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs rename to Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs index 631a5c2bf..5768e88e8 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/ScriptedImporterExtension.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs @@ -13,7 +13,7 @@ using UnityEditor.Experimental.AssetImporters; namespace UniVRM10 { - public static class ScriptedImporterExtension + public static class VrmScriptedImporterImpl { public static void ClearExternalObjects(this ScriptedImporter importer) where T : UnityEngine.Object { diff --git a/Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs.meta b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs.meta similarity index 83% rename from Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs.meta rename to Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs.meta index fe35916e7..4a1a7d4f9 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/IExternalUnityObject.cs.meta +++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e6d15fc36df79649bb4724b06b5eae3 +guid: f08e514e6a60bd0479ed1c928e8b515e MonoImporter: externalObjects: {} serializedVersion: 2