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

MigrateToVrm1 switch

Browse Source
This commit is contained in:
ousttrue 2021-03-30 21:54:30 +09:00
parent 2d5d3bb4d5
commit 9a1f85c97e
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs
View File

@ -12,11 +12,11 @@ namespace UniVRM10
public class VrmScriptedImporter : ScriptedImporter
{
[SerializeField]
bool m_migrateToVrm1 = default;
public bool MigrateToVrm1 = default;
public override void OnImportAsset(AssetImportContext ctx)
{
VrmScriptedImporterImpl.Import(this, ctx, m_migrateToVrm1);
VrmScriptedImporterImpl.Import(this, ctx, MigrateToVrm1);
}
}
}

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

@ -28,8 +28,12 @@ namespace UniVRM10
base.OnEnable();
m_importer = target as VrmScriptedImporter;
m_parser = new GltfParser();
m_parser.ParsePath(m_importer.assetPath);
m_parser = VrmScriptedImporterImpl.Parse(m_importer.assetPath, m_importer.MigrateToVrm1);
if (m_parser == null)
{
return;
}
m_model = VrmLoader.CreateVrmModel(m_parser);
}
@ -53,7 +57,10 @@ namespace UniVRM10
break;
case Tabs.Materials:
EditorMaterial.OnGUIMaterial(m_importer, m_parser, Vrm10MToonMaterialImporter.EnumerateAllTexturesDistinct);
if (m_parser != null)
{
EditorMaterial.OnGUIMaterial(m_importer, m_parser, Vrm10MToonMaterialImporter.EnumerateAllTexturesDistinct);
}
break;
case Tabs.Vrm:

2
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs
View File

@ -19,7 +19,7 @@ namespace UniVRM10
/// <param name="path"></param>
/// <param name="migrateToVrm1"></param>
/// <returns></returns>
static GltfParser Parse(string path, bool migrateToVrm1)
public static GltfParser Parse(string path, bool migrateToVrm1)
{
//
// Parse(parse glb, parser gltf json)