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

meta, expressionAvatar, expression の extract を復旧

Browse Source
This commit is contained in:
ousttrue
2021-04-06 15:08:37 +09:00
parent b0d9b5f54c
commit b62c123b66
15 changed files with 267 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs
View File

@@ -1,5 +1,4 @@
using System.Linq;
using UnityEditor;
using UnityEditor;
using UnityEngine;
using UniGLTF;
#if UNITY_2020_2_OR_NEWER
@@ -14,14 +13,10 @@ namespace UniVRM10
[CustomEditor(typeof(VrmScriptedImporter))]
public class VrmScriptedImporterEditorGUI : ScriptedImporterEditor
{
// const string TextureDirName = "Textures";
// const string MaterialDirName = "Materials";
// const string MetaDirName = "MetaObjects";
// const string ExpressionDirName = "Expressions";
VrmScriptedImporter m_importer;
GltfParser m_parser;
VrmLib.Model m_model;
UniGLTF.Extensions.VRMC_vrm.VRMC_vrm m_vrm;
public override void OnEnable()
{
@@ -33,7 +28,10 @@ namespace UniVRM10
{
return;
}
if (!UniGLTF.Extensions.VRMC_vrm.GltfDeserializer.TryGet(m_parser.GLTF.extensions, out m_vrm))
{
return;
}
m_model = VrmLoader.CreateVrmModel(m_parser);
}
@@ -59,95 +57,17 @@ namespace UniVRM10
case Tabs.Materials:
if (m_parser != null)
{
EditorMaterial.OnGUIMaterial(m_importer, m_parser, Vrm10MToonMaterialImporter.EnumerateAllTexturesDistinct);
EditorMaterial.OnGUI(m_importer, m_parser, Vrm10MToonMaterialImporter.EnumerateAllTexturesDistinct);
}
break;
case Tabs.Vrm:
if (m_parser != null)
{
EditorVrm.OnGUI(m_importer, m_parser, m_vrm);
}
break;
}
}
// var importer = target as VrmScriptedImporter;
// EditorGUILayout.LabelField("Extract settings");
// EditorGUILayout.BeginHorizontal();
// EditorGUILayout.PrefixLabel("Materials And Textures");
// GUI.enabled = !(importer.GetExternalUnityObjects<UnityEngine.Material>().Any()
// && importer.GetExternalUnityObjects<UnityEngine.Texture2D>().Any());
// if (GUILayout.Button("Extract"))
// {
// importer.ExtractMaterialsAndTextures();
// }
// GUI.enabled = !GUI.enabled;
// if (GUILayout.Button("Clear"))
// {
// importer.ClearExternalObjects<UnityEngine.Material>();
// importer.ClearExternalObjects<UnityEngine.Texture2D>();
// }
// GUI.enabled = true;
// EditorGUILayout.EndHorizontal();
// EditorGUILayout.BeginHorizontal();
// EditorGUILayout.PrefixLabel("Meta");
// GUI.enabled = !importer.GetExternalUnityObjects<UniVRM10.VRM10MetaObject>().Any();
// if (GUILayout.Button("Extract"))
// {
// importer.ExtractMeta();
// }
// GUI.enabled = !GUI.enabled;
// if (GUILayout.Button("Clear"))
// {
// importer.ClearExternalObjects<UniVRM10.VRM10MetaObject>();
// }
// GUI.enabled = true;
// EditorGUILayout.EndHorizontal();
// EditorGUILayout.BeginHorizontal();
// EditorGUILayout.PrefixLabel("Expressions");
// GUI.enabled = !(importer.GetExternalUnityObjects<UniVRM10.VRM10ExpressionAvatar>().Any()
// && importer.GetExternalUnityObjects<UniVRM10.VRM10Expression>().Any());
// if (GUILayout.Button("Extract"))
// {
// importer.ExtractExpressions();
// }
// GUI.enabled = !GUI.enabled;
// if (GUILayout.Button("Clear"))
// {
// importer.ClearExternalObjects<UniVRM10.VRM10ExpressionAvatar>();
// importer.ClearExternalObjects<UniVRM10.VRM10Expression>();
// }
// GUI.enabled = true;
// EditorGUILayout.EndHorizontal();
// // ObjectMap
// DrawRemapGUI<UnityEngine.Material>("Material Remap", importer);
// DrawRemapGUI<UnityEngine.Texture2D>("Texture Remap", importer);
// DrawRemapGUI<UniVRM10.VRM10MetaObject>("Meta Remap", importer);
// DrawRemapGUI<UniVRM10.VRM10ExpressionAvatar>("ExpressionAvatar Remap", importer);
// DrawRemapGUI<UniVRM10.VRM10Expression>("Expression Remap", importer);
// base.OnInspectorGUI();
// }
// private void DrawRemapGUI<T>(string title, VrmScriptedImporter importer) where T : UnityEngine.Object
// {
// EditorGUILayout.Foldout(_isOpen, title);
// EditorGUI.indentLevel++;
// var objects = importer.GetExternalObjectMap().Where(x => x.Key.type == typeof(T));
// foreach (var obj in objects)
// {
// EditorGUILayout.BeginHorizontal();
// EditorGUILayout.PrefixLabel(obj.Key.name);
// var asset = EditorGUILayout.ObjectField(obj.Value, obj.Key.type, true) as T;
// if (asset != obj.Value)
// {
// importer.SetExternalUnityObject(obj.Key, asset);
// }
// EditorGUILayout.EndHorizontal();
// }
// EditorGUI.indentLevel--;
// }
}
}