max/VertexAnimation
1
0
Fork 0
mirror of https://github.com/maxartz15/VertexAnimation.git synced 2024-09-19 20:55:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs
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,8 +35,12 @@ namespace TAO.VertexAnimation
{ {
// Copy data. // Copy data.
animationDataArray[i] = animationLib.animationLibrary.animationData[i]; animationDataArray[i] = animationLib.animationLibrary.animationData[i];
if (animationLib.debugMode)
{
UnityEngine.Debug.Log("VA_AnimationLibrary added " + animationDataArray[i].name.ToString()); UnityEngine.Debug.Log("VA_AnimationLibrary added " + animationDataArray[i].name.ToString());
} }
}
// Construct blob asset reference. // Construct blob asset reference.
//BlobAssetReference<VA_AnimationLibraryData> animLibAssetRef = blobBuilder.CreateBlobAssetReference<VA_AnimationLibraryData>(Allocator.Persistent); //BlobAssetReference<VA_AnimationLibraryData> animLibAssetRef = blobBuilder.CreateBlobAssetReference<VA_AnimationLibraryData>(Allocator.Persistent);
@ -45,8 +50,11 @@ 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);
if (animationLib.debugMode)
{
UnityEngine.Debug.Log("VA_AnimationLibrary has " + animLibAssetRef.Value.animations.Length.ToString() + " animations."); 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.
DstEntityManager.DestroyEntity(GetPrimaryEntity(animationLib)); DstEntityManager.DestroyEntity(GetPrimaryEntity(animationLib));

1
Runtime/Scripts/VA_AnimatorSystem.cs
View File

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

1139
Runtime/Shaders/Graphs/Lit.ShaderGraph
View File

File diff suppressed because it is too large Load Diff