From 270c4cf55bb9d85dcc6d38c757744804b2e31d50 Mon Sep 17 00:00:00 2001 From: AbstractConcept Date: Mon, 31 Oct 2022 21:19:52 -0500 Subject: [PATCH] Bug fixes - Fixed issue where animation would not evaluate the clip percentage correctly - Fixed pawn race selection drop down not updating - Fixed issue that was stopping animations with floating points in integer fields from loading --- .vs/RimWorld-Animation-Studio/v16/.suo | Bin 780800 -> 755712 bytes .../AnimationComponents/PawnAnimationClip.cs | 12 +- .../AnimationComponents/PawnKeyframe.cs | 17 +- Assets/Scripts/Data/ActorPosition.cs | 3 +- Assets/Scripts/GUI/Cards/ActorCard.cs | 5 +- .../GUI/DialogBoxes/RaceSettingsDialog.cs | 2 +- .../GUI/DialogBoxes/SelectDefNamesDialog.cs | 8 +- Assets/Scripts/Managers/ApplicationManager.cs | 13 +- .../Managed/Assembly-CSharp.dll | Bin 158208 -> 157696 bytes .../Managed/Unity.2D.Animation.Runtime.dll | Bin 33792 -> 33792 bytes .../Unity.2D.Animation.Triangle.Runtime.dll | Bin 187392 -> 187392 bytes .../Managed/Unity.2D.Common.Runtime.dll | Bin 3584 -> 3584 bytes .../Managed/Unity.2D.PixelPerfect.dll | Bin 11264 -> 11264 bytes .../Managed/Unity.2D.SpriteShape.Runtime.dll | Bin 87552 -> 87552 bytes .../Unity.InternalAPIEngineBridge.001.dll | Bin 4096 -> 4096 bytes .../Managed/Unity.Mathematics.dll | Bin 710144 -> 710144 bytes .../Managed/Unity.TextMeshPro.dll | Bin 368128 -> 368128 bytes .../Managed/Unity.Timeline.dll | Bin 109056 -> 109056 bytes .../Managed/UnityEngine.UI.dll | Bin 226304 -> 226304 bytes .../globalgamemanagers | Bin 99052 -> 99052 bytes .../sharedassets0.assets | Bin 369616 -> 369616 bytes Library/ArtifactDB | Bin 33554432 -> 33554432 bytes .../00/00937c9daa109bbe1c48c56409562e45 | Bin 0 -> 5908 bytes .../06/069d023e64bb304f732f25868e3ff33e | Bin 0 -> 5156 bytes .../07/078861858ad05691fac8607fecc37fa6 | Bin 0 -> 5088 bytes .../07/07d6adfff864b621fbf83a1da47ec255 | Bin 0 -> 7260 bytes .../09/09f9b57fc44aa5c03954fb34245cca64 | Bin 10488 -> 0 bytes .../11/11aea3de9de3f18a286b87c2f5a056ea | Bin 0 -> 10096 bytes .../1299e964b2eae0a00deeee3b950210ab} | Bin 6172 -> 7064 bytes .../1635ba85ea1a580fccb16e4e72d63c5f} | Bin 6160 -> 5440 bytes .../16/16412e1c480c72b0c392f0b596cf92e9 | Bin 0 -> 5528 bytes .../18/1897a7fc5adefba5a2d823476eabe59a | Bin 0 -> 5964 bytes .../1c/1c7e244103d6958ab67d3e68943ab615 | Bin 289720 -> 0 bytes .../25/258bd509301d9a7d226d7d17aee25cc7 | Bin 4233 -> 0 bytes .../270209afd95560ae7388cff58fc6c698} | Bin 5328 -> 4800 bytes .../28/285d4cbe293aaa3002f2b1ab6be919f6 | Bin 1076700 -> 0 bytes .../30/3018d3b073868bbf6841aa424d9c6c41 | Bin 0 -> 5356 bytes .../32/32f97340ee38122674003bfe08898ca4 | Bin 0 -> 5044 bytes .../42/425d4b4b2938b09e4d08956dead97015 | Bin 0 -> 7084 bytes .../44/44b20fa25681567a29e6a4b5c3974bfc | Bin 0 -> 14424 bytes .../450e967ce48e1b8eb49dbd99a5f6164a} | Bin 4632 -> 4508 bytes .../4f/4fd05a8e109f36b7dda11acf91f0ca02 | Bin 0 -> 9740 bytes .../54/54840e493e0e8f886463dad6a304e0eb | Bin 0 -> 9636 bytes .../5b/5b07add66b3897ab4782fe20fefea463 | Bin 10716 -> 0 bytes .../62/6270d146ccdd2ad803ba51e4ebed4f1a | Bin 0 -> 4964 bytes .../6c/6cbf020bc74cc652c43e9bbcbafeb524 | Bin 0 -> 7080 bytes .../70/7066b02ffa42e51b0cd7cf9efc4cb957 | Bin 0 -> 14344 bytes .../71/713b84a76bf89c32a1a73ae4a9f7f32b | Bin 289720 -> 0 bytes .../74/744a6e9670851afd25a8c5e140b69f5d | Bin 0 -> 10224 bytes .../76/761bf5e8959beee0096f9ae91ea9e68d | Bin 0 -> 7100 bytes .../7a/7a400fc2d12f9290fea596c62c1b9781 | Bin 289724 -> 0 bytes .../7b/7ba609933a8a540647bf7beb44934bfe | Bin 0 -> 5820 bytes .../8f/8f0a8cdff0a6262f8f66cdedb3bace03 | Bin 289720 -> 0 bytes .../90/9062c2d07b6c3098778a698953bc28db | Bin 0 -> 14432 bytes .../9a/9ab1834b20d7db4d9e2781aec3840de2 | Bin 0 -> 14360 bytes .../9c/9cfc03760914c6dd43f082a14cc5ac1d | Bin 0 -> 5916 bytes .../a8/a879be1f2a3688bfee6e1a09e7ad160c | Bin 0 -> 10076 bytes .../ad/addf79cb03cb977759a56fdc08498fe8 | Bin 8644 -> 0 bytes .../b7/b776cfd76ddcf8ad14392af579e88c42 | Bin 0 -> 5772 bytes .../ba/ba5ba8fe468b33bca0b940716e6f298a | Bin 0 -> 9620 bytes .../bc/bcb2e364bb51f21ed53c01e106b66628 | Bin 0 -> 4512 bytes .../c2/c2cd340cb8a74197aed70ba681537da4 | Bin 0 -> 14448 bytes .../c2f7ce6ea81a82d8020257a0802e1a99} | Bin 6656 -> 6644 bytes .../c550d8b73fd4b2a18cc1617b5c4422f2} | Bin 6032 -> 6120 bytes .../cb/cb8dfe3439823354dc2b8d94f6ff6431 | Bin 0 -> 7240 bytes .../cd4d8cdec10e71b23092c0721be51c07} | Bin 6172 -> 6508 bytes .../d3/d3397799e24bb3d2f155bcf66dedb705 | Bin 6160 -> 0 bytes .../dc/dcfefd573ca5d474fa6e0adcf470e5ea | Bin 0 -> 5068 bytes .../e3/e3dd332c9c06fe47df23a4e95d4de29a | Bin 0 -> 13080 bytes .../e4/e41502dfcaaf9de4bfcf0ab513d1062a | Bin 0 -> 5016 bytes .../e5/e5d930d5fbaeecf2ca2a585ff7191df7 | Bin 6192 -> 0 bytes .../e9/e9626492dd101678fb47b780d991ac9f | Bin 0 -> 14344 bytes .../f1f7b17c649a56602034395f4877b37a} | Bin 20096 -> 20008 bytes .../f29d6579530ca0b41d03936ea2fde905} | Bin 7788 -> 8032 bytes .../f7/f7d4709d109e62cefab94d2ebcec0c7c | Bin 0 -> 10072 bytes .../f9/f906c1d02e00dd085f215dc96dccf4a6 | Bin 0 -> 12884 bytes .../fa/fa1deb6776ca8da0ef79c43a8115cad3 | Bin 0 -> 5876 bytes .../fb6e3d56f908866a575130f18663b6bf} | Bin 6160 -> 6116 bytes .../ff/ffed5ddb74875b34580350401fc275f6 | Bin 0 -> 9664 bytes Library/CurrentLayout-default.dwlt | 56 +++--- Library/CurrentMaximizeLayout.dwlt | 38 ++-- Library/LastBuild.buildreport | Bin 202372 -> 202376 bytes .../Win/Data/Managed/Assembly-CSharp.dll | Bin 158208 -> 157696 bytes .../Managed/Unity.2D.Animation.Runtime.dll | Bin 33792 -> 33792 bytes .../Unity.2D.Animation.Triangle.Runtime.dll | Bin 187392 -> 187392 bytes .../Data/Managed/Unity.2D.Common.Runtime.dll | Bin 3584 -> 3584 bytes .../Data/Managed/Unity.2D.PixelPerfect.dll | Bin 11264 -> 11264 bytes .../Managed/Unity.2D.SpriteShape.Runtime.dll | Bin 87552 -> 87552 bytes .../Unity.InternalAPIEngineBridge.001.dll | Bin 4096 -> 4096 bytes .../Win/Data/Managed/Unity.Mathematics.dll | Bin 710144 -> 710144 bytes .../Win/Data/Managed/Unity.TextMeshPro.dll | Bin 368128 -> 368128 bytes .../Win/Data/Managed/Unity.Timeline.dll | Bin 109056 -> 109056 bytes .../Win/Data/Managed/UnityEngine.UI.dll | Bin 226304 -> 226304 bytes .../Win/Data/globalgamemanagers | Bin 99052 -> 99052 bytes .../Win/Data/sharedassets0.assets | Bin 369616 -> 369616 bytes .../PlayerDataCache/Win/ScriptsOnlyCache.yaml | 170 +++++++++--------- .../Assembly-CSharp-Editor.dll | Bin 8704 -> 8704 bytes Library/ScriptAssemblies/Assembly-CSharp.dll | Bin 174592 -> 174592 bytes Library/ScriptAssemblies/Assembly-CSharp.pdb | Bin 87372 -> 87248 bytes Library/SourceAssetDB | Bin 4194304 -> 4194304 bytes ...hadercompiler-UnityShaderCompiler.exe2.log | 2 + ...hadercompiler-UnityShaderCompiler.exe4.log | 2 - ...hadercompiler-UnityShaderCompiler.exe6.log | 2 + ...hadercompiler-UnityShaderCompiler.exe8.log | 2 + ...embly-CSharp.csprojAssemblyReference.cache | Bin 17953 -> 202096 bytes 105 files changed, 166 insertions(+), 166 deletions(-) create mode 100644 Library/Artifacts/00/00937c9daa109bbe1c48c56409562e45 create mode 100644 Library/Artifacts/06/069d023e64bb304f732f25868e3ff33e create mode 100644 Library/Artifacts/07/078861858ad05691fac8607fecc37fa6 create mode 100644 Library/Artifacts/07/07d6adfff864b621fbf83a1da47ec255 delete mode 100644 Library/Artifacts/09/09f9b57fc44aa5c03954fb34245cca64 create mode 100644 Library/Artifacts/11/11aea3de9de3f18a286b87c2f5a056ea rename Library/Artifacts/{24/24e6b1a4e2d365b89d44fa4938afc40d => 12/1299e964b2eae0a00deeee3b950210ab} (61%) rename Library/Artifacts/{26/2628c100aa87c90017df1f4abda6cb5a => 16/1635ba85ea1a580fccb16e4e72d63c5f} (70%) create mode 100644 Library/Artifacts/16/16412e1c480c72b0c392f0b596cf92e9 create mode 100644 Library/Artifacts/18/1897a7fc5adefba5a2d823476eabe59a delete mode 100644 Library/Artifacts/1c/1c7e244103d6958ab67d3e68943ab615 delete mode 100644 Library/Artifacts/25/258bd509301d9a7d226d7d17aee25cc7 rename Library/Artifacts/{b8/b858c50f4e28f1f75704f68745209c53 => 27/270209afd95560ae7388cff58fc6c698} (80%) delete mode 100644 Library/Artifacts/28/285d4cbe293aaa3002f2b1ab6be919f6 create mode 100644 Library/Artifacts/30/3018d3b073868bbf6841aa424d9c6c41 create mode 100644 Library/Artifacts/32/32f97340ee38122674003bfe08898ca4 create mode 100644 Library/Artifacts/42/425d4b4b2938b09e4d08956dead97015 create mode 100644 Library/Artifacts/44/44b20fa25681567a29e6a4b5c3974bfc rename Library/Artifacts/{ca/cabe3fe8cef1b1fe0ddd474be22baaad => 45/450e967ce48e1b8eb49dbd99a5f6164a} (90%) create mode 100644 Library/Artifacts/4f/4fd05a8e109f36b7dda11acf91f0ca02 create mode 100644 Library/Artifacts/54/54840e493e0e8f886463dad6a304e0eb delete mode 100644 Library/Artifacts/5b/5b07add66b3897ab4782fe20fefea463 create mode 100644 Library/Artifacts/62/6270d146ccdd2ad803ba51e4ebed4f1a create mode 100644 Library/Artifacts/6c/6cbf020bc74cc652c43e9bbcbafeb524 create mode 100644 Library/Artifacts/70/7066b02ffa42e51b0cd7cf9efc4cb957 delete mode 100644 Library/Artifacts/71/713b84a76bf89c32a1a73ae4a9f7f32b create mode 100644 Library/Artifacts/74/744a6e9670851afd25a8c5e140b69f5d create mode 100644 Library/Artifacts/76/761bf5e8959beee0096f9ae91ea9e68d delete mode 100644 Library/Artifacts/7a/7a400fc2d12f9290fea596c62c1b9781 create mode 100644 Library/Artifacts/7b/7ba609933a8a540647bf7beb44934bfe delete mode 100644 Library/Artifacts/8f/8f0a8cdff0a6262f8f66cdedb3bace03 create mode 100644 Library/Artifacts/90/9062c2d07b6c3098778a698953bc28db create mode 100644 Library/Artifacts/9a/9ab1834b20d7db4d9e2781aec3840de2 create mode 100644 Library/Artifacts/9c/9cfc03760914c6dd43f082a14cc5ac1d create mode 100644 Library/Artifacts/a8/a879be1f2a3688bfee6e1a09e7ad160c delete mode 100644 Library/Artifacts/ad/addf79cb03cb977759a56fdc08498fe8 create mode 100644 Library/Artifacts/b7/b776cfd76ddcf8ad14392af579e88c42 create mode 100644 Library/Artifacts/ba/ba5ba8fe468b33bca0b940716e6f298a create mode 100644 Library/Artifacts/bc/bcb2e364bb51f21ed53c01e106b66628 create mode 100644 Library/Artifacts/c2/c2cd340cb8a74197aed70ba681537da4 rename Library/Artifacts/{0a/0a090a3e37c7f23c47fdba0df89659a4 => c2/c2f7ce6ea81a82d8020257a0802e1a99} (66%) rename Library/Artifacts/{c4/c49a1d5dc78a21c4bee8304f3a51f093 => c5/c550d8b73fd4b2a18cc1617b5c4422f2} (74%) create mode 100644 Library/Artifacts/cb/cb8dfe3439823354dc2b8d94f6ff6431 rename Library/Artifacts/{7a/7af54909ff81aa00969e0d8cfe2d4668 => cd/cd4d8cdec10e71b23092c0721be51c07} (66%) delete mode 100644 Library/Artifacts/d3/d3397799e24bb3d2f155bcf66dedb705 create mode 100644 Library/Artifacts/dc/dcfefd573ca5d474fa6e0adcf470e5ea create mode 100644 Library/Artifacts/e3/e3dd332c9c06fe47df23a4e95d4de29a create mode 100644 Library/Artifacts/e4/e41502dfcaaf9de4bfcf0ab513d1062a delete mode 100644 Library/Artifacts/e5/e5d930d5fbaeecf2ca2a585ff7191df7 create mode 100644 Library/Artifacts/e9/e9626492dd101678fb47b780d991ac9f rename Library/Artifacts/{ee/ee627aa4d723ec97d729e7d735da8e40 => f1/f1f7b17c649a56602034395f4877b37a} (95%) rename Library/Artifacts/{cd/cd609848ea74ba20797b03b5e17a67e7 => f2/f29d6579530ca0b41d03936ea2fde905} (54%) create mode 100644 Library/Artifacts/f7/f7d4709d109e62cefab94d2ebcec0c7c create mode 100644 Library/Artifacts/f9/f906c1d02e00dd085f215dc96dccf4a6 create mode 100644 Library/Artifacts/fa/fa1deb6776ca8da0ef79c43a8115cad3 rename Library/Artifacts/{83/83c803b7e99ab0aa4424432de3fd329c => fb/fb6e3d56f908866a575130f18663b6bf} (70%) create mode 100644 Library/Artifacts/ff/ffed5ddb74875b34580350401fc275f6 diff --git a/.vs/RimWorld-Animation-Studio/v16/.suo b/.vs/RimWorld-Animation-Studio/v16/.suo index e9a35aa804b42d9d8738e72b4cdc50744caf50f7..85ae282c3c625828edd73dcfd2a87f31c209f147 100644 GIT binary patch delta 12990 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 delta 15591 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 F{{fN(Hkkkb diff --git a/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs b/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs index d17c7647..587e3838 100644 --- a/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs +++ b/Assets/Scripts/AnimationComponents/PawnAnimationClip.cs @@ -96,11 +96,11 @@ namespace RimWorldAnimationStudio { PawnKeyframe keyframe = Keyframes[i]; + if (keyframe.HasValidKeyframeID() == false) + { keyframe.GenerateKeyframeID(GetOwningActorID()); } + if (keyframe.atTick.HasValue) { - if (keyframe.HasValidKeyframeID() == false) - { keyframe.GenerateKeyframeID(Workspace.animationDef.AnimationStages[Workspace.StageID].AnimationClips.IndexOf(this)); } - BodyAngle.Add((float)keyframe.atTick / (float)duration, keyframe.BodyAngle, true); HeadAngle.Add((float)keyframe.atTick / (float)duration, keyframe.HeadAngle, true); BodyOffsetX.Add((float)keyframe.atTick / (float)duration, keyframe.BodyOffsetX, true); @@ -343,12 +343,8 @@ namespace RimWorldAnimationStudio public void OnPostLoad() { - Addons = addons.Copy(); - foreach (PawnKeyframe keyframe in Keyframes) - { - keyframe.OnPostLoad(); - } + { keyframe.OnPostLoad(); } } } } diff --git a/Assets/Scripts/AnimationComponents/PawnKeyframe.cs b/Assets/Scripts/AnimationComponents/PawnKeyframe.cs index ef2c64ea..fc052bf1 100644 --- a/Assets/Scripts/AnimationComponents/PawnKeyframe.cs +++ b/Assets/Scripts/AnimationComponents/PawnKeyframe.cs @@ -16,8 +16,8 @@ namespace RimWorldAnimationStudio public float? headBob; public float? bodyOffsetX; public float? bodyOffsetZ; - public int? headFacing; - public int? bodyFacing; + public float? headFacing; + public float? bodyFacing; public float? genitalAngle; public bool? quiver; public int? tickDuration; @@ -69,14 +69,14 @@ namespace RimWorldAnimationStudio [XmlIgnore] public int HeadFacing { - get { return headFacing.HasValue ? headFacing.Value : (int)(headFacing = 2); } - set { headFacing = value; } + get { return headFacing.HasValue ? (int)headFacing.Value : (int)(headFacing = 2); } + set { headFacing = (int)value; } } [XmlIgnore] public int BodyFacing { - get { return bodyFacing.HasValue ? bodyFacing.Value : (int)(bodyFacing = 2); } - set { bodyFacing = value; } + get { return bodyFacing.HasValue ? (int)bodyFacing.Value : (int)(bodyFacing = 2); } + set { bodyFacing = (int)value; } } [XmlIgnore] public float GenitalAngle @@ -227,12 +227,7 @@ namespace RimWorldAnimationStudio public void OnPostLoad() { - AddonKeyframes.Clear(); - foreach (AddonKeyframe addonKeyframe in addonKeyframes) - { - AddonKeyframes.Add(addonKeyframe.Copy()); - } } } } diff --git a/Assets/Scripts/Data/ActorPosition.cs b/Assets/Scripts/Data/ActorPosition.cs index 7f86b12f..9e8be354 100644 --- a/Assets/Scripts/Data/ActorPosition.cs +++ b/Assets/Scripts/Data/ActorPosition.cs @@ -21,10 +21,9 @@ namespace RimWorldAnimationStudio public ActorPosition(int actorID, int atTick) { - Actor actor = Workspace.GetActor(actorID); PawnAnimationClip clip = Workspace.GetPawnAnimationClip(actorID); - float clipPercent = atTick / Workspace.StageWindowSize; + float clipPercent = (float)atTick / Workspace.StageWindowSize; if (atTick > Constants.minTick && atTick == clip.duration) clipPercent = 1f; if (Workspace.GetCurrentAnimationStage().IsLooping == false) diff --git a/Assets/Scripts/GUI/Cards/ActorCard.cs b/Assets/Scripts/GUI/Cards/ActorCard.cs index 9ec1a120..3573fe66 100644 --- a/Assets/Scripts/GUI/Cards/ActorCard.cs +++ b/Assets/Scripts/GUI/Cards/ActorCard.cs @@ -89,14 +89,17 @@ namespace RimWorldAnimationStudio public void UpdateRaceDropdown() { - raceDropdown.ClearOptions(); int index = raceDropdown.value; + raceDropdown.ClearOptions(); IEnumerable optionsList = DefaultTags.defNames.Concat(CustomTags.defNames); foreach (string defName in optionsList) { raceDropdown.options.Add(new Dropdown.OptionData(defName)); } raceDropdown.value = Mathf.Clamp(index, 0, raceDropdown.options.Count - 1); + raceDropdown.captionText.text = raceDropdown.options[raceDropdown.value].text; + + UpdateGUI(); } public void UpdateGUI() diff --git a/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs b/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs index b3c92abf..9561bf8e 100644 --- a/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs +++ b/Assets/Scripts/GUI/DialogBoxes/RaceSettingsDialog.cs @@ -20,7 +20,7 @@ namespace RimWorldAnimationStudio protected override void OnEnable() { raceSelectDropdown.ClearOptions(); - raceSelectDropdown.AddOptions(PawnRaceDefs.allDefs.Select(x => x.defName).ToList()); + raceSelectDropdown.AddOptions(DefaultTags.defNames.Concat(CustomTags.defNames).ToList()); base.OnEnable(); } diff --git a/Assets/Scripts/GUI/DialogBoxes/SelectDefNamesDialog.cs b/Assets/Scripts/GUI/DialogBoxes/SelectDefNamesDialog.cs index ebcf5a50..35893b26 100644 --- a/Assets/Scripts/GUI/DialogBoxes/SelectDefNamesDialog.cs +++ b/Assets/Scripts/GUI/DialogBoxes/SelectDefNamesDialog.cs @@ -43,7 +43,10 @@ namespace RimWorldAnimationStudio { Button deleteButton = _optionToggle.Find("DeleteButton").GetComponent