Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-27 13:24:42 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "typo rename UnityObjectDestoyer to UnityObjectDestroyer"

Browse Source 
This reverts commit a8d5704a0f.
This commit is contained in:
ousttrue
2022-10-03 18:09:05 +09:00
parent 6e377b0543
commit b0e20b95e4
11 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,7 +344,7 @@ namespace UniGLTF
{
foreach (var x in Meshes)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(x.Mesh);
UnityObjectDestoyer.DestroyRuntimeOrEditor(x.Mesh);
}
Meshes.Clear();

4
Assets/UniGLTF/Runtime/UniGLTF/RuntimeGltfInstance.cs
View File

@@ -171,7 +171,7 @@ namespace UniGLTF
Debug.Log("UnityResourceDestroyer.OnDestroy");
foreach (var (_, obj) in _resources)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(obj);
UnityObjectDestoyer.DestroyRuntimeOrEditor(obj);
}
}
@@ -188,7 +188,7 @@ namespace UniGLTF
{
if (this != null && this.gameObject != null)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(this.gameObject);
UnityObjectDestoyer.DestroyRuntimeOrEditor(this.gameObject);
}
}
}

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

@@ -148,7 +148,7 @@ namespace VRM
var root = loaded.Root;
// Remove RuntimeGltfInstance component before saving as a prefab.
UnityObjectDestroyer.DestroyRuntimeOrEditor(loaded);
UnityObjectDestoyer.DestroyRuntimeOrEditor(loaded);
// Create or update Main Asset
if (m_prefabPath.IsFileExists)
@@ -164,7 +164,7 @@ namespace VRM
}
// destroy GameObject on scene
UnityObjectDestroyer.DestroyRuntimeOrEditor(root);
UnityObjectDestoyer.DestroyRuntimeOrEditor(root);
foreach (var x in m_paths)
{

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

@@ -361,23 +361,23 @@ namespace VRM
// VRM specific
if (HumanoidAvatar != null)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(HumanoidAvatar);
UnityObjectDestoyer.DestroyRuntimeOrEditor(HumanoidAvatar);
}
if (Meta != null)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(Meta);
UnityObjectDestoyer.DestroyRuntimeOrEditor(Meta);
}
if (AvatarDescription != null)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(AvatarDescription);
UnityObjectDestoyer.DestroyRuntimeOrEditor(AvatarDescription);
}
if (BlendShapeAvatar != null)
{
foreach (var clip in BlendShapeAvatar.Clips)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(clip);
UnityObjectDestoyer.DestroyRuntimeOrEditor(clip);
}
UnityObjectDestroyer.DestroyRuntimeOrEditor(BlendShapeAvatar);
UnityObjectDestoyer.DestroyRuntimeOrEditor(BlendShapeAvatar);
}
base.Dispose();

4
Assets/VRM10/Runtime/IO/Vrm10.cs
View File

@@ -139,7 +139,7 @@ namespace UniVRM10
{
if (ct.IsCancellationRequested)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(instance.gameObject);
UnityObjectDestoyer.DestroyRuntimeOrEditor(instance.gameObject);
ct.ThrowIfCancellationRequested();
}
return instance;
@@ -164,7 +164,7 @@ namespace UniVRM10
{
if (ct.IsCancellationRequested)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(migratedInstance.gameObject);
UnityObjectDestoyer.DestroyRuntimeOrEditor(migratedInstance.gameObject);
ct.ThrowIfCancellationRequested();
}
return migratedInstance;

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

@@ -821,19 +821,19 @@ namespace UniVRM10
// VRM specific
if (m_humanoid != null)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(m_humanoid);
UnityObjectDestoyer.DestroyRuntimeOrEditor(m_humanoid);
m_humanoid = null;
}
if (m_vrmObject != null)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(m_vrmObject);
UnityObjectDestoyer.DestroyRuntimeOrEditor(m_vrmObject);
m_vrmObject = null;
}
foreach (var (preset, clip) in m_expressions)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(clip);
UnityObjectDestoyer.DestroyRuntimeOrEditor(clip);
}
m_expressions.Clear();

2
Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@@ -336,7 +336,7 @@ namespace UniVRM10.VRM10Viewer
ct: cancellationToken);
if (cancellationToken.IsCancellationRequested)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(vrm10Instance.gameObject);
UnityObjectDestoyer.DestroyRuntimeOrEditor(vrm10Instance.gameObject);
cancellationToken.ThrowIfCancellationRequested();
}

2
Assets/VRMShaders/GLTF/IO/Runtime/Animation/Importer/AnimationClipFactory.cs
View File

@@ -37,7 +37,7 @@ namespace VRMShaders
{
foreach (var kv in _runtimeClips)
{
UnityObjectDestroyer.DestroyRuntimeOrEditor(kv.Value);
UnityObjectDestoyer.DestroyRuntimeOrEditor(kv.Value);
}
_runtimeClips.Clear();
}

2
Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs
View File

@@ -58,7 +58,7 @@ namespace VRMShaders
#if VRM_DEVELOP
// Debug.Log($"Destroy {x.Asset}");
#endif
UnityObjectDestroyer.DestroyRuntimeOrEditor(x.Asset);
UnityObjectDestoyer.DestroyRuntimeOrEditor(x.Asset);
}
}
}

4
Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureFactory.cs
View File

@@ -114,8 +114,8 @@ namespace VRMShaders
// したがって合成後の Texture に Sampler Param を設定する必要があるが、エッジケースで不整合な結果になる可能性がある.
combinedTexture.SetSampler(texDesc.Sampler);
_textureCache.Add(subAssetKey, combinedTexture);
UnityObjectDestroyer.DestroyRuntimeOrEditor(metallicRoughnessTexture);
UnityObjectDestroyer.DestroyRuntimeOrEditor(occlusionTexture);
UnityObjectDestoyer.DestroyRuntimeOrEditor(metallicRoughnessTexture);
UnityObjectDestoyer.DestroyRuntimeOrEditor(occlusionTexture);
return combinedTexture;
}

2
Assets/VRMShaders/GLTF/IO/Runtime/Util/UnityObjectDestroyer.cs
View File

@@ -2,7 +2,7 @@ using UnityEngine;
namespace VRMShaders
{
public static class UnityObjectDestroyer
public static class UnityObjectDestoyer
{
public static void DestroyRuntimeOrEditor(UnityEngine.Object o)
{