Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-12 05:24:14 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

prefab 作成先を指定する dialog を追加

Browse Source
This commit is contained in:
ousttrue 2022-03-04 19:45:55 +09:00
parent c0afd7f4d5
commit d6c4a2bea6
3 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Assets/VRM/Editor/SkinnedMeshUtility/MeshIntegratorEditor.cs
View File

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -12,7 +11,8 @@ using Object = UnityEngine.Object;
namespace VRM
{
/// <summary>
/// 複数のメッシュをまとめて、BlendShapeClipに変更を反映する
/// 複数のメッシュを統合する。
/// VRM の場合、BlendShapeClip の調整が必用なのでこれも実行する。
/// </summary>
[DisallowMultipleComponent]
public static class MeshIntegratorEditor
@ -26,28 +26,11 @@ namespace VRM
SkinnedMeshUtility.IsPrefab(Selection.activeObject);
}
public static void Integrate()
{
var go = Selection.activeObject as GameObject;
Integrate(go);
}
//[MenuItem("Assets/fooa", false)]
//private static void Foo()
//{
// var go = Selection.activeObject as GameObject;
// Debug.Log(SkinnedMeshUtility.IsPrefab(go));
//}
public static List<MeshIntegrationResult> Integrate(GameObject prefab)
public static List<MeshIntegrationResult> Integrate(GameObject prefab, UniGLTF.UnityPath writeAssetPath)
{
Undo.RecordObject(prefab, "Mesh Integration");
var instance = SkinnedMeshUtility.InstantiatePrefab(prefab);
var clips = new List<BlendShapeClip>();
var proxy = instance.GetComponent<VRMBlendShapeProxy>();
if (proxy != null && proxy.BlendShapeAvatar != null)
@ -65,12 +48,29 @@ namespace VRM
// Execute
var results = VRMMeshIntegratorUtility.Integrate(instance, clips);
foreach (var res in results)
foreach (var result in results)
{
if (res.IntegratedRenderer == null) continue;
if (result.IntegratedRenderer == null) continue;
SaveMeshAsset(res.IntegratedRenderer.sharedMesh, instance, res.IntegratedRenderer.gameObject.name);
Undo.RegisterCreatedObjectUndo(res.IntegratedRenderer.gameObject, "Integrate Renderers");
var assetPath = writeAssetPath.Parent.Child($"{result.IntegratedRenderer.gameObject.name}{ASSET_SUFFIX}");
Debug.LogFormat("CreateAsset: {0}", assetPath);
assetPath.CreateAsset(result.IntegratedRenderer.sharedMesh);
Undo.RegisterCreatedObjectUndo(result.IntegratedRenderer.gameObject, "Integrate Renderers");
}
// Apply to Prefab
var prefabPath = UniGLTF.UnityPath.FromUnityPath(AssetDatabase.GetAssetPath(prefab));
if (prefabPath.Equals(writeAssetPath))
{
SkinnedMeshUtility.ApplyChangesToPrefab(instance);
}
else
{
PrefabUtility.SaveAsPrefabAsset(instance, writeAssetPath.Value, out bool success);
if (!success)
{
throw new System.Exception($"PrefabUtility.SaveAsPrefabAsset: {writeAssetPath}");
}
}
// destroy source renderers
@ -88,9 +88,6 @@ namespace VRM
renderer.gameObject.SetActive(false);
}
}
// Apply to Prefab
SkinnedMeshUtility.ApplyChangesToPrefab(instance);
Object.DestroyImmediate(instance);
return results;
@ -143,17 +140,5 @@ namespace VRM
assetPath = assetPath.Replace(@"\", @"/");
return assetPath;
}
private static void SaveMeshAsset(Mesh mesh, GameObject go, string name)
{
var assetPath = Path.Combine(GetRootPrefabPath(go), string.Format("{0}{1}",
name,
ASSET_SUFFIX
));
Debug.LogFormat("CreateAsset: {0}", assetPath);
AssetDatabase.CreateAsset(mesh, assetPath);
}
}
}

17
Assets/VRM/Editor/SkinnedMeshUtility/MeshIntegratorWizard.cs
View File

@ -5,6 +5,7 @@ using System.Linq;
using System;
using System.Collections.Generic;
using UniGLTF.MeshUtility;
using System.IO;
namespace VRM
{
@ -147,7 +148,21 @@ namespace VRM
return;
}
integrationResults = MeshIntegratorEditor.Integrate(m_root).ToArray();
var prefabPath = AssetDatabase.GetAssetPath(m_root);
var path = EditorUtility.SaveFilePanel("save prefab", Path.GetDirectoryName(prefabPath), m_root.name, "prefab");
if (string.IsNullOrEmpty(path))
{
return;
}
var assetPath = UniGLTF.UnityPath.FromFullpath(path);
if (!assetPath.IsUnderAssetsFolder)
{
Debug.LogWarning($"{path} is not asset path");
return;
}
integrationResults = MeshIntegratorEditor.Integrate(m_root, assetPath).ToArray();
}
void OnWizardCreate()

6
Assets/VRM/Editor/VrmTopMenu.cs
View File

@ -27,12 +27,6 @@ namespace VRM
[MenuItem(UserMenuPrefix + "/Freeze T-Pose", priority = 20)]
private static void FreezeTPose() => VRMHumanoidNormalizerMenu.Normalize();
[MenuItem(UserMenuPrefix + "/MeshIntegration", validate = true)]
private static bool MeshIntegrationValidation() => MeshIntegratorEditor.IntegrateValidation();
[MenuItem(UserMenuPrefix + "/MeshIntegration", priority = 21)]
private static void MeshIntegration() => MeshIntegratorEditor.Integrate();
[MenuItem(UserMenuPrefix + "/MeshIntegratorWizard", priority = 21)]
private static void OpenMeshIntegratorWizard() => MeshIntegratorWizard.CreateWizard();