talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Scripted Animations to provide an option for which clock to use

Browse Source
This commit is contained in:
jyelon
2025-10-27 18:18:35 -04:00
parent 0a3a7b9a62
commit 297cd2f068
6 changed files with 169 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Integration/Tangible.cpp
View File

@@ -123,7 +123,8 @@ void UlxTangible::MaybeExecuteAnimStateChanged() {
bool AnyChange = AnimTracker.IsChanged();
while (AnimTracker.IsChanged()) {
while (AnimTracker.IsChanged())
{
if (limit == 0) break;
limit -= 1;
AnimTracker.ClearChanged();
@@ -164,11 +165,22 @@ void UlxTangible::MaybeExecuteAnimStateChanged() {
FString DS = UlxAnimationStepLibrary::AnimationStepDebugString(*Step);
UE_LOG(LogLuprex, Warning, TEXT("Timeout - blueprint didn't finish animation: %s"), *DS);
AnimTracker.FinishedAnimation(PendingAnimationHash);
AnyChange = true;
}
AutoUpdatePosition();
PendingAnimationHash = 0;
PendingAnimationTimeout = 0.0;
}
// The following code garbage collects any scripted animations that
// were created by animation steps that are no longer in the animation
// queue. This is intended to handle the case that predictive reexecution
// incorrectly predicts an animation step, and then the animation step
// goes away during of difference transmission.
if (AnyChange && (ScriptedAnimations != nullptr))
{
ScriptedAnimations->FadeGarbage(this, AnimTracker.GetHashes());
}
}
FVector UlxTangible::GetLocation() const
@@ -233,7 +245,8 @@ void UlxTangible::AutoUpdatePosition()
}
}
void UlxTangible::FinishedAnimation(AActor *target, const FlxAnimationStep &step, bool AutoUpdate) {
void UlxTangible::FinishedAnimation(AActor *target, const FlxAnimationStep &step, bool AutoUpdate)
{
UlxTangible *tan = GetActorTangibleOrLog(target);
if (tan == nullptr) return;
tan->AnimTracker.FinishedAnimation(step.Hash);
@@ -242,7 +255,8 @@ void UlxTangible::FinishedAnimation(AActor *target, const FlxAnimationStep &step
UE_LOG(LogLuprex, Display, TEXT("Animation Finished: %s"), *DebugString);
}
bool UlxTangible::AnimationStepIsFinished(AActor *target, const FlxAnimationStep &step) {
bool UlxTangible::AnimationStepIsFinished(AActor *target, const FlxAnimationStep &step)
{
UlxTangible *tan = GetActorTangibleOrLog(target);
if (tan == nullptr) return true;
return tan->AnimTracker.IsFinished(step.Hash);