2.1b

.gitignore

@@ -6,3 +6,4 @@
 *.csproj
 *.unityproj
 *.sln
+*.asset

Editor/Config/Config.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using System;
 using System.Collections.Generic;
@@ -13,29 +13,35 @@ namespace MMD
     [Serializable]
     public class Config : ScriptableObject
     {
-        public InspectorConfig inspector_config;
-        public DefaultPMDImportConfig pmd_config;
-        public DefaultVMDImportConfig vmd_config;
+        static Config config_ = null;
+        public InspectorConfig inspector_config = null;
+        public PMDImportConfig pmd_config = null;
+        public VMDImportConfig vmd_config = null;
 
-        private List<ConfigBase> update_list;
+        private List<ConfigBase> update_list = null;
         public void OnEnable()
         {
-            // Inspectorで編集をさせない
-            hideFlags = HideFlags.NotEditable;
-            if (pmd_config == null)
+            if (inspector_config == null)
             {
-                // ここで初期化処理を書く
-                pmd_config = new DefaultPMDImportConfig();
-                vmd_config = new DefaultVMDImportConfig();
                 inspector_config = new InspectorConfig();
             }
+            if (pmd_config == null)
+            {
+                pmd_config = new PMDImportConfig();
+            }
+            if (vmd_config == null)
+            {
+                vmd_config = new VMDImportConfig();
+            }
             if (update_list == null)
             {
                 update_list = new List<ConfigBase>();
                 update_list.Add(inspector_config);
                 update_list.Add(pmd_config);
                 update_list.Add(vmd_config);
             }
+
+            hideFlags = HideFlags.None; //以前の書き換え不可assetが残っているかもしれないので明示的に書き換え可能を設定
         }
 
         /// <summary>
@@ -48,6 +54,11 @@ public void OnGUI()
             {
                 item.OnGUI();
             });
+
+            //変更確認
+            if (GUI.changed) {
+                EditorUtility.SetDirty(config_);
+            }
         }
 
         /// <summary>
@@ -67,18 +78,20 @@ public static string GetConfigPath()
         /// <returns>読み込んで生成したConfigオブジェクト</returns>
         public static Config LoadAndCreate()
         {
-            var path = Config.GetConfigPath();
-            var config = (Config)AssetDatabase.LoadAssetAtPath(path, typeof(Config));
-
-            //// なかったら作成する
-            if (config == null)
+            if (config_ == null)
             {
-                config = CreateInstance<Config>();
-                AssetDatabase.CreateAsset(config, path);
-                EditorUtility.SetDirty(config);
+                var path = Config.GetConfigPath();
+                config_ = (Config)AssetDatabase.LoadAssetAtPath(path, typeof(Config));
+
+                //// なかったら作成する
+                if (config_ == null)
+                {
+                    config_ = CreateInstance<Config>();
+                    AssetDatabase.CreateAsset(config_, path);
+                    EditorUtility.SetDirty(config_);
+                }
             }
-			Debug.Log(config);
-            return config;
+            return config_;
         }
     }
 
@@ -88,79 +101,94 @@ public static Config LoadAndCreate()
     [Serializable]
     public class InspectorConfig : ConfigBase
     {
-        public bool use_pmd_preload = false;
-        public bool use_vmd_preload = false;
+        public bool use_pmd_preload = true;
+        public bool use_vmd_preload = true;
 
-        public InspectorConfig()
+        public override string GetTitle()
         {
-            this.title = "Inspector Config";
+            return "Inspector Config";
         }
 
-        public override void OnGUI()
+        public override void OnGUIFunction()
         {
-            base.OnGUI(() =>
-                {
-                    use_pmd_preload = EditorGUILayout.Toggle("Use PMD Preload", use_pmd_preload);
-                    use_vmd_preload = EditorGUILayout.Toggle("Use VMD Preload", use_vmd_preload);
-                }
-            );
+            use_pmd_preload = EditorGUILayout.Toggle("Use PMD Preload", use_pmd_preload);
+            use_vmd_preload = EditorGUILayout.Toggle("Use VMD Preload", use_vmd_preload);
+        }
+
+        public InspectorConfig Clone()
+        {
+            return (InspectorConfig)MemberwiseClone();
         }
     }
 
     /// <summary>
-    /// PMDインポートのデフォルトコンフィグ
+    /// PMDインポートのコンフィグ
     /// </summary>
     [Serializable]
-    public class DefaultPMDImportConfig : ConfigBase
+    public class PMDImportConfig : ConfigBase
     {
         public PMDConverter.ShaderType shader_type = PMDConverter.ShaderType.MMDShader;
-        public bool use_mecanim = false;
+        public PMXConverter.AnimationType animation_type = PMXConverter.AnimationType.LegacyAnimation;
         public bool rigidFlag = true;
         public bool use_ik = true;
         public float scale = 0.085f;
-        public bool is_pmx_base_import = false;
+        public bool is_pmx_base_import = true;
 
-        public DefaultPMDImportConfig()
+        public override string GetTitle()
         {
-            this.title = "Default PMD Import Config";
+            return "Default PMD Import Config";
         }
 
-        public override void OnGUI()
+        public override void OnGUIFunction()
         {
-            base.OnGUI(() =>
-                {
-                    shader_type = (PMDConverter.ShaderType)EditorGUILayout.EnumPopup("Shader Type", shader_type);
-                    rigidFlag = EditorGUILayout.Toggle("Rigidbody", rigidFlag);
-                    use_mecanim = false;
-                    use_ik = EditorGUILayout.Toggle("Use IK", use_ik);
-                    is_pmx_base_import = EditorGUILayout.Toggle("Use PMX Base Import", is_pmx_base_import);
+            shader_type = (PMDConverter.ShaderType)EditorGUILayout.EnumPopup("Shader Type", shader_type);
+            rigidFlag = EditorGUILayout.Toggle("Rigidbody", rigidFlag);
+            animation_type = (PMXConverter.AnimationType)EditorGUILayout.EnumPopup("Animation Type", animation_type);
+            use_ik = EditorGUILayout.Toggle("Use IK", use_ik);
+            scale = EditorGUILayout.Slider("Scale", scale, 0.001f, 1.0f);
+            EditorGUILayout.BeginHorizontal();
+            {
+                EditorGUILayout.PrefixLabel(" ");
+                if (GUILayout.Button("Original", EditorStyles.miniButtonLeft)) {
+                    scale = 0.085f;
+                }
+                if (GUILayout.Button("1.0", EditorStyles.miniButtonRight)) {
+                    scale = 1.0f;
                 }
-            );
+            }
+            EditorGUILayout.EndHorizontal();
+            is_pmx_base_import = EditorGUILayout.Toggle("Use PMX Base Import", is_pmx_base_import);
+        }
+
+        public PMDImportConfig Clone()
+        {
+            return (PMDImportConfig)MemberwiseClone();
         }
     }
 
     /// <summary>
-    /// VMDインポートのデフォルトコンフィグ
+    /// VMDインポートのコンフィグ
     /// </summary>
     [Serializable]
-    public class DefaultVMDImportConfig : ConfigBase
+    public class VMDImportConfig : ConfigBase
     {
-        public bool createAnimationFile;
-        public int interpolationQuality;
+        public bool createAnimationFile = false;
+        public int interpolationQuality = 1;
 
-        public DefaultVMDImportConfig()
+        public override string GetTitle()
         {
-            this.title = "Default VMD Import Config";
+            return "Default VMD Import Config";
         }
 
-        public override void OnGUI()
+        public override void OnGUIFunction()
         {
-            base.OnGUI(() =>
-                {
-                    createAnimationFile = EditorGUILayout.Toggle("Create Asset", createAnimationFile);
-                    interpolationQuality = EditorGUILayout.IntSlider("Interpolation Quality", interpolationQuality, 1, 10);
-                }
-            );
+            createAnimationFile = EditorGUILayout.Toggle("Create Asset", createAnimationFile);
+            interpolationQuality = EditorGUILayout.IntSlider("Interpolation Quality", interpolationQuality, 1, 10);
+        }
+
+        public VMDImportConfig Clone()
+        {
+            return (VMDImportConfig)MemberwiseClone();
         }
     }
 
@@ -169,11 +197,6 @@ public override void OnGUI()
     /// </summary>
     public class ConfigBase
     {
-        /// <summary>
-        /// このコンフィグのタイトルを指定します
-        /// </summary>
-        protected string title = "";
-
         /// <summary>
         /// 開け閉めの状態
         /// </summary>
@@ -182,19 +205,28 @@ public class ConfigBase
         /// <summary>
         /// GUI処理を行います
         /// </summary>
-        /// <param name="OnGUIFunction">引数・戻り値なしのラムダ式</param>
-        public void OnGUI(Action OnGUIFunction)
+        public void OnGUI()
         {
+            var title = GetTitle();
             fold = EditorGUILayout.Foldout(fold, title);
-            if (fold)
+            if (fold) {
                 OnGUIFunction();
+            }
             EditorGUILayout.Space();
         }
 
+        /// <summary>
+        /// このコンフィグのタイトルを取得します
+        /// </summary>
+        public virtual string GetTitle()
+        {
+            return "";
+        }
+
         /// <summary>
         /// GUI処理を行います
         /// </summary>
-        public virtual void OnGUI()
+        public virtual void OnGUIFunction()
         {
         }
     }

Editor/Config/ConfigWindow.cs

@@ -5,10 +5,9 @@ namespace MMD
 {
     public class ConfigWindow : EditorWindow
     {
-        private static Config config;
-        private static string path;
+        private Config config;
 
-        [MenuItem("Plugins/MMD Loader/Config")]
+        [MenuItem("MMD for Unity/Config")]
         public static void Init()
         {
             GetWindow<ConfigWindow>("MFU Config");
@@ -18,36 +17,18 @@ public static void Init()
         //   フォーカスが外れて戻ってきたときや再度開かれたときなど
         void OnEnable()
         {
-            // オブジェクトを「Hierarchy」に表示しない。また、アセットの中にあれば、プロジェクトビューに表示しない
-            // オブジェクトがシーンに保存されない。また、新しいシーンを読んでも、オブジェクトが破棄されない
-            hideFlags = HideFlags.HideAndDontSave;
-
             if (config == null)
             {
                 // 読み込む
                 config = MMD.Config.LoadAndCreate();
-
-                // なかったら作成する
-                if (config == null)
-                {
-                    path = MMD.Config.GetConfigPath();
-                    config = CreateInstance<Config>();
-                    AssetDatabase.CreateAsset(config, path);
-                    EditorUtility.SetDirty(config);
-                }
             }
         }
 
         // ウィンドウの描画処理
         void OnGUI()
         {
-            // たいとる
-            EditorGUILayout.LabelField("MMD for Unity Configuration");
-            EditorGUILayout.Space();
-
             // あとは任せる
             config.OnGUI();
-
         }
     }
-}
+}

Editor/ExpressionManagerEditor.cs

@@ -71,7 +71,11 @@ public override void OnInspectorGUI()
 						if (child.localPosition.z != value) {
 							//変更が掛かったなら
 							//Undo登録
+#if !UNITY_4_2 //4.3以降
+							Undo.RecordObject(child, "Expression Change");
+#else
 							Undo.RegisterUndo(child, "Expression Change");
+#endif
 							//Z位置更新
 							Vector3 position = child.localPosition;
 							position.z = value;