From 3e69eb9d84a52e4c568c8c6214ecaae17f8d318c Mon Sep 17 00:00:00 2001 From: max Date: Tue, 19 Jan 2021 15:23:52 +0100 Subject: [PATCH] Tmp Fix FixedString32 being zero at runtime. Tmp Fix FixedString32 being zero at runtime. --- Runtime/Scripts/VA_Animation.cs | 26 +++++++------------ Runtime/Scripts/VA_AnimationLibrary.cs | 4 ++- .../VA_AnimationLibraryComponentAuthoring.cs | 1 + 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Runtime/Scripts/VA_Animation.cs b/Runtime/Scripts/VA_Animation.cs index c5e3a99..68d8c4a 100644 --- a/Runtime/Scripts/VA_Animation.cs +++ b/Runtime/Scripts/VA_Animation.cs @@ -5,32 +5,24 @@ namespace TAO.VertexAnimation { public class VA_Animation : ScriptableObject { - public VA_Animation(int a_maxFrames, int a_frames, int a_fps, int a_positionMapIndex, int a_colorMapIndex = -1) - { - Data = new VA_AnimationData(this.name, a_frames, a_maxFrames, a_fps, a_positionMapIndex, a_colorMapIndex); - } - - public VA_Animation(VA_AnimationData a_data) - { - this.name = a_data.name.ToString(); - Data = a_data; - } - - public VA_AnimationData Data - { - get; private set; - } + public VA_AnimationData Data; // data.name will be overwritten by this.name. public void SetData(VA_AnimationData a_data) { - a_data.name = this.name; Data = a_data; } + public VA_AnimationData GetData() + { + // TODO: Fix data name, FixedString32 doesn't transfer from editor? + Data.name = new FixedString32(name); + return Data; + } + public FixedString32 GetName() { - return Data.name; + return new FixedString32(this.name); } } } \ No newline at end of file diff --git a/Runtime/Scripts/VA_AnimationLibrary.cs b/Runtime/Scripts/VA_AnimationLibrary.cs index 2729230..48d2278 100644 --- a/Runtime/Scripts/VA_AnimationLibrary.cs +++ b/Runtime/Scripts/VA_AnimationLibrary.cs @@ -30,7 +30,9 @@ namespace TAO.VertexAnimation { foreach (VA_Animation animation in book.animations) { - animationData.Add(animation.Data); + // TODO: Fix data name, FixedString32 doesn't transfer from editor? + //animation.Data.name = new FixedString32(animation.name); + animationData.Add(animation.GetData()); } } } diff --git a/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs b/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs index 7a26052..48ee9e7 100644 --- a/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs +++ b/Runtime/Scripts/VA_AnimationLibraryComponentAuthoring.cs @@ -34,6 +34,7 @@ namespace TAO.VertexAnimation { // Copy data. animationDataArray[i] = animationLib.animationLibrary.animationData[i]; + UnityEngine.Debug.Log("VA_AnimationLibrary added " + animationDataArray[i].name.ToString()); } // Construct blob asset reference.