Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature10/rename importer exporter #911

Merged
merged 8 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/VRM10.Samples/Runtime/ViewerUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ void LoadModel(string path)
var parser = new UniGLTF.GltfParser();
parser.ParsePath(path);

using (var loader = new RuntimeUnityBuilder(parser))
using (var loader = new Vrm10Importer(parser))
{
loader.Load();
loader.ShowMeshes();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public override void OnEnable()
m_parser = null;
return;
}
m_model = VrmLoader.CreateVrmModel(m_parser);
m_model = ModelReader.Read(m_parser);
}

enum Tabs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static void Import(ScriptedImporter scriptedImporter, AssetImportContext
//
var externalObjectMap = scriptedImporter.GetExternalObjectMap().ToDictionary(kv => new SubAssetKey(kv.Key.type, kv.Key.name), kv => kv.Value);

using (var loader = new RuntimeUnityBuilder(parser, externalObjectMap))
using (var loader = new Vrm10Importer(parser, externalObjectMap))
{
// settings TextureImporters
foreach (var (key, textureInfo) in Vrm10MaterialImporter.EnumerateAllTexturesDistinct(parser))
Expand Down
2 changes: 1 addition & 1 deletion Assets/VRM10/Editor/Vrm10ExportDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ protected override void ExportPath(string path)

try
{
var converter = new UniVRM10.RuntimeVrmConverter();
var converter = new UniVRM10.ModelExporter();
var model = converter.ToModelFrom10(root);

if (HumanoidValidator.HasRotationOrScale(root))
Expand Down
29 changes: 0 additions & 29 deletions Assets/VRM10/Runtime/IO/ComponentBuilder.cs

This file was deleted.

23 changes: 0 additions & 23 deletions Assets/VRM10/Runtime/IO/DictionaryExtensions.cs

This file was deleted.

2 changes: 1 addition & 1 deletion Assets/VRM10/Runtime/IO/ExpressionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace UniVRM10
{
public static class ExpressionExtensions
{
public static UniVRM10.MorphTargetBinding Build10(this MorphTargetBind bind, GameObject root, RuntimeUnityBuilder.ModelMap loader, VrmLib.Model model)
public static UniVRM10.MorphTargetBinding Build10(this MorphTargetBind bind, GameObject root, Vrm10Importer.ModelMap loader, VrmLib.Model model)
{
var libNode = model.Nodes[bind.Node.Value];
var node = loader.Nodes[libNode].transform;
Expand Down
Loading