From 185f097ab7b7a686e3805c9f89c131183ce79445 Mon Sep 17 00:00:00 2001 From: PoChangSu Date: Mon, 31 Aug 2020 18:25:33 +0900 Subject: [PATCH 1/2] moved mesh integrator/static mesh integrator to the MeshUtility menu --- .../MeshUtility/Editor/BoneMeshEraserWizard.cs | 2 +- Assets/MeshUtility/Editor/MeshUtility.cs | 6 +++--- .../UniGLTF/Scripts/IO/StaticMeshIntegrator.cs | 4 ++-- .../SkinnedMeshUtility/MeshIntegratorEditor.cs | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Assets/MeshUtility/Editor/BoneMeshEraserWizard.cs b/Assets/MeshUtility/Editor/BoneMeshEraserWizard.cs index 6df4a7aa9..63bf90454 100644 --- a/Assets/MeshUtility/Editor/BoneMeshEraserWizard.cs +++ b/Assets/MeshUtility/Editor/BoneMeshEraserWizard.cs @@ -51,7 +51,7 @@ namespace MeshUtility [SerializeField] BoneMeshEraser.EraseBone[] m_eraseBones; - [MenuItem(MeshUtility.MENU_PARENT + "BoneMeshEraser Wizard", priority = MeshUtility.MENU_PRIORITY)] + [MenuItem(MeshUtility.MENU_PARENT + "BoneMeshEraser Wizard", priority = 4)] static void CreateWizard() { ScriptableWizard.DisplayWizard("BoneMeshEraser", "Erase triangles by bone", "Erase"); diff --git a/Assets/MeshUtility/Editor/MeshUtility.cs b/Assets/MeshUtility/Editor/MeshUtility.cs index 3fe5356af..045879c61 100644 --- a/Assets/MeshUtility/Editor/MeshUtility.cs +++ b/Assets/MeshUtility/Editor/MeshUtility.cs @@ -12,7 +12,7 @@ namespace MeshUtility public const int MENU_PRIORITY = 11; private const string ASSET_SUFFIX = ".mesh.asset"; - private const string MENU_NAME = MENU_PARENT + "Separate Skinned Meshes Contained BlendShape"; + private const string MENU_NAME = MENU_PARENT + "MeshSeparator"; private static readonly Vector3 ZERO_MOVEMENT = Vector3.zero; public static Object GetPrefab(GameObject instance) @@ -39,7 +39,7 @@ namespace MeshUtility return true; } - [MenuItem(MENU_NAME)] + [MenuItem(MENU_NAME, priority = 2)] public static void SeparateSkinnedMeshContainedBlendShape() { var go = Selection.activeTransform.gameObject; @@ -55,7 +55,7 @@ namespace MeshUtility } } - [MenuItem("Mesh Utility/MeshSeparator Docs")] + [MenuItem("Mesh Utility/MeshSeparator Docs", priority = MeshUtility.MENU_PRIORITY)] public static void LinkToMeshSeparatorDocs() { Application.OpenURL("https://github.com/vrm-c/UniVRM/tree/master/Assets/MeshUtility"); diff --git a/Assets/VRM/UniGLTF/Scripts/IO/StaticMeshIntegrator.cs b/Assets/VRM/UniGLTF/Scripts/IO/StaticMeshIntegrator.cs index 200b11a09..3bcff4a6d 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/StaticMeshIntegrator.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/StaticMeshIntegrator.cs @@ -119,13 +119,13 @@ namespace UniGLTF } #if UNITY_EDITOR - [MenuItem(UniGLTFVersion.MENU + "/Integrate static mesh", validate = true)] + [MenuItem("Mesh Utility/Integrate Static Mesh", validate = true)] public static bool CanIntegrateSelected() { return Selection.activeObject != null && Selection.activeObject is GameObject; } - [MenuItem(UniGLTFVersion.MENU + "/Integrate static mesh")] + [MenuItem("Mesh Utility/Integrate Static Mesh", priority = 3)] public static void IntegrateSelected() { var go = Selection.activeObject as GameObject; diff --git a/Assets/VRM/UniVRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs b/Assets/VRM/UniVRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs index 28664bd01..9eb266a12 100644 --- a/Assets/VRM/UniVRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs +++ b/Assets/VRM/UniVRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs @@ -16,7 +16,7 @@ namespace VRM [DisallowMultipleComponent] public static class MeshIntegratorEditor { - const string MENU_KEY = "Assets/UnityEditorScripts/MeshIntegrator"; + const string MENU_KEY = "Mesh Utility/MeshIntegrator"; const string ASSET_SUFFIX = ".mesh.asset"; [MenuItem(MENU_KEY, true)] @@ -27,7 +27,7 @@ namespace VRM SkinnedMeshUtility.IsPrefab(Selection.activeObject); } - [MenuItem(MENU_KEY, false)] + [MenuItem(MENU_KEY, priority = 1)] private static void ExportFromMenu() { var go = Selection.activeObject as GameObject; @@ -35,13 +35,13 @@ namespace VRM Integrate(go); } - [MenuItem("Assets/fooa", false)] - private static void Foo() - { - var go = Selection.activeObject as GameObject; + //[MenuItem("Assets/fooa", false)] + //private static void Foo() + //{ + // var go = Selection.activeObject as GameObject; - Debug.Log(SkinnedMeshUtility.IsPrefab(go)); - } + // Debug.Log(SkinnedMeshUtility.IsPrefab(go)); + //} public static List Integrate(GameObject prefab) From f6696beafc887f8188fa19d2bbd4ca3ae2e611ac Mon Sep 17 00:00:00 2001 From: PoChangSu Date: Mon, 31 Aug 2020 18:26:35 +0900 Subject: [PATCH 2/2] update readme --- README.ja.md | 1 + README.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.ja.md b/README.ja.md index 3f51cf388..f87633722 100644 --- a/README.ja.md +++ b/README.ja.md @@ -27,6 +27,7 @@ glTF2.0をベースとしており、誰でも自由に利用することがで ## Script Samples +* [UniVRMサンプル](https://github.com/vrm-c/UniVRM/tree/master/Assets/VRM.Samples) * [UniVRMTest(テストとサンプル)](https://github.com/vrm-c/UniVRMTest) ## Documents diff --git a/README.md b/README.md index 672a48c4f..659f44fb4 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ VRM is based on glTF2.0. If you comply with the MIT license, you are free to use ## Script Samples +* [UniVRM Samples](https://github.com/vrm-c/UniVRM/tree/master/Assets/VRM.Samples) * [UniVRMTest](https://github.com/vrm-c/UniVRMTest) ## Documents