diff --git a/Assets/VRM10/Editor/MigrationMenu.cs b/Assets/VRM10/Editor/MigrationMenu.cs
deleted file mode 100644
index d497f79a8..000000000
--- a/Assets/VRM10/Editor/MigrationMenu.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.IO;
-using UnityEditor;
-using UnityEngine;
-
-namespace UniVRM10
-{
- public static class MigrationMenu
- {
- static VRMShaders.PathObject s_lastPath = VRMShaders.PathObject.UnityAssets;
-
- const string CONTEXT_MENU = "Assets/Migration: Vrm1";
-
- [MenuItem(CONTEXT_MENU, true)]
- static bool Enable()
- {
- if (!VRMShaders.PathObject.TryGetFromAsset(Selection.activeObject, out VRMShaders.PathObject path))
- {
- return false;
- }
- var isVrm = path.Extension.ToLower() == ".vrm";
- return isVrm;
- }
-
- [MenuItem(CONTEXT_MENU, false)]
- static void Exec()
- {
- if (!VRMShaders.PathObject.TryGetFromAsset(Selection.activeObject, out VRMShaders.PathObject path))
- {
- return;
- }
-
- // migrate
- var vrm1Bytes = MigrationVrm.Migrate(path.ReadAllBytes());
-
- if (!s_lastPath.TrySaveDialog("Save vrm1 file", $"{path.Stem}_vrm1", out VRMShaders.PathObject dst))
- {
- return;
- }
- s_lastPath = dst.Parent;
-
- // write result
- dst.WriteAllBytes(vrm1Bytes);
-
- if (dst.IsUnderAsset)
- {
- // immediately import for GUI update
- Debug.Log($"import: {dst}");
- dst.ImportAsset();
- }
- else
- {
- Debug.Log($"write: {dst}");
- }
- }
- }
-}
diff --git a/Assets/VRM10/Editor/MigrationMenu.cs.meta b/Assets/VRM10/Editor/MigrationMenu.cs.meta
deleted file mode 100644
index cc4e4ebc9..000000000
--- a/Assets/VRM10/Editor/MigrationMenu.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c0be718f3aba6ad4282a4b74eae9045b
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/VRM10/Runtime/Migration/MigrationCheck.cs b/Assets/VRM10/Runtime/Migration/MigrationCheck.cs
index 31629d9a2..57153aff6 100644
--- a/Assets/VRM10/Runtime/Migration/MigrationCheck.cs
+++ b/Assets/VRM10/Runtime/Migration/MigrationCheck.cs
@@ -7,7 +7,7 @@ namespace UniVRM10
///
/// for UnitTest
///
- public static class MigrationCheck
+ internal static class MigrationCheck
{
#region for UnitTest
public class MigrationException : Exception
diff --git a/Assets/VRM10/Runtime/Migration/MigrationException.cs b/Assets/VRM10/Runtime/Migration/MigrationException.cs
index 4c3c4511b..641727b8c 100644
--- a/Assets/VRM10/Runtime/Migration/MigrationException.cs
+++ b/Assets/VRM10/Runtime/Migration/MigrationException.cs
@@ -2,7 +2,7 @@
namespace UniVRM10
{
- public class MigrationException : Exception
+ internal class MigrationException : Exception
{
public MigrationException(string key, string value) : base($"{key}: {value}")
{
diff --git a/Assets/VRM10/Runtime/Migration/MigrationMaterials.cs b/Assets/VRM10/Runtime/Migration/MigrationMaterials.cs
index 18254310c..5b3ffc619 100644
--- a/Assets/VRM10/Runtime/Migration/MigrationMaterials.cs
+++ b/Assets/VRM10/Runtime/Migration/MigrationMaterials.cs
@@ -10,7 +10,7 @@ namespace UniVRM10
/// VRM 拡張に含まれる Material 情報を用いて、マイグレーションを行う.
/// 前提として、glTF の仕様の範囲で glTFMaterial は既に読み込み済みであると仮定する.
///
- public static class MigrationMaterials
+ internal static class MigrationMaterials
{
private const string DontUseExtensionShaderName = "VRM_USE_GLTFSHADER";
private const string MaterialPropertiesKey = "materialProperties";
diff --git a/Assets/VRM10/Runtime/Migration/MigrationVector3.cs b/Assets/VRM10/Runtime/Migration/MigrationVector3.cs
index 1587e300b..5ed47bbbe 100644
--- a/Assets/VRM10/Runtime/Migration/MigrationVector3.cs
+++ b/Assets/VRM10/Runtime/Migration/MigrationVector3.cs
@@ -2,7 +2,7 @@ using UniJSON;
namespace UniVRM10
{
- public static class MigrateVector3
+ internal static class MigrateVector3
{
///
/// VRM0は本来 (x, y, -z) と座標変換するべきところをしていない。
diff --git a/Assets/VRM10/Runtime/Migration/MigrationVrm.cs b/Assets/VRM10/Runtime/Migration/MigrationVrm.cs
index 5d20f28d7..b4bc5e288 100644
--- a/Assets/VRM10/Runtime/Migration/MigrationVrm.cs
+++ b/Assets/VRM10/Runtime/Migration/MigrationVrm.cs
@@ -1,15 +1,19 @@
-using System;
+using System.Runtime.CompilerServices;
+using System;
using System.Collections.Generic;
using UniGLTF;
using UniJSON;
using Unity.Collections;
+[assembly: InternalsVisibleTo("VRM10.Tests")]
+[assembly: InternalsVisibleTo("VRM10.Tests.PlayMode")]
+
namespace UniVRM10
{
///
/// Convert vrm0 binary to vrm1 binary. Json processing
///
- public static class MigrationVrm
+ static internal class MigrationVrm
{
public static byte[] Migrate(byte[] src)
{
diff --git a/Assets/VRM10/Runtime/Migration/MigrationVrmExpression.cs b/Assets/VRM10/Runtime/Migration/MigrationVrmExpression.cs
index 649ebe035..e694a8af8 100644
--- a/Assets/VRM10/Runtime/Migration/MigrationVrmExpression.cs
+++ b/Assets/VRM10/Runtime/Migration/MigrationVrmExpression.cs
@@ -6,7 +6,7 @@ using UnityEngine;
namespace UniVRM10
{
- public static class MigrationVrmExpression
+ internal static class MigrationVrmExpression
{
///
/// preset 名の文字列から ExpressionPreset を確定させる。