Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-05-14 14:29:52 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2252 from ousttrue/fix/vrm10_firstperson_auto_dispose

Browse Source 
[VRM10] FirstPerson の修正
This commit is contained in:
ousttrue 2024-02-27 15:10:36 +09:00 committed by GitHub
commit f7aaef01c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,6 +221,11 @@ namespace UniGLTF
Destroy(oldResource);
}
public void AddResource<T>(T resource) where T : UnityEngine.Object
{
_resources.Add((SubAssetKey.Create(resource), resource));
}
void OnDestroy()
{
foreach (var (_, obj) in _resources)

11
Assets/VRM10/Runtime/Components/VRM10Object/VRM10ObjectFirstPerson.cs
View File

@ -93,20 +93,25 @@ namespace UniVRM10
{
if (x.GetRenderer(go.transform) is SkinnedMeshRenderer smr)
{
// オリジナルのモデルを３人称用にする
smr.gameObject.layer = layer.ThirdPersonOnly;
// 頭を取り除いた複製モデルを作成し、１人称用にする
var headless = await CreateHeadlessMeshAsync(smr, firstPersonBone, awaitCaller);
if (headless != null)
{
// オリジナルのモデルを３人称用にする
smr.gameObject.layer = layer.ThirdPersonOnly;
headless.gameObject.layer = layer.FirstPersonOnly;
headless.transform.SetParent(smr.transform, false);
if (runtime != null)
{
runtime.AddResource(headless.sharedMesh);
runtime.AddRenderer(headless);
}
}
else
{
// ヘッドレスを作成しなかった場合は何もしない => both と同じ
}
}
else if (x.GetRenderer(go.transform) is MeshRenderer mr)
{

4
Assets/VRM10_Samples/VRM10FirstPersonSample/VRM10RuntimeLoader.cs
View File

@ -86,11 +86,13 @@ namespace UniVRM10.FirstPersonSample
async Task<Vrm10Instance> LoadAsync(string path, VRMShaders.IAwaitCaller awaitCaller)
{
var instance = await Vrm10.LoadPathAsync(path, awaitCaller: awaitCaller);
var instance = await Vrm10.LoadPathAsync(path, awaitCaller: awaitCaller, showMeshes: false);
// VR用 FirstPerson 設定
await instance.Vrm.FirstPerson.SetupAsync(instance.gameObject, awaitCaller);
instance.GetComponent<RuntimeGltfInstance>().ShowMeshes();
return instance;
}