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

TakeResponsibilityForDestroyObjectFunc の返り値削除

Browse Source 
GameObject(prefab root)の移譲の判定にしか使っていなかった。設計変更で不要になった
This commit is contained in:
ousttrue 2021-06-10 20:07:04 +09:00
parent 0bdd18c408
commit 612a59cba7
10 changed files with 37 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs
View File

@ -54,7 +54,6 @@ namespace UniGLTF
loaded.TransferOwnership((k, o) =>
{
context.AddObjectToAsset(k.Name, o);
return true;
});
context.AddObjectToAsset(loaded.name, loaded.gameObject);

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

@ -313,10 +313,8 @@ namespace UniGLTF
{
foreach (var mesh in Meshes.ToArray())
{
if (take(SubAssetKey.Create(mesh.Mesh), mesh.Mesh))
{
Meshes.Remove(mesh);
}
take(SubAssetKey.Create(mesh.Mesh), mesh.Mesh);
Meshes.Remove(mesh);
}
TextureFactory.TransferOwnership(take);
@ -324,10 +322,8 @@ namespace UniGLTF
foreach (var (key, animation) in AnimationClips.ToArray())
{
if (take(key, animation))
{
AnimationClips.Remove((key, animation));
}
take(key, animation);
AnimationClips.Remove((key, animation));
}
}
}

7
Assets/UniGLTF/Runtime/UniGLTF/UnityObjectManager.cs
View File

@ -18,7 +18,6 @@ namespace UniGLTF
context.TransferOwnership((k, o) =>
{
loaded.m_resources.Add((k, o));
return true;
});
return loaded;
}
@ -49,10 +48,8 @@ namespace UniGLTF
{
foreach (var (key, x) in m_resources.ToArray())
{
if (take(key, x))
{
m_resources.Remove((key, x));
}
take(key, x);
m_resources.Remove((key, x));
}
}

30
Assets/VRM/Editor/Format/VRMEditorImporterContext.cs
View File

@ -108,36 +108,25 @@ namespace VRM
TextureExtractor.ExtractTextures(m_context.Parser, m_prefabPath.Parent.Child(dirName), m_context.TextureDescriptorGenerator, subAssets, (_x, _y) => { }, onTextureReloaded);
}
bool SaveAsAsset(SubAssetKey _, UnityEngine.Object o)
void SaveAsAsset(SubAssetKey _, UnityEngine.Object o)
{
if (o is GameObject)
{
return false;
}
if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(o)))
{
// already exists. not dispose
#if VRM_DEVELOP
Debug.Log($"Loaded. skip: {o}");
// 来ない？
Debug.LogWarning($"{o} already exists. skip write");
#endif
return true;
return;
}
var assetPath = GetAssetPath(m_prefabPath, o);
if (assetPath.IsNull)
if (!assetPath.IsNull)
{
// not dispose
return true;
// アセットとして書き込む
assetPath.Parent.EnsureFolder();
assetPath.CreateAsset(o);
m_paths.Add(assetPath);
}
// アセットとして書き込む
assetPath.Parent.EnsureFolder();
assetPath.CreateAsset(o);
m_paths.Add(assetPath);
// 所有権が移動
return true;
}
public void SaveAsAsset(UniGLTF.UnityObjectManager loaded)
@ -157,7 +146,6 @@ namespace VRM
Debug.LogFormat("replace prefab: {0}", m_prefabPath);
var prefab = m_prefabPath.LoadAsset<GameObject>();
PrefabUtility.SaveAsPrefabAssetAndConnect(loaded.gameObject, m_prefabPath.Value, InteractionMode.AutomatedAction);
}
else
{

26
Assets/VRM/Runtime/IO/VRMImporterContext.cs
View File

@ -322,33 +322,25 @@ namespace VRM
// VRM-0 は SubAssetKey を使っていないので default で済ます
// VRM 固有のリソース(ScriptableObject)
if (take(default, HumanoidAvatar))
{
HumanoidAvatar = null;
}
take(default, HumanoidAvatar);
HumanoidAvatar = null;
if (take(default, Meta))
{
Meta = null;
}
take(default, Meta);
Meta = null;
if (take(default, AvatarDescription))
{
AvatarDescription = null;
}
take(default, AvatarDescription);
AvatarDescription = null;
foreach (var x in BlendShapeAvatar.Clips)
{
if (take(default, x))
take(default, x);
{
// do nothing
}
}
if (take(default, BlendShapeAvatar))
{
BlendShapeAvatar = null;
}
take(default, BlendShapeAvatar);
BlendShapeAvatar = null;
// GLTF のリソース
base.TransferOwnership(take);

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

@ -48,7 +48,6 @@ namespace UniVRM10
loaded.TransferOwnership((key, o) =>
{
context.AddObjectToAsset(key.Name, o);
return true;
});
context.AddObjectToAsset(loaded.name, loaded.gameObject);

18
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@ -621,25 +621,19 @@ namespace UniVRM10
public override void TransferOwnership(TakeResponsibilityForDestroyObjectFunc take)
{
// VRM 固有のリソース(ScriptableObject)
if (take(SubAssetKey.Create(m_humanoid), m_humanoid))
{
m_humanoid = null;
}
take(SubAssetKey.Create(m_humanoid), m_humanoid);
m_humanoid = null;
if (m_meta != null)
{
if (take(VRM10MetaObject.SubAssetKey, m_meta))
{
m_meta = null;
}
take(VRM10MetaObject.SubAssetKey, m_meta);
m_meta = null;
}
foreach (var x in m_expressions)
{
if (take(ExpressionKey.CreateFromClip(x).SubAssetKey, x))
{
// do nothing
}
take(ExpressionKey.CreateFromClip(x).SubAssetKey, x);
// do nothing
}
m_expressions.Clear();

2
Assets/VRMShaders/GLTF/IO/Runtime/IResponsibilityForDestroyObjects.cs
View File

@ -2,7 +2,7 @@ using System;
namespace VRMShaders
{
public delegate bool TakeResponsibilityForDestroyObjectFunc(SubAssetKey key, UnityEngine.Object obj);
public delegate void TakeResponsibilityForDestroyObjectFunc(SubAssetKey key, UnityEngine.Object obj);
/// <summary>
/// UnityObjectを破棄する責務。

13
Assets/VRMShaders/GLTF/IO/Runtime/MaterialFactory.cs
View File

@ -82,22 +82,15 @@ namespace VRMShaders
/// <param name="take"></param>
public void TransferOwnership(TakeResponsibilityForDestroyObjectFunc take)
{
var list = new List<Material>();
foreach (var x in m_materials)
foreach (var x in m_materials.ToArray())
{
if (!x.UseExternal)
{
// 外部の '.asset' からロードしていない
if (take(x.Key, x.Asset))
{
list.Add(x.Asset);
}
take(x.Key, x.Asset);
m_materials.Remove(x);
}
}
foreach (var x in list)
{
Remove(x);
}
}
public Material GetMaterial(int index)

14
Assets/VRMShaders/GLTF/IO/Runtime/TextureFactory.cs
View File

@ -45,18 +45,10 @@ namespace VRMShaders
/// <param name="take"></param>
public void TransferOwnership(TakeResponsibilityForDestroyObjectFunc take)
{
var transferredAssets = new HashSet<SubAssetKey>();
foreach (var (k, v) in _textureCache)
foreach (var (k, v) in _textureCache.ToArray())
{
if (take(k, v))
{
transferredAssets.Add(k);
}
}
foreach (var key in transferredAssets)
{
_textureCache.Remove(key);
take(k, v);
_textureCache.Remove(k);
}
}