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

RemapEditorBase に externalObjectMap を保持しない

Browse Source
This commit is contained in:
ousttrue
2021-06-21 14:15:48 +09:00
parent e04ac65bf5
commit 21d0ce714e
9 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,8 +17,7 @@ namespace UniVRM10
public class RemapEditorVrm : RemapEditorBase
{
public RemapEditorVrm(
IEnumerable<SubAssetKey> keys,
Dictionary<ScriptedImporter.SourceAssetIdentifier, UnityEngine.Object> externalObjectMap) : base(keys, externalObjectMap)
IEnumerable<SubAssetKey> keys) : base(keys)
{ }
public void OnGUI(ScriptedImporter importer, GltfParser parser, UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm)
@@ -33,10 +32,10 @@ namespace UniVRM10
}
// meta
DrawRemapGUI<VRM10Object>();
DrawRemapGUI<VRM10Object>(importer.GetExternalObjectMap());
// expressions
DrawRemapGUI<VRM10Expression>();
DrawRemapGUI<VRM10Expression>(importer.GetExternalObjectMap());
if (GUILayout.Button("Clear"))
{

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

@@ -43,16 +43,14 @@ namespace UniVRM10
m_parser = result.Parser;
m_model = ModelReader.Read(result.Parser);
var externalObjectMap = m_importer.GetExternalObjectMap();
var tmp = m_importer.GetExternalObjectMap();
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), externalObjectMap);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys));
var expressionSubAssetKeys = m_vrm.Expressions.Select(x => ExpressionKey.CreateFromVrm10(x).SubAssetKey);
m_vrmEditor = new RemapEditorVrm(new[] { VRM10Object.SubAssetKey }.Concat(expressionSubAssetKeys), externalObjectMap);
m_vrmEditor = new RemapEditorVrm(new[] { VRM10Object.SubAssetKey }.Concat(expressionSubAssetKeys));
}
enum Tabs