Merge pull request #1770 from jayyabsley/fix/ue5.5-getinputsview-deprecation

Fix UE 5.5+ GetInputsView deprecation warnings

Author: j9liu

CHANGES.md

@@ -2,6 +2,10 @@
 
 ### ? - ?
 
+##### Fixes :wrench:
+
+- Fixed deprecation warnings when compiling with Unreal Engine 5.5+ by replacing deprecated `GetInputsView()` calls with `FExpressionInputIterator` while maintaining compatibility with Unreal Engine 5.4.
+
 ##### Additions :tada:
 
 - Added an optional glTF model post-processing stage after the tile loading step, before the tile can be displayed.

Source/CesiumRuntime/Private/CesiumFeaturesMetadataComponent.cpp

@@ -2,6 +2,7 @@
 
 #include "CesiumFeaturesMetadataComponent.h"
 #include "Cesium3DTileset.h"
+#include "CesiumCommon.h"
 #include "CesiumGltfComponent.h"
 #include "CesiumGltfPrimitiveComponent.h"
 #include "CesiumModelMetadata.h"
@@ -511,6 +512,22 @@ static void ClearAutoGeneratedNodes(
     TMap<FString, TArray<FExpressionInput*>>& ConnectionOutputRemap,
     const MaterialFunctionLibrary& FunctionLibrary) {
 
+#if ENGINE_VERSION_5_5_OR_HIGHER
+  // UE 5.5+: Use FExpressionInputIterator
+  auto IterateInputs = [](UMaterialExpression* Expression, auto Callback) {
+    for (FExpressionInputIterator It(Expression); It; ++It) {
+      Callback(It.Input);
+    }
+  };
+#else
+  // UE 5.4: Use GetInputsView()
+  auto IterateInputs = [](UMaterialExpression* Expression, auto Callback) {
+    for (FExpressionInput* Input : Expression->GetInputsView()) {
+      Callback(Input);
+    }
+  };
+#endif
+
   FeaturesMetadataClassification Classification =
       ClassifyNodes(Layer, FunctionLibrary);
 
@@ -528,12 +545,12 @@ static void ClearAutoGeneratedNodes(
       // Should not happen, but just in case, this node would be invalid. Break
       // any user-made connections to this node and don't attempt to remap it.
       for (UMaterialExpression* UserNode : Classification.UserAddedNodes) {
-        for (FExpressionInput* Input : UserNode->GetInputsView()) {
+        IterateInputs(UserNode, [GetFeatureIdNode](FExpressionInput* Input) {
           if (Input->Expression == GetFeatureIdNode &&
               Input->OutputIndex == 0) {
             Input->Expression = nullptr;
           }
-        }
+        });
       }
       continue;
     }
@@ -553,26 +570,29 @@ static void ClearAutoGeneratedNodes(
       // In case, treat the node as invalid. Break any user-made connections to
       // this node and don't attempt to remap it.
       for (UMaterialExpression* UserNode : Classification.UserAddedNodes) {
-        for (FExpressionInput* Input : UserNode->GetInputsView()) {
+        IterateInputs(UserNode, [GetFeatureIdNode](FExpressionInput* Input) {
           if (Input->Expression == GetFeatureIdNode &&
               Input->OutputIndex == 0) {
             Input->Expression = nullptr;
           }
-        }
+        });
       }
       continue;
     }
 
     FString Key = GetFeatureIdNode->GetDescription() + ParameterName;
     TArray<FExpressionInput*> Connections;
     for (UMaterialExpression* UserNode : Classification.UserAddedNodes) {
-      for (FExpressionInput* Input : UserNode->GetInputsView()) {
-        // Look for user-made connections to this node.
-        if (Input->Expression == GetFeatureIdNode && Input->OutputIndex == 0) {
-          Connections.Add(Input);
-          Input->Expression = nullptr;
-        }
-      }
+      IterateInputs(
+          UserNode,
+          [GetFeatureIdNode, &Connections](FExpressionInput* Input) {
+            // Look for user-made connections to this node.
+            if (Input->Expression == GetFeatureIdNode &&
+                Input->OutputIndex == 0) {
+              Connections.Add(Input);
+              Input->Expression = nullptr;
+            }
+          });
     }
     ConnectionOutputRemap.Emplace(MoveTemp(Key), MoveTemp(Connections));
   }
@@ -590,13 +610,16 @@ static void ClearAutoGeneratedNodes(
       // Look for user-made connections to this property.
       TArray<FExpressionInput*> Connections;
       for (UMaterialExpression* UserNode : Classification.UserAddedNodes) {
-        for (FExpressionInput* Input : UserNode->GetInputsView()) {
-          if (Input->Expression == GetPropertyValueNode &&
-              Input->OutputIndex == OutputIndex) {
-            Connections.Add(Input);
-            Input->Expression = nullptr;
-          }
-        }
+        IterateInputs(
+            UserNode,
+            [GetPropertyValueNode, OutputIndex, &Connections](
+                FExpressionInput* Input) {
+              if (Input->Expression == GetPropertyValueNode &&
+                  Input->OutputIndex == OutputIndex) {
+                Connections.Add(Input);
+                Input->Expression = nullptr;
+              }
+            });
       }
 
       ConnectionOutputRemap.Emplace(MoveTemp(Key), MoveTemp(Connections));
@@ -617,13 +640,16 @@ static void ClearAutoGeneratedNodes(
       // Look for user-made connections to this property.
       TArray<FExpressionInput*> Connections;
       for (UMaterialExpression* UserNode : Classification.UserAddedNodes) {
-        for (FExpressionInput* Input : UserNode->GetInputsView()) {
-          if (Input->Expression == ApplyValueTransformNode &&
-              Input->OutputIndex == OutputIndex) {
-            Connections.Add(Input);
-            Input->Expression = nullptr;
-          }
-        }
+        IterateInputs(
+            UserNode,
+            [ApplyValueTransformNode, OutputIndex, &Connections](
+                FExpressionInput* Input) {
+              if (Input->Expression == ApplyValueTransformNode &&
+                  Input->OutputIndex == OutputIndex) {
+                Connections.Add(Input);
+                Input->Expression = nullptr;
+              }
+            });
       }
 
       ConnectionOutputRemap.Emplace(MoveTemp(Key), MoveTemp(Connections));
@@ -663,25 +689,25 @@ static void ClearAutoGeneratedNodes(
       // In case, treat the node as invalid. Break any user-made connections to
       // this node and don't attempt to remap it.
       for (UMaterialExpression* UserNode : Classification.UserAddedNodes) {
-        for (FExpressionInput* Input : UserNode->GetInputsView()) {
+        IterateInputs(UserNode, [IfNode](FExpressionInput* Input) {
           if (Input->Expression == IfNode && Input->OutputIndex == 0) {
             Input->Expression = nullptr;
           }
-        }
+        });
       }
       continue;
     }
 
     FString Key = IfNode->GetDescription() + IfNodeName;
     TArray<FExpressionInput*> Connections;
     for (UMaterialExpression* UserNode : Classification.UserAddedNodes) {
-      for (FExpressionInput* Input : UserNode->GetInputsView()) {
+      IterateInputs(UserNode, [IfNode, &Connections](FExpressionInput* Input) {
         // Look for user-made connections to this node.
         if (Input->Expression == IfNode && Input->OutputIndex == 0) {
           Connections.Add(Input);
           Input->Expression = nullptr;
         }
-      }
+      });
     }
     ConnectionOutputRemap.Emplace(Key, MoveTemp(Connections));