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

コード整理。SpringBoneEditor を VRM10Window に統合

Browse Source 
* 元は Constraint などのエディタもあったのだけど、削った。量が減ったので合体
This commit is contained in:
ousttrue 2022-10-21 17:25:45 +09:00
parent 916e4751c8
commit f77f0dc6f5
4 changed files with 54 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Assets/VRM10/Editor/Components/SpringBone/SpringBoneEditor.cs
View File

@ -1,59 +0,0 @@
using UnityEditor;
using UnityEditor.IMGUI.Controls;
using UnityEngine;
namespace UniVRM10
{
/// <summary>
/// TreeView でアクティブな SpringBone, ColliderGroup を管理して、
/// アクティブな SpringBone と ColliderGroup を SceneHandle で Edit する。
/// </summary>
public static class SpringBoneEditor
{
static SpringBoneTreeView s_treeView;
static SpringBoneTreeView GetTree(Vrm10Instance target, SerializedObject so)
{
if (s_treeView == null || s_treeView.Target != target)
{
var state = new TreeViewState();
s_treeView = new SpringBoneTreeView(state, target, so);
s_treeView.Reload();
}
return s_treeView;
}
public static void Disable()
{
s_treeView = null;
}
public static MonoBehaviour Active;
/// <summary>
/// 2D の GUI 描画
/// </summary>
public static void Draw2D(Vrm10Instance target, SerializedObject so)
{
var tree = GetTree(target, so);
if (GUILayout.Button("Reload"))
{
Disable();
return;
}
tree.Draw2D();
}
/// <summary>
/// 3D の Handle 描画
/// </summary>
public static void Draw3D(Vrm10Instance target, SerializedObject so)
{
var tree = GetTree(target, so);
if (tree != null && target != null)
{
Active = tree.Draw3D(target.SpringBone);
}
}
}
}

11
Assets/VRM10/Editor/Components/SpringBone/SpringBoneEditor.cs.meta
View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 33ca35799b1168949bb4466aae13dfd4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

84
Assets/VRM10/Editor/Components/VRM10Window.cs
View File

@ -32,7 +32,7 @@ namespace UniVRM10
void OnDisable()
{
SpringBoneEditor.Disable();
s_treeView = null;
SceneView.duringSceneGui -= OnSceneGUI;
// Debug.Log("OnDisable");
@ -61,31 +61,28 @@ namespace UniVRM10
}
m_root = id;
m_so = value != null ? new SerializedObject(value) : null;
// m_constraints = null;
if (Root != null)
{
var animator = Root.GetComponent<Animator>();
m_head = animator.GetBoneTransform(HumanBodyBones.Head);
}
}
}
Transform m_head;
ScrollView m_scrollView = new ScrollView();
/// <summary>
/// public entry point
/// Scene 上の 3D 表示
///
/// * Joint/Collider の Picker
///
/// </summary>
/// <param name="target"></param>
void OnSceneGUI(SceneView sceneView)
{
Tools.hidden = true;
SpringBoneEditor.Draw3D(Root, m_so);
Draw3D(Root, m_so);
}
//
/// <summary>
/// Window 上の GUI
///
/// * 対象 VRM の保持
/// * 選択 Joint/Collider の表示
///
/// </summary>
private void OnGUI()
{
if (Root == null)
@ -101,7 +98,7 @@ namespace UniVRM10
}
// Root
Root = (Vrm10Instance)EditorGUILayout.ObjectField("vrm1", Root, typeof(Vrm10Instance), true);
Root = (Vrm10Instance)EditorGUILayout.ObjectField("Editing Model", Root, typeof(Vrm10Instance), true);
if (Root == null)
{
return;
@ -109,22 +106,47 @@ namespace UniVRM10
// active
EditorGUI.BeginDisabledGroup(true);
EditorGUILayout.ObjectField("joint or collider", SpringBoneEditor.Active, typeof(MonoBehaviour), true);
EditorGUILayout.ObjectField("Selected Object", Active, typeof(MonoBehaviour), true);
EditorGUI.EndDisabledGroup();
if (m_so == null)
{
m_so = new SerializedObject(Root);
}
if (m_so == null)
{
return;
}
m_so.Update();
SpringBoneEditor.Draw2D(Root, m_so);
m_so.ApplyModifiedProperties();
// if (m_so == null)
// {
// m_so = new SerializedObject(Root);
// }
// if (m_so == null)
// {
// return;
// }
// m_so.Update();
// SpringBoneEditor.Draw2D(Root, m_so);
// m_so.ApplyModifiedProperties();
}
SpringBoneTreeView s_treeView;
SpringBoneTreeView GetTree(Vrm10Instance target, SerializedObject so)
{
if (s_treeView == null || s_treeView.Target != target)
{
var state = new UnityEditor.IMGUI.Controls.TreeViewState();
s_treeView = new SpringBoneTreeView(state, target, so);
s_treeView.Reload();
}
return s_treeView;
}
public MonoBehaviour Active;
/// <summary>
/// 3D の Handle 描画
/// </summary>
public void Draw3D(Vrm10Instance target, SerializedObject so)
{
var tree = GetTree(target, so);
if (tree != null && target != null)
{
Active = tree.Draw3D(target.SpringBone);
}
}
}
}

2
Assets/VRM10/Editor/Vrm10InstanceEditor.cs
View File

@ -166,7 +166,7 @@ namespace UniVRM10
if (instance.Vrm != null)
{
EditorGUILayout.HelpBox("SpringBone utility", MessageType.Info);
EditorGUILayout.HelpBox("SpringBone gizmo etc...", MessageType.Info);
if (GUILayout.Button("Open " + VRM10Window.WINDOW_TITLE))
{
VRM10Window.Open();