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

View File

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

File diff suppressed because it is too large Load Diff