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

ScriptedImporterEditorBase に　Apply 前の状態を保持する。

Browse Source
This commit is contained in:
ousttrue
2021-06-21 15:01:06 +09:00
parent 21d0ce714e
commit e5b1f378c3
9 changed files with 111 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ using System.IO;
using UniGLTF.MeshUtility;
using System.Linq;
using VRMShaders;
using System.Collections.Generic;
#if UNITY_2020_2_OR_NEWER
using UnityEditor.AssetImporters;
#else
@@ -15,7 +16,7 @@ using UnityEditor.Experimental.AssetImporters;
namespace UniVRM10
{
[CustomEditor(typeof(VrmScriptedImporter))]
public class VrmScriptedImporterEditorGUI : ScriptedImporterEditor
public class VrmScriptedImporterEditorGUI : ScriptedImporterEditorBase
{
VrmScriptedImporter m_importer;
GltfParser m_parser;
@@ -48,9 +49,9 @@ namespace UniVRM10
var generator = new Vrm10MaterialDescriptorGenerator();
var materialKeys = m_parser.GLTF.materials.Select((x, i) => generator.Get(m_parser, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_parser).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys));
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);
var expressionSubAssetKeys = m_vrm.Expressions.Select(x => ExpressionKey.CreateFromVrm10(x).SubAssetKey);
m_vrmEditor = new RemapEditorVrm(new[] { VRM10Object.SubAssetKey }.Concat(expressionSubAssetKeys));
m_vrmEditor = new RemapEditorVrm(new[] { VRM10Object.SubAssetKey }.Concat(expressionSubAssetKeys), GetEditorMap, SetEditorMap);
}
enum Tabs