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

Merge pull request #1050 from ousttrue/fix/animation_extract

Browse Source 
ImporterContext.AnimationClips に External か否かの情報を追加
This commit is contained in:
ousttrue
2021-06-17 21:22:38 +09:00
committed by GitHub
parent 1a99f7c6d8 9c937e623d
commit 9e3d747100
1 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
View File

@@ -123,16 +123,16 @@ namespace UniGLTF
{
foreach (var (key, gltfAnimation) in Enumerable.Zip(AnimationImporterUtil.EnumerateSubAssetKeys(GLTF), GLTF.animations, (x, y) => (x, y)))
{
AnimationClip clip = default;
AnimationInfo animation = default;
if (_externalObjectMap.TryGetValue(key, out UnityEngine.Object value))
{
clip = value as AnimationClip;
animation = new AnimationInfo(key, value as AnimationClip, true);
}
else
{
clip = AnimationImporterUtil.ConvertAnimationClip(GLTF, gltfAnimation, InvertAxis.Create());
AnimationClips.Add((key, clip));
animation = new AnimationInfo(key, AnimationImporterUtil.ConvertAnimationClip(GLTF, gltfAnimation, InvertAxis.Create()), false);
}
AnimationClips.Add(animation);
}
await awaitCaller.NextFrame();
@@ -151,7 +151,7 @@ namespace UniGLTF
var animation = Root.AddComponent<Animation>();
for (int i = 0; i < AnimationClips.Count; ++i)
{
var (_, clip) = AnimationClips[i];
var clip = AnimationClips[i].Clip;
animation.AddClip(clip, clip.name);
if (i == 0)
{
@@ -281,7 +281,21 @@ namespace UniGLTF
public List<MeshWithMaterials> Meshes = new List<MeshWithMaterials>();
public List<(SubAssetKey, AnimationClip)> AnimationClips = new List<(SubAssetKey, AnimationClip)>();
public struct AnimationInfo
{
public readonly SubAssetKey Key;
public readonly AnimationClip Clip;
public readonly bool IsExternal;
public AnimationInfo(SubAssetKey key, AnimationClip clip, bool isExternal)
{
Key = key;
Clip = clip;
IsExternal = isExternal;
}
}
public List<AnimationInfo> AnimationClips = new List<AnimationInfo>();
#endregion
/// <summary>
@@ -289,9 +303,14 @@ namespace UniGLTF
/// </summary>
public virtual void Dispose()
{
foreach (var (k, x) in AnimationClips)
foreach (var info in AnimationClips)
{
UnityObjectDestoyer.DestroyRuntimeOrEditor(x);
if (info.IsExternal)
{
// external は削除不要
continue;
}
UnityObjectDestoyer.DestroyRuntimeOrEditor(info.Clip);
}
AnimationClips.Clear();
@@ -320,11 +339,17 @@ namespace UniGLTF
TextureFactory.TransferOwnership(take);
MaterialFactory.TransferOwnership(take);
foreach (var (key, animation) in AnimationClips.ToArray())
foreach (var info in AnimationClips)
{
take(key, animation);
AnimationClips.Remove((key, animation));
if (info.IsExternal)
{
// external は削除しないので不要
continue;
}
take(info.Key, info.Clip);
}
AnimationClips.Clear();
}
}
}