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

Added errorHandler to VRMImporter.LoadVrmAsync

Browse Source
This commit is contained in:
ousttrue
2018-06-18 23:16:16 +09:00
parent 922f076703
commit 43777d9a66
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Scripts/Format/VRMImporter.cs
View File

@@ -183,7 +183,7 @@ namespace VRM
}
LoadBlendShapeMaster(context);
VRMSpringUtility.LoadSecondary(context.Root.transform, context.Nodes,
VRMSpringUtility.LoadSecondary(context.Root.transform, context.Nodes,
context.VRM.extensions.VRM.secondaryAnimation);
LoadFirstPerson(context);
@@ -407,7 +407,7 @@ namespace VRM
#region LoadVrmAsync
static IEnumerator LoadTextures(VRMImporterContext context, IStorage storage)
{
for(int i=0; i<context.GLTF.textures.Count; ++i)
for (int i = 0; i < context.GLTF.textures.Count; ++i)
{
var x = new TextureItem(context.GLTF, i);
x.Process(storage);
@@ -509,27 +509,26 @@ namespace VRM
}
#endif
public static void LoadVrmAsync(string path, Action<GameObject> onLoaded)
public static void LoadVrmAsync(string path, Action<GameObject> onLoaded, Action<Exception> onError = null)
{
var context = new VRMImporterContext(path);
context.ParseVrm(File.ReadAllBytes(path));
LoadVrmAsync(context, onLoaded);
LoadVrmAsync(context, onLoaded, onError);
}
public static void LoadVrmAsync(Byte[] bytes, Action<GameObject> onLoaded)
public static void LoadVrmAsync(Byte[] bytes, Action<GameObject> onLoaded, Action<Exception> onError = null)
{
var context = new VRMImporterContext();
context.ParseVrm(bytes);
LoadVrmAsync(context, onLoaded);
LoadVrmAsync(context, onLoaded, onError);
}
public static void LoadVrmAsync(VRMImporterContext ctx, Action<GameObject> onLoaded)
{
LoadVrmAsync(ctx, onLoaded, Debug.LogError);
}
public static void LoadVrmAsync(VRMImporterContext ctx, Action<GameObject> onLoaded, Action<Exception> onError)
public static void LoadVrmAsync(VRMImporterContext ctx, Action<GameObject> onLoaded, Action<Exception> onError = null)
{
if (onError == null)
{
onError = Debug.LogError;
}
LoadVrmAsyncInternal(ctx)
.Subscribe(Scheduler.MainThread, onLoaded, onError);
}