Merge branch 'develop'

This commit is contained in:
max 2021-01-25 21:43:13 +01:00
commit 47e33e34a2
3 changed files with 1072 additions and 80 deletions

View File

@ -8,6 +8,7 @@ namespace TAO.VertexAnimation
public class VA_AnimationLibraryComponentAuthoring : UnityEngine.MonoBehaviour
{
public VA_AnimationLibrary animationLibrary;
public bool debugMode = false;
}
public class VA_AnimationLibraryConversionSystem : GameObjectConversionSystem
@ -34,8 +35,12 @@ namespace TAO.VertexAnimation
{
// Copy data.
animationDataArray[i] = animationLib.animationLibrary.animationData[i];
if (animationLib.debugMode)
{
UnityEngine.Debug.Log("VA_AnimationLibrary added " + animationDataArray[i].name.ToString());
}
}
// Construct blob asset reference.
//BlobAssetReference<VA_AnimationLibraryData> animLibAssetRef = blobBuilder.CreateBlobAssetReference<VA_AnimationLibraryData>(Allocator.Persistent);
@ -45,8 +50,11 @@ namespace TAO.VertexAnimation
// Add it to the asset store.
BlobAssetStore.TryAdd(new Hash128(VA_AnimationLibraryUtils.AnimationLibraryAssetStoreName), animLibAssetRef);
if (animationLib.debugMode)
{
UnityEngine.Debug.Log("VA_AnimationLibrary has " + animLibAssetRef.Value.animations.Length.ToString() + " animations.");
}
}
// Remove the entity since we don't need it anymore.
DstEntityManager.DestroyEntity(GetPrimaryEntity(animationLib));

View File

@ -34,6 +34,7 @@ namespace TAO.VertexAnimation
}
})
.WithNativeDisableContainerSafetyRestriction(animationData)
.WithName("VA_AnimatorSystem")
.ScheduleParallel();
}
}

File diff suppressed because it is too large Load Diff