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

UpdateMeshIntegrationGroups

Browse Source
This commit is contained in:
ousttrue
2023-11-17 21:39:40 +09:00
parent c0d29dd2e6
commit 0394b2a5fe
4 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/UniGLTF/Editor/MeshUtility/MeshIntegrationTab.cs
View File

@@ -8,7 +8,7 @@ namespace UniGLTF.MeshUtility
public class MeshIntegrationTab
{
bool _modified = false;
protected GltfMeshUtility _meshUti;
protected GltfMeshUtility _meshUtil;
Splitter _splitter;
ReorderableList _groupList;
@@ -23,29 +23,29 @@ namespace UniGLTF.MeshUtility
{
return;
}
if (value < 0 || value >= _meshUti.MeshIntegrationGroups.Count)
if (value < 0 || value >= _meshUtil.MeshIntegrationGroups.Count)
{
return;
}
_selected = value;
_renderers.Clear();
_renderers.AddRange(_meshUti.MeshIntegrationGroups[_selected].Renderers);
_renderers.AddRange(_meshUtil.MeshIntegrationGroups[_selected].Renderers);
}
}
public MeshIntegrationTab(EditorWindow editor, GltfMeshUtility meshUtility)
{
_meshUti = meshUtility;
_meshUtil = meshUtility;
_splitter = new VerticalSplitter(editor, 200, 50);
_groupList = new ReorderableList(_meshUti.MeshIntegrationGroups, typeof(MeshIntegrationGroup));
_groupList = new ReorderableList(_meshUtil.MeshIntegrationGroups, typeof(MeshIntegrationGroup));
_groupList.drawHeaderCallback = (Rect rect) =>
{
GUI.Label(rect, "Integration group");
};
_groupList.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) =>
{
var group = _meshUti.MeshIntegrationGroups[index];
var group = _meshUtil.MeshIntegrationGroups[index];
EditorGUI.TextField(rect, group.Name);
};
_groupList.onSelectCallback = rl =>
@@ -65,10 +65,10 @@ namespace UniGLTF.MeshUtility
};
}
public virtual void UpdateMeshIntegrationList(GameObject root)
public void UpdateMeshIntegrationList(GameObject root)
{
_selected = -1;
_meshUti.MeshIntegrationGroups.Clear();
_meshUtil.UpdateMeshIntegrationGroups(root);
Selected = 0;
}

27
Assets/UniGLTF/Runtime/MeshUtility/GltfMeshUtility.cs
View File

@@ -59,6 +59,33 @@ namespace UniGLTF.MeshUtility
/// </summary>
public bool SplitByBlendShape = false;
protected UniGLTF.MeshUtility.MeshIntegrationGroup _GetOrCreateGroup(string name)
{
foreach (var g in MeshIntegrationGroups)
{
if (g.Name == name)
{
return g;
}
}
MeshIntegrationGroups.Add(new UniGLTF.MeshUtility.MeshIntegrationGroup
{
Name = name,
});
return MeshIntegrationGroups.Last();
}
public virtual void UpdateMeshIntegrationGroups(GameObject root)
{
MeshIntegrationGroups.Clear();
if (root == null)
{
return;
}
var group = _GetOrCreateGroup("all mesh");
group.Renderers.AddRange(root.GetComponentsInChildren<Renderer>());
}
public void IntegrateAll(GameObject root)
{
if (root == null)

8
Assets/VRM10/Editor/MeshUtility/Vrm10MeshIntegrationTab.cs
View File

@@ -11,13 +11,5 @@ namespace UniVRM10
{
_vrmMeshUtil = meshUtility;
}
public override void UpdateMeshIntegrationList(GameObject root)
{
_selected = -1;
_meshUti.MeshIntegrationGroups.Clear();
_vrmMeshUtil.IntegrateFirstPerson(root);
Selected = 0;
}
}
}

18
Assets/VRM10/Runtime/MeshUtility/Vrm10MeshUtility.cs
View File

@@ -117,7 +117,7 @@ namespace UniVRM10
}
}
public void IntegrateFirstPerson(GameObject root)
public override void UpdateMeshIntegrationGroups(GameObject root)
{
if (root == null)
{
@@ -144,21 +144,5 @@ namespace UniVRM10
g.Renderers.Add(a.GetRenderer(root.transform));
}
}
UniGLTF.MeshUtility.MeshIntegrationGroup _GetOrCreateGroup(string name)
{
foreach (var g in MeshIntegrationGroups)
{
if (g.Name == name)
{
return g;
}
}
MeshIntegrationGroups.Add(new UniGLTF.MeshUtility.MeshIntegrationGroup
{
Name = name,
});
return MeshIntegrationGroups.Last();
}
}
}