fix(unreal)ignore symbol list index fix (#11292) 14df844014

* treat list index correct

* ensure int is used for list index

* propery logging in view model

Co-authored-by: Jonathon Copeland <jcopela4@gmail.com>

Author: blakdragan7

.rive_head

@@ -1 +1 @@
-ba953a142ba3703152a81b89da93ea77ecb30d57
+14df84401453006ab90d7844fd36fe0ce8479fba

Source/Rive/Private/Rive/RiveFile.cpp

@@ -47,7 +47,10 @@ static ERiveDataType RiveDataTypeFromDataType(rive::DataType type)
         case rive::DataType::string:
             return ERiveDataType::String;
         case rive::DataType::number:
+        case rive::DataType::integer:
             return ERiveDataType::Number;
+        case rive::DataType::symbolListIndex:
+            return ERiveDataType::SymbolListIndex;
         case rive::DataType::boolean:
             return ERiveDataType::Boolean;
         case rive::DataType::color:
@@ -64,9 +67,6 @@ static ERiveDataType RiveDataTypeFromDataType(rive::DataType type)
             return ERiveDataType::AssetImage;
         case rive::DataType::artboard:
             return ERiveDataType::Artboard;
-        case rive::DataType::integer:
-        case rive::DataType::symbolListIndex:
-            RIVE_UNREACHABLE();
     }
 
     return ERiveDataType::None;
@@ -634,6 +634,16 @@ void URiveFile::ViewModelPropertyDefinitionsListed(
                         }
                     }
                     break;
+                    case ERiveDataType::SymbolListIndex:
+                    {
+                        UE_LOG(
+                            LogRive,
+                            Warning,
+                            TEXT(
+                                "Property of type SymbolListIndex is getting ignored !"));
+                        continue;
+                    }
+                    break;
                     case ERiveDataType::Boolean:
                     {
                         auto Prop = NativeViewModelInstance->propertyBoolean(

Source/Rive/Private/Rive/RiveViewModel.cpp

@@ -41,7 +41,10 @@ static rive::DataType RiveDataTypeToDataType(ERiveDataType Type)
             return rive::DataType::assetImage;
         case ERiveDataType::Artboard:
             return rive::DataType::artboard;
+        case ERiveDataType::SymbolListIndex:
+            return rive::DataType::symbolListIndex;
     }
+
     return rive::DataType::none;
 }
 
@@ -131,6 +134,7 @@ constexpr bool GetIsPropertyTypeWithDefault(ERiveDataType Type)
         case ERiveDataType::AssetImage:
         case ERiveDataType::List:
         case ERiveDataType::Trigger:
+        case ERiveDataType::SymbolListIndex:
         case ERiveDataType::None:
             break;
     }
@@ -1115,13 +1119,17 @@ void URiveViewModel::OnViewModelDataReceived(
         case rive::DataType::viewModel:
         case rive::DataType::artboard:
         case rive::DataType::assetImage:
+        case rive::DataType::symbolListIndex:
             break;
         // Invalid values
         case rive::DataType::none:
         case rive::DataType::input:
         case rive::DataType::integer:
-        case rive::DataType::symbolListIndex:
-            RIVE_UNREACHABLE();
+            UE_LOG(
+                LogRive,
+                Error,
+                TEXT(
+                    "URiveViewModel::OnViewModelDataReceived Invalid property type received for update"));
             break;
     }
 
@@ -1332,6 +1340,14 @@ void URiveViewModel::OnUpdatedField(UE::FieldNotification::FFieldId InFieldId)
                    *ObjectClass->GetName());
         }
     }
+    else
+    {
+        UE_LOG(LogRive,
+               Error,
+               TEXT("URiveViewModel::OnUpdatedField Unsupported Property "
+                    "%s."),
+               *Property->GetName());
+    }
 }
 
 bool URiveViewModel::RemoveFieldValueChangedDelegate(

Source/Rive/Public/RiveInternalTypes.h

@@ -16,7 +16,8 @@ enum class ERiveDataType : uint8
     Trigger = 7,
     ViewModel = 8,
     AssetImage = 11,
-    Artboard = 12
+    Artboard = 12,
+    SymbolListIndex = 13,
 };
 
 USTRUCT(BlueprintType)

Source/RiveEditor/Private/Factories/RiveFileFactory.cpp

@@ -37,6 +37,8 @@ static FName RiveDataTypeToPinCatagory(ERiveDataType DataType)
             return "None";
         case ERiveDataType::String:
             return UEdGraphSchema_K2::PC_String;
+        case ERiveDataType::SymbolListIndex:
+            return UEdGraphSchema_K2::PC_Int;
         case ERiveDataType::Number:
             return UEdGraphSchema_K2::PC_Real;
         case ERiveDataType::Boolean:

Source/RiveEditor/Private/RiveFileDetailCustomization.cpp

@@ -110,6 +110,8 @@ static FString GetIconForPropertyType(ERiveDataType Type)
             return FString(TEXT("\xf0e7")); // FontAwesome icon for bolt
         case ERiveDataType::List:
             return FString(TEXT("\xf00b")); // FontAwesome icon for list
+        case ERiveDataType::SymbolListIndex:
+            return FString(TEXT("\xf0e7"));
         case ERiveDataType::ViewModel:
             return FString(
                 TEXT("\xf542")); // FontAwesome icon for Project Diagram
@@ -142,6 +144,8 @@ static FString GetTextForPropertyType(ERiveDataType Type)
             return FString(TEXT("Texture"));
         case ERiveDataType::Artboard:
             return FString(TEXT("Artboard"));
+        case ERiveDataType::SymbolListIndex:
+            return FString(TEXT("Symbol List Index"));
         case ERiveDataType::None:
             UE_LOG(
                 LogRiveEditor,