Merge branch 'development'

rive-app · Jun 25, 2024 · 9f24893 · 9f24893
2 parents 497bb3c + 55768ba
commit 9f24893
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 27 deletions.
diff --git a/Source/Rive/Private/Rive/RiveObject.cpp b/Source/Rive/Private/Rive/RiveObject.cpp
@@ -26,6 +26,7 @@ URiveObject::URiveObject()
 
 void URiveObject::BeginDestroy()
 {
+	OnRiveReady.Clear();
 	RiveRenderTarget.Reset();
 
 	if (IsValid(Artboard))

diff --git a/Source/Rive/Private/UMG/RiveWidget.cpp b/Source/Rive/Private/UMG/RiveWidget.cpp
@@ -54,14 +54,23 @@ void URiveWidget::ReleaseSlateResources(bool bReleaseChildren)
 TSharedRef<SWidget> URiveWidget::RebuildWidget()
 {
 	RiveWidget = SNew(SRiveWidget);
-	Setup();
-	return RiveWidget.ToSharedRef();
-}
+
+	if (!RiveObject && RiveWidget.IsValid())
+	{
+		RiveObject = NewObject<URiveObject>();
 
-void URiveWidget::NativeConstruct()
-{
-	Super::NativeConstruct();
-	Setup();
+#if WITH_EDITOR
+		TimerHandle.Invalidate();
+		GetWorld()->GetTimerManager().SetTimer(TimerHandle, [this]()
+		{
+			Setup();
+		}, 0.05f, false);
+#else
+		Setup();
+#endif
+	}
+
+	return RiveWidget.ToSharedRef();
 }
 
 void URiveWidget::SetAudioEngine(URiveAudioEngine* InAudioEngine)
@@ -85,28 +94,28 @@ URiveArtboard* URiveWidget::GetArtboard() const
 	return nullptr;
 }
 
+void URiveWidget::OnRiveObjectReady()
+{
+	if (!RiveWidget.IsValid() || !GetCachedWidget()) return;
+	RiveObject->OnRiveReady.Remove(FrameHandle);
+
+	UE::Slate::FDeprecateVector2DResult AbsoluteSize = GetCachedGeometry().GetAbsoluteSize();
+
+	RiveObject->ResizeRenderTargets(FIntPoint(AbsoluteSize.X, AbsoluteSize.Y));
+	RiveWidget->SetRiveTexture(RiveObject);
+	RiveWidget->RegisterArtboardInputs({RiveObject->GetArtboard()});
+	OnRiveReady.Broadcast();
+}
+
 void URiveWidget::Setup()
 {
-	if (!RiveObject && RiveWidget.IsValid())
+	if (!RiveObject || !RiveWidget.IsValid())
 	{
-		TimerHandle.Invalidate();
-		GetWorld()->GetTimerManager().SetTimer(TimerHandle, [this]()
-		{
-			RiveObject = NewObject<URiveObject>();
-			RiveObject->OnRiveReady.AddLambda([this]()
-			{
-				if (!RiveWidget.IsValid()) return;
-
-				UE::Slate::FDeprecateVector2DResult AbsoluteSize = GetCachedGeometry().GetAbsoluteSize();
-
-				RiveObject->ResizeRenderTargets(FIntPoint(AbsoluteSize.X, AbsoluteSize.Y));
-				RiveWidget->SetRiveTexture(RiveObject);
-				RiveWidget->RegisterArtboardInputs({RiveObject->GetArtboard()});
-				OnRiveReady.Broadcast();
-			});
-			RiveObject->Initialize(RiveDescriptor);
-		}, 0.05f, false);
+		return;
 	}
+
+	FrameHandle = RiveObject->OnRiveReady.AddUObject(this, &URiveWidget::OnRiveObjectReady);
+	RiveObject->Initialize(RiveDescriptor);
 }
 
 #undef LOCTEXT_NAMESPACE
diff --git a/Source/Rive/Public/UMG/RiveWidget.h b/Source/Rive/Public/UMG/RiveWidget.h
@@ -42,8 +42,6 @@ class RIVE_API URiveWidget : public UUserWidget
 
     virtual TSharedRef<SWidget> RebuildWidget() override;
 
-    virtual void NativeConstruct() override;
-
     //~ END : UWidget Interface
 
     /**
@@ -70,13 +68,17 @@ class RIVE_API URiveWidget : public UUserWidget
 
     UPROPERTY(BlueprintReadOnly, Transient, Category = Rive)
     TObjectPtr<URiveAudioEngine> RiveAudioEngine;
+
 private:
+    void OnRiveObjectReady();
+
     // Runtime objects
     UPROPERTY(Transient)
     TObjectPtr<URiveObject> RiveObject;
 
     void Setup();
     TSharedPtr<SRiveWidget> RiveWidget;
     FTimerHandle TimerHandle;
+    FDelegateHandle FrameHandle;
 
 };