Replace RiveViewport; Fix Reimporting (#103)

* UR-244: Fix reimport * UR-245: Remove RiveViewport client, replaced RiveWidget for fixed UI blending; Removed UI Blend Mode * fix includes for release build
rive-app · Jul 30, 2024 · c1deff0 · c1deff0
1 parent 7bedff7
commit c1deff0
Show file tree

Hide file tree

Showing 21 changed files with 288 additions and 785 deletions.
diff --git a/Source/Rive/Private/Rive/RiveStateMachine.cpp b/Source/Rive/Private/Rive/RiveStateMachine.cpp
@@ -270,9 +270,9 @@ bool FRiveStateMachine::PointerDown(const FVector2f& NewPosition)
     {
         return false;
     }
-    
-    NativeStateMachinePtr->pointerDown({ NewPosition.X, NewPosition.Y });
-    return true;
+
+    rive::HitResult HitResult = NativeStateMachinePtr->pointerDown({NewPosition.X, NewPosition.Y});
+    return HitResult == rive::HitResult::hitOpaque;
 }
 
 bool FRiveStateMachine::PointerMove(const FVector2f& NewPosition)
@@ -291,8 +291,8 @@ bool FRiveStateMachine::PointerMove(const FVector2f& NewPosition)
         return false;
     }
 
-    NativeStateMachinePtr->pointerMove({ NewPosition.X, NewPosition.Y });
-    return true;
+    rive::HitResult HitResult = NativeStateMachinePtr->pointerMove({ NewPosition.X, NewPosition.Y });
+    return HitResult == rive::HitResult::hitOpaque;
 }
 
 bool FRiveStateMachine::PointerUp(const FVector2f& NewPosition)
@@ -311,8 +311,8 @@ bool FRiveStateMachine::PointerUp(const FVector2f& NewPosition)
         return false;
     }
 
-    NativeStateMachinePtr->pointerUp({ NewPosition.X, NewPosition.Y });
-    return true;
+    rive::HitResult HitResult = NativeStateMachinePtr->pointerUp({ NewPosition.X, NewPosition.Y });
+    return HitResult == rive::HitResult::hitOpaque;
 }
 
 bool FRiveStateMachine::PointerExit(const FVector2f& NewPosition)
@@ -331,8 +331,8 @@ bool FRiveStateMachine::PointerExit(const FVector2f& NewPosition)
         return false;
     }
 
-    NativeStateMachinePtr->pointerExit({ NewPosition.X, NewPosition.Y });
-    return true;
+    rive::HitResult HitResult = NativeStateMachinePtr->pointerExit({ NewPosition.X, NewPosition.Y });
+    return HitResult == rive::HitResult::hitOpaque;
 }
 
 const rive::EventReport FRiveStateMachine::GetReportedEvent(int32 AtIndex) const

diff --git a/Source/Rive/Private/Rive/RiveTexture.cpp b/Source/Rive/Private/Rive/RiveTexture.cpp
@@ -115,53 +115,6 @@ FVector2f URiveTexture::GetLocalCoordinatesFromExtents(URiveArtboard* InArtboard
 	}
 }
 
-ESimpleElementBlendMode URiveTexture::GetSimpleElementBlendMode() const
-{
-	ESimpleElementBlendMode NewBlendMode = ESimpleElementBlendMode::SE_BLEND_Opaque;
-
-	switch (RiveBlendMode)
-	{
-	case ERiveBlendMode::SE_BLEND_Opaque:
-		break;
-	case ERiveBlendMode::SE_BLEND_Masked:
-		NewBlendMode = SE_BLEND_Masked;
-		break;
-	case ERiveBlendMode::SE_BLEND_Translucent:
-		NewBlendMode = SE_BLEND_Translucent;
-		break;
-	case ERiveBlendMode::SE_BLEND_Additive:
-		NewBlendMode = SE_BLEND_Additive;
-		break;
-	case ERiveBlendMode::SE_BLEND_Modulate:
-		NewBlendMode = SE_BLEND_Modulate;
-		break;
-	case ERiveBlendMode::SE_BLEND_MaskedDistanceField:
-		NewBlendMode = SE_BLEND_MaskedDistanceField;
-		break;
-	case ERiveBlendMode::SE_BLEND_MaskedDistanceFieldShadowed:
-		NewBlendMode = SE_BLEND_MaskedDistanceFieldShadowed;
-		break;
-	case ERiveBlendMode::SE_BLEND_TranslucentDistanceField:
-		NewBlendMode = SE_BLEND_TranslucentDistanceField;
-		break;
-	case ERiveBlendMode::SE_BLEND_TranslucentDistanceFieldShadowed:
-		NewBlendMode = SE_BLEND_TranslucentDistanceFieldShadowed;
-		break;
-	case ERiveBlendMode::SE_BLEND_AlphaComposite:
-		NewBlendMode = SE_BLEND_AlphaComposite;
-		break;
-	case ERiveBlendMode::SE_BLEND_AlphaHoldout:
-		NewBlendMode = SE_BLEND_AlphaHoldout;
-		break;
-	case ERiveBlendMode::SE_BLEND_AlphaBlend:
-		NewBlendMode = SE_BLEND_AlphaBlend;
-		break;
-	}
-
-	return NewBlendMode;
-}
-
-
 void URiveTexture::InitializeResources() const
 {
 	if (!IRiveRendererModule::Get().GetRenderer())

diff --git a/Source/Rive/Private/Rive/RiveTextureObject.cpp b/Source/Rive/Private/Rive/RiveTextureObject.cpp
@@ -112,7 +112,6 @@ void URiveTextureObject::Initialize(const FRiveDescriptor& InRiveDescriptor)
 {
 	Artboard = nullptr;
 	RiveDescriptor = InRiveDescriptor;
-	RiveBlendMode = InRiveDescriptor.UIBlendMode;
 
 	if (!IRiveRendererModule::IsAvailable())
 	{

diff --git a/Source/Rive/Private/Slate/RiveSceneViewport.cpp b/Source/Rive/Private/Slate/RiveSceneViewport.cpp
diff --git a/Source/Rive/Private/Slate/RiveSceneViewport.h b/Source/Rive/Private/Slate/RiveSceneViewport.h
diff --git a/Source/Rive/Private/Slate/RiveViewportClient.cpp b/Source/Rive/Private/Slate/RiveViewportClient.cpp