-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: batch update Avatar skinning matrices (#1855)
* First working version * Using unsafe pointers * Proof of concept is valid! * Removed unnecesasry cleanup, pass the NativeArray entirely and read by index, some clenaup * Reuse and resize strategy * Added NetworkAvatar property * Delete avatar transform matrix * Added test suite * Naming convetions for testing * Moved FinshAvatarMatricesCaluclation to PreRenderingSystemGroup * Applied suggestions * Some cleanup * Further merge --------- Co-authored-by: Mikhail Agapov <[email protected]>
- Loading branch information
1 parent
b5be150
commit 2d0dcdb
Showing
24 changed files
with
453 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
156 changes: 156 additions & 0 deletions
156
...orer/Assets/DCL/AvatarRendering/AvatarShape/Components/AvatarTransformMatrixJobWrapper.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using DCL.AvatarRendering.AvatarShape.ComputeShader; | ||
| using DCL.AvatarRendering.AvatarShape.UnityInterface; | ||
| using Unity.Collections; | ||
| using Unity.Collections.LowLevel.Unsafe; | ||
| using Unity.Jobs; | ||
| using Unity.Mathematics; | ||
| using UnityEngine; | ||
| using UnityEngine.Jobs; | ||
|
|
||
| namespace DCL.AvatarRendering.AvatarShape.Components | ||
| { | ||
| public unsafe class AvatarTransformMatrixJobWrapper : IDisposable | ||
| { | ||
| internal const int AVATAR_ARRAY_SIZE = 100; | ||
| private static readonly int BONES_ARRAY_LENGTH = ComputeShaderConstants.BONE_COUNT; | ||
| private static readonly int BONES_PER_AVATAR_LENGTH = AVATAR_ARRAY_SIZE * BONES_ARRAY_LENGTH; | ||
|
|
||
| internal NativeArray<Matrix4x4> matrixFromAllAvatars; | ||
| private Matrix4x4* matrixPtr; | ||
|
|
||
| internal NativeArray<bool> updateAvatar; | ||
| private bool* updateAvatarPtr; | ||
|
|
||
| private TransformAccessArray bonesCombined; | ||
| public BoneMatrixCalculationJob job; | ||
|
|
||
| private JobHandle handle; | ||
|
|
||
| private readonly Stack<int> releasedIndexes; | ||
|
|
||
| private int avatarIndex; | ||
| private int nextResizeValue; | ||
| internal int currentAvatarAmountSupported; | ||
|
|
||
| public AvatarTransformMatrixJobWrapper() | ||
| { | ||
| job = new BoneMatrixCalculationJob(BONES_ARRAY_LENGTH, BONES_PER_AVATAR_LENGTH); | ||
|
|
||
| bonesCombined = new TransformAccessArray(BONES_PER_AVATAR_LENGTH); | ||
| for (int i = 0; i < BONES_PER_AVATAR_LENGTH; i++) | ||
| bonesCombined.Add(null); | ||
|
|
||
| matrixFromAllAvatars | ||
| = new NativeArray<Matrix4x4>(AVATAR_ARRAY_SIZE, Allocator.Persistent); | ||
| matrixPtr = (Matrix4x4*)matrixFromAllAvatars.GetUnsafePtr(); | ||
|
|
||
| updateAvatar = new NativeArray<bool>(AVATAR_ARRAY_SIZE, Allocator.Persistent); | ||
| updateAvatarPtr = (bool*)updateAvatar.GetUnsafePtr(); | ||
|
|
||
| currentAvatarAmountSupported = AVATAR_ARRAY_SIZE; | ||
|
|
||
| nextResizeValue = 2; | ||
| releasedIndexes = new Stack<int>(); | ||
| } | ||
|
|
||
|
|
||
| public void ScheduleBoneMatrixCalculation() | ||
| { | ||
| job.AvatarTransform = matrixFromAllAvatars; | ||
| job.UpdateAvatar = updateAvatar; | ||
| handle = job.Schedule(bonesCombined); | ||
| } | ||
|
|
||
| public void CompleteBoneMatrixCalculations() | ||
| { | ||
| handle.Complete(); | ||
| } | ||
|
|
||
| public void UpdateAvatar(AvatarBase avatarBase, ref AvatarTransformMatrixComponent transformMatrixComponent) | ||
| { | ||
| if (transformMatrixComponent.IndexInGlobalJobArray == -1) | ||
| { | ||
| if (releasedIndexes.Count > 0) | ||
| transformMatrixComponent.IndexInGlobalJobArray = releasedIndexes.Pop(); | ||
| else | ||
| { | ||
| transformMatrixComponent.IndexInGlobalJobArray = avatarIndex; | ||
| avatarIndex++; | ||
| } | ||
|
|
||
| //Add all bones to the bonesCombined array with the current available index | ||
| for (int i = 0; i < BONES_ARRAY_LENGTH; i++) | ||
| bonesCombined[transformMatrixComponent.IndexInGlobalJobArray * BONES_ARRAY_LENGTH + i] = | ||
| transformMatrixComponent.bones[i]; | ||
| } | ||
|
|
||
| //Setup of data | ||
| matrixPtr[transformMatrixComponent.IndexInGlobalJobArray] = avatarBase.transform.worldToLocalMatrix; | ||
| updateAvatarPtr[transformMatrixComponent.IndexInGlobalJobArray] = true; | ||
|
|
||
| if (avatarIndex >= currentAvatarAmountSupported - 1) | ||
| ResizeArrays(); | ||
| } | ||
|
|
||
| private void ResizeArrays() | ||
| { | ||
| var newBonesCombined | ||
| = new TransformAccessArray(BONES_PER_AVATAR_LENGTH * nextResizeValue); | ||
| for (var i = 0; i < BONES_PER_AVATAR_LENGTH * nextResizeValue; i++) | ||
| { | ||
| if (i < BONES_PER_AVATAR_LENGTH * (nextResizeValue - 1)) | ||
| newBonesCombined.Add(bonesCombined[i]); | ||
| else | ||
| newBonesCombined.Add(null); | ||
| } | ||
|
|
||
| bonesCombined.Dispose(); | ||
| bonesCombined = newBonesCombined; | ||
|
|
||
| var newMatrixFromAllAvatars | ||
| = new NativeArray<Matrix4x4>(AVATAR_ARRAY_SIZE * nextResizeValue, Allocator.Persistent); | ||
| UnsafeUtility.MemCpy(newMatrixFromAllAvatars.GetUnsafePtr(), matrixFromAllAvatars.GetUnsafePtr(), | ||
| matrixFromAllAvatars.Length * sizeof(Matrix4x4)); | ||
| matrixFromAllAvatars.Dispose(); | ||
| matrixFromAllAvatars = newMatrixFromAllAvatars; | ||
| matrixPtr = (Matrix4x4*)matrixFromAllAvatars.GetUnsafePtr(); | ||
|
|
||
| var newUpdateAvatar | ||
| = new NativeArray<bool>(AVATAR_ARRAY_SIZE * nextResizeValue, Allocator.Persistent); | ||
| UnsafeUtility.MemCpy(newUpdateAvatar.GetUnsafePtr(), updateAvatar.GetUnsafePtr(), | ||
| updateAvatar.Length * sizeof(bool)); | ||
| updateAvatar.Dispose(); | ||
| updateAvatar = newUpdateAvatar; | ||
| updateAvatarPtr = (bool*)updateAvatar.GetUnsafePtr(); | ||
|
|
||
| job.BonesMatricesResult.Dispose(); | ||
| job = new BoneMatrixCalculationJob(BONES_ARRAY_LENGTH, BONES_PER_AVATAR_LENGTH * nextResizeValue); | ||
|
|
||
| currentAvatarAmountSupported = AVATAR_ARRAY_SIZE * nextResizeValue; | ||
| nextResizeValue++; | ||
| } | ||
|
|
||
| public void Dispose() | ||
| { | ||
| handle.Complete(); | ||
| bonesCombined.Dispose(); | ||
| updateAvatar.Dispose(); | ||
| job.BonesMatricesResult.Dispose(); | ||
| } | ||
|
|
||
| public void ReleaseAvatar(ref AvatarTransformMatrixComponent avatarTransformMatrixComponent) | ||
| { | ||
| if (avatarTransformMatrixComponent.IndexInGlobalJobArray == -1) | ||
| return; | ||
|
|
||
| //Dont update this index anymore until reset | ||
| updateAvatarPtr[avatarTransformMatrixComponent.IndexInGlobalJobArray] = false; | ||
| releasedIndexes.Push(avatarTransformMatrixComponent.IndexInGlobalJobArray); | ||
|
|
||
| avatarTransformMatrixComponent.IndexInGlobalJobArray = -1; | ||
| } | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
...Assets/DCL/AvatarRendering/AvatarShape/Components/AvatarTransformMatrixJobWrapper.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.