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

Merge branch 'fix/nexttails' into fix/spring_reconstruct_logic

Browse Source
This commit is contained in:
ousttrue 2024-11-19 10:21:24 +09:00
commit 869911db78
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/UniGLTF/Runtime/SpringBoneJobs/FastSpringBoneBufferCombiner.cs
View File

@ -57,7 +57,7 @@ namespace UniGLTF.SpringBoneJobs
// 削除するので skip
continue;
}
buffer.BackupCurrentTails(combined.CurrentTails, logicsIndex);
buffer.BackupCurrentTails(combined.CurrentTails, combined.NextTails, logicsIndex);
logicsIndex += buffer.Logics.Length;
}
}

2
Assets/UniGLTF/Runtime/SpringBoneJobs/FastSpringBoneConbinedBuffer.cs
View File

@ -148,7 +148,7 @@ namespace UniGLTF.SpringBoneJobs
}
// 速度の維持
buffer.RestoreCurrentTails(_currentTails, logicsOffset);
buffer.RestoreCurrentTails(_currentTails, _nextTails, logicsOffset);
handle = new LoadSpringsJob
{

12
Assets/UniGLTF/Runtime/SpringBoneJobs/InputPorts/FastSpringBoneBuffer.cs
View File

@ -23,6 +23,7 @@ namespace UniGLTF.SpringBoneJobs.InputPorts
public NativeArray<BlittableCollider> Colliders { get; }
public NativeArray<BlittableJointImmutable> Logics { get; }
private NativeArray<Vector3> _currentTailsBackup;
private NativeArray<Vector3> _nextTailsBackup;
public Transform[] Transforms { get; }
/// <summary>
@ -140,7 +141,7 @@ namespace UniGLTF.SpringBoneJobs.InputPorts
}
}
public void BackupCurrentTails(NativeArray<Vector3> currentTails, int offset)
public void BackupCurrentTails(NativeArray<Vector3> currentTails, NativeArray<Vector3> nextTails, int offset)
{
if (!Logics.IsCreated || Logics.Length == 0)
{
@ -150,14 +151,20 @@ namespace UniGLTF.SpringBoneJobs.InputPorts
{
_currentTailsBackup = new(Logics.Length, Allocator.Persistent);
}
if (!_nextTailsBackup.IsCreated)
{
_nextTailsBackup = new(Logics.Length, Allocator.Persistent);
}
NativeArray<Vector3>.Copy(currentTails, offset, _currentTailsBackup, 0, Logics.Length);
NativeArray<Vector3>.Copy(nextTails, offset, _nextTailsBackup, 0, Logics.Length);
}
public void RestoreCurrentTails(NativeArray<Vector3> currentTails, int offset)
public void RestoreCurrentTails(NativeArray<Vector3> currentTails, NativeArray<Vector3> nextTails, int offset)
{
if (_currentTailsBackup.IsCreated)
{
NativeArray<Vector3>.Copy(_currentTailsBackup, 0, currentTails, offset, Logics.Length);
NativeArray<Vector3>.Copy(_nextTailsBackup, 0, nextTails, offset, Logics.Length);
}
else
{
@ -177,6 +184,7 @@ namespace UniGLTF.SpringBoneJobs.InputPorts
if (Colliders.IsCreated) Colliders.Dispose();
if (Logics.IsCreated) Logics.Dispose();
if (_currentTailsBackup.IsCreated) _currentTailsBackup.Dispose();
if (_nextTailsBackup.IsCreated) _nextTailsBackup.Dispose();
}
}
}