Connect UVW input for cube/array texture samplers

These require 3-dimensional UVW coordinates instead of the default UV
coordinates, which are 2-dimensional. This should fix materials using
texture cube or texture array samplers.

Signed-off-by: Angel Pons <[email protected]>

Author: Th3Fanbus

AssetGenerator/Source/AssetGenerator/Private/Toolkit/AssetTypeGenerator/MaterialGenerator.cpp

@@ -15,6 +15,7 @@
 #include "Materials/MaterialExpressionLandscapeGrassOutput.h"
 #include "Materials/MaterialExpressionMultiply.h"
 #include "Materials/MaterialExpressionQualitySwitch.h"
+#include "Materials/MaterialExpressionReflectionVectorWS.h"
 #include "Materials/MaterialExpressionRuntimeVirtualTextureSampleParameter.h"
 #include "Materials/MaterialExpressionScalarParameter.h"
 #include "Materials/MaterialExpressionStaticSwitchParameter.h"
@@ -297,6 +298,10 @@ UClass* GetTextureSampleParameterClassForTexture(UTexture* Texture) {
 	return NULL;
 }
 
+FORCEINLINE static bool DoesTextureSamplerRequireUVW(UClass* ExpressionClass) {
+	return ExpressionClass->IsChildOf<UMaterialExpressionTextureSampleParameterCube>() || ExpressionClass->IsChildOf<UMaterialExpressionTextureSampleParameter2DArray>();
+}
+
 void UMaterialGenerator::ApplyOtherLayoutChanges(UMaterial* Material, FMaterialLayoutChangeInfo& LayoutChangeInfo) {
 	//Add Parameter Collection parameter nodes
 	for (UMaterialParameterCollection* NewCollection : LayoutChangeInfo.NewReferencedParameterCollections) {
@@ -481,6 +486,12 @@ void UMaterialGenerator::SpawnNewMaterialParameterNodes(UMaterial* Material, FMa
 			Expression->SetParameterName(NewTextureParameter.ParameterInfo.Name);
 			Expression->Texture = NewTextureParameter.ParameterValue.Get();
 			Expression->AutoSetSampleType();
+
+			if (DoesTextureSamplerRequireUVW(ExpressionClass)) {
+				const FVector2D NodePos = FVector2D(Expression->MaterialExpressionEditorX - 256, Expression->MaterialExpressionEditorY);
+				UMaterialExpressionReflectionVectorWS* ReflectionVector = SpawnMaterialExpression<UMaterialExpressionReflectionVectorWS>(Material, NodePos);
+				Expression->Coordinates.Connect(0, ReflectionVector);
+			}
 		}
 	}
 

AssetGenerator/Source/AssetGenerator/Public/Toolkit/AssetTypeGenerator/MaterialGenerator.h

@@ -149,15 +149,21 @@ class UMaterialGenerator : public UAssetTypeGenerator {
 	static FVector2D GetGoodPlaceForNewMaterialExpression(UMaterial* Material);
 	static void ForceMaterialCompilation(UMaterial* Material);
 	static void ConnectBasicParameterPinsIfPossible(UMaterial* Material, const FString& ErrorMessage);
-	
+
 	template<typename T>
-	FORCEINLINE static T* SpawnMaterialExpression(UMaterial* Material, UClass* ExpressionClass = T::StaticClass()) {
-		const FVector2D NodePos = GetGoodPlaceForNewMaterialExpression(Material);
-		T* NewMaterialExpression =  CastChecked<T>(UMaterialEditingLibrary::CreateMaterialExpressionEx(Material, NULL, ExpressionClass, NULL, NodePos.X, NodePos.Y));
+	FORCEINLINE static T* SpawnMaterialExpression(UMaterial* Material, const FVector2D NodePos, UClass* ExpressionClass = T::StaticClass())
+	{
+		T* NewMaterialExpression = CastChecked<T>(UMaterialEditingLibrary::CreateMaterialExpressionEx(Material, NULL, ExpressionClass, NULL, NodePos.X, NodePos.Y));
 
 		if (Material->MaterialGraph) {
 			Material->MaterialGraph->AddExpression(NewMaterialExpression, false);
 		}
 		return NewMaterialExpression;
 	}
+
+	template<typename T>
+	FORCEINLINE static T* SpawnMaterialExpression(UMaterial* Material, UClass* ExpressionClass = T::StaticClass())
+	{
+		return SpawnMaterialExpression<T>(Material, GetGoodPlaceForNewMaterialExpression(Material), ExpressionClass);
+	}
 };