From 945873a5b346d27fc12890f81c8c4341ea4d508a Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Tue, 1 Feb 2022 14:31:51 +0900
Subject: [PATCH] =?UTF-8?q?neutral=20=E9=96=A2=E9=80=A3=E5=80=8B=E6=89=80(?=
 =?UTF-8?q?=E3=82=B7=E3=83=AA=E3=82=A2=E3=83=A9=E3=82=A4=E3=82=BA=E5=91=A8?=
 =?UTF-8?q?=E3=82=8A)=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScriptedImporter/VrmScriptedImporterEditorGUI.cs     | 1 +
 .../Components/VRM10Object/VRM10ObjectExpression.cs      | 2 --
 Assets/VRM10/Runtime/IO/Vrm10Exporter.cs                 | 1 +
 Assets/VRM10/Runtime/IO/Vrm10Importer.cs                 | 9 +--------
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs
index a28a625ad..cd8f7de2a 100644
--- a/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs
+++ b/Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs
@@ -49,6 +49,7 @@ namespace UniVRM10
             if (expressions.Preset?.LookDown != null) yield return ExpressionKey.LookDown.SubAssetKey;
             if (expressions.Preset?.LookLeft != null) yield return ExpressionKey.LookLeft.SubAssetKey;
             if (expressions.Preset?.LookRight != null) yield return ExpressionKey.LookRight.SubAssetKey;
+            if (expressions.Preset?.Neutral != null) yield return ExpressionKey.Neutral.SubAssetKey;
 
             if (expressions.Custom != null)
             {
diff --git a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectExpression.cs b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectExpression.cs
index ca4b8bc99..e9a99e213 100644
--- a/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectExpression.cs
+++ b/Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectExpression.cs
@@ -9,8 +9,6 @@ namespace UniVRM10
     [Serializable]
     public sealed class VRM10ObjectExpression
     {
-        public const string NEUTRAL_KEY = "Neutral";
-
         #region Preset
         [SerializeField, Header("Emotion")]
         public VRM10Expression Happy;
diff --git a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs
index 5ffb52b55..b310d15db 100644
--- a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs
+++ b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs
@@ -628,6 +628,7 @@ namespace UniVRM10
                     LookDown = ExportExpression(vrmController.Vrm.Expression.LookDown, vrmController, model, converter),
                     LookLeft = ExportExpression(vrmController.Vrm.Expression.LookLeft, vrmController, model, converter),
                     LookRight = ExportExpression(vrmController.Vrm.Expression.LookRight, vrmController, model, converter),
+                    Neutral = ExportExpression(vrmController.Vrm.Expression.Neutral, vrmController, model, converter),
                 },
                 Custom = vrmController.Vrm.Expression.CustomClips.ToDictionary(c => c.name, c => ExportExpression(c, vrmController, model, converter)),
             };
diff --git a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs
index 82dcc4a3b..d6d0b0f96 100644
--- a/Assets/VRM10/Runtime/IO/Vrm10Importer.cs
+++ b/Assets/VRM10/Runtime/IO/Vrm10Importer.cs
@@ -421,20 +421,13 @@ namespace UniVRM10
                 vrm.Expression.LookDown = GetOrLoadExpression(ExpressionKey.LookDown.SubAssetKey, ExpressionPreset.lookDown, vrmExtension.Expressions?.Preset?.LookDown);
                 vrm.Expression.LookLeft = GetOrLoadExpression(ExpressionKey.LookLeft.SubAssetKey, ExpressionPreset.lookLeft, vrmExtension.Expressions?.Preset?.LookLeft);
                 vrm.Expression.LookRight = GetOrLoadExpression(ExpressionKey.LookRight.SubAssetKey, ExpressionPreset.lookRight, vrmExtension.Expressions?.Preset?.LookRight);
+                vrm.Expression.Neutral = GetOrLoadExpression(ExpressionKey.Neutral.SubAssetKey, ExpressionPreset.neutral, vrmExtension.Expressions?.Preset?.Neutral);
                 if (vrmExtension?.Expressions?.Custom != null)
                 {
                     foreach (var (name, expression) in vrmExtension.Expressions.Custom.Select(kv => (kv.Key, kv.Value)))
                     {
                         var key = ExpressionKey.CreateCustom(name);
                         var preset = ExpressionPreset.custom;
-                        if (preset == ExpressionPreset.custom && name == VRM10ObjectExpression.NEUTRAL_KEY)
-                        {
-                            // TODO:
-                            // 注意！JsonSchema の更新待ち？
-                            key = ExpressionKey.CreateFromPreset(ExpressionPreset.neutral);
-                            Debug.Log($"set neutral");
-                            preset = ExpressionPreset.neutral;
-                        }
                         var clip = GetOrLoadExpression(key.SubAssetKey, preset, expression);
                         if (clip != null)
                         {