Fix dilation, mesh cutout and change default normals to be flat

Erlandys · Mar 14, 2024 · f84ab0a · f84ab0a
1 parent 50682f0
commit f84ab0a
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 14 deletions.
diff --git a/Content/ImpostorBaker/MaterialFunctions/Impostor_ThreeFrameBlend.uasset b/Content/ImpostorBaker/MaterialFunctions/Impostor_ThreeFrameBlend.uasset
diff --git a/Content/ImpostorBaker/MaterialFunctions/MF_SampleFrame_Dilation.uasset b/Content/ImpostorBaker/MaterialFunctions/MF_SampleFrame_Dilation.uasset
diff --git a/Content/ImpostorBaker/Materials/Generation/M_Sample_Frame.uasset b/Content/ImpostorBaker/Materials/Generation/M_Sample_Frame.uasset
diff --git a/Content/ImpostorBaker/Materials/M_Billboard.uasset b/Content/ImpostorBaker/Materials/M_Billboard.uasset
diff --git a/Content/ImpostorBaker/Materials/M_Billboard_TwoSided.uasset b/Content/ImpostorBaker/Materials/M_Billboard_TwoSided.uasset
diff --git a/Source/ImpostorBakerEditor/Private/ImpostorData.h b/Source/ImpostorBakerEditor/Private/ImpostorData.h
@@ -225,10 +225,13 @@ class UImpostorData : public UObject
 	UPROPERTY(EditAnywhere, Category = "Material")
 	float PixelDepthOffset = 0.f;
 
-	UPROPERTY(EditAnywhere, Category = "Material", meta = (ClampMin = "0", ClampMax = "1"))
-	float Dilation = 0.f;
+	UPROPERTY(EditAnywhere, Category = "Material")
+	bool bEnableDilation = false;
+
+	UPROPERTY(EditAnywhere, Category = "Material", meta = (EditCondition = "bEnableDilation"))
+	bool bOverrideDilationSteps = false;
 
-	UPROPERTY(EditAnywhere, Category = "Material", meta = (ClampMin = "1"))
+	UPROPERTY(EditAnywhere, Category = "Material", meta = (EditCondition = "bEnableDilation && bOverrideDilationSteps", ClampMin = "1"))
 	int32 DilationMaxSteps = 64;
 
 	UPROPERTY(EditAnywhere, Category = "Custom Lighting")

diff --git a/Source/ImpostorBakerEditor/Private/Managers/ImpostorMaterialsManager.cpp b/Source/ImpostorBakerEditor/Private/Managers/ImpostorMaterialsManager.cpp
@@ -121,13 +121,31 @@ UMaterialInstanceDynamic* UImpostorMaterialsManager::GetSampleMaterial(const EIm
 
 	SampleFrameMaterial->SetScalarParameterValue("UseSRGBBaseColor", TargetMap == EImpostorBakeMapType::BaseColor ? 1.f : 0.f);
 
-	if (ImpostorData->bUseDistanceFieldAlpha &&
-		(TargetMap == EImpostorBakeMapType::BaseColor))
+	if (TargetMap == EImpostorBakeMapType::BaseColor)
 	{
-		SampleFrameMaterial->SetScalarParameterValue("UseDistanceField", 1.f);
+		if (ImpostorData->bUseDistanceFieldAlpha)
+		{
+			SampleFrameMaterial->SetScalarParameterValue("UseDistanceField", 1.f);
+		}
+		else
+		{
+			SampleFrameMaterial->SetScalarParameterValue("UseDistanceField", 0.f);
+		}
+
+		SampleFrameMaterial->SetScalarParameterValue(FName("Dilation"), ImpostorData->bEnableDilation ? 1.f : 0.f);
+		if (ImpostorData->bOverrideDilationSteps)
+		{
+			SampleFrameMaterial->SetScalarParameterValue(FName("DilationMaxSteps"), ImpostorData->DilationMaxSteps);
+		}
+		else
+		{
+			const int32 DilationSteps = 1 << FMath::Max(int32(FMath::CeilLogTwo(ImpostorData->FrameSize)) - 7, 0);
+			SampleFrameMaterial->SetScalarParameterValue(FName("DilationMaxSteps"), DilationSteps);
+		}
 	}
 	else
 	{
+		SampleFrameMaterial->SetScalarParameterValue(FName("Dilation"), 0.f);
 		SampleFrameMaterial->SetScalarParameterValue("UseDistanceField", 0.f);
 	}
 
@@ -307,8 +325,6 @@ void UImpostorMaterialsManager::UpdateSampleFrameMaterial() const
 	SampleFrameMaterial->SetTextureParameterValue(FName("Alpha"), GetManager<UImpostorRenderTargetsManager>()->SceneCaptureMipChain[0]);
 	SampleFrameMaterial->SetTextureParameterValue(FName("MipAlpha"), GetManager<UImpostorRenderTargetsManager>()->SceneCaptureMipChain[FMath::Min(GetManager<UImpostorRenderTargetsManager>()->SceneCaptureMipChain.Num() - 1, ImpostorData->DFMipTarget)]);
 	SampleFrameMaterial->SetScalarParameterValue(FName("TextureSize"), ImpostorData->SceneCaptureResolution);
-	SampleFrameMaterial->SetScalarParameterValue(FName("Dilation"), ImpostorData->Dilation);
-	SampleFrameMaterial->SetScalarParameterValue(FName("DilationMaxSteps"), ImpostorData->DilationMaxSteps);
 }
 
 void UImpostorMaterialsManager::UpdateAddAlphasMaterial() const

diff --git a/Source/ImpostorBakerEditor/Private/Managers/ImpostorRenderTargetsManager.cpp b/Source/ImpostorBakerEditor/Private/Managers/ImpostorRenderTargetsManager.cpp
@@ -476,14 +476,18 @@ void UImpostorRenderTargetsManager::CaptureImposterGrid()
 		SceneWorld->SendAllEndOfFrameUpdates();
 		SceneCaptureComponent2D->UpdateSceneCaptureContents(SceneWorld->Scene);
 
-		if (ImpostorData->bUseDistanceFieldAlpha &&
-			CurrentMap == EImpostorBakeMapType::BaseColor &&
-			bCapturingFinalColor)
+		// Lower mips are necessary for distance field alpha and mesh cutouts
+		if (ImpostorData->bUseDistanceFieldAlpha ||
+			ImpostorData->bUseMeshCutout)
 		{
-			for (int32 MipIndex = 1; MipIndex < SceneCaptureMipChain.Num(); MipIndex++)
+			if (CurrentMap == EImpostorBakeMapType::BaseColor &&
+				bCapturingFinalColor)
 			{
-				UKismetRenderingLibrary::ClearRenderTarget2D(SceneWorld, SceneCaptureMipChain[MipIndex], FLinearColor::Black);
-				ResampleRenderTarget(SceneCaptureMipChain[MipIndex - 1], SceneCaptureMipChain[MipIndex]);
+				for (int32 MipIndex = 1; MipIndex < SceneCaptureMipChain.Num(); MipIndex++)
+				{
+					UKismetRenderingLibrary::ClearRenderTarget2D(SceneWorld, SceneCaptureMipChain[MipIndex], FLinearColor::Black);
+					ResampleRenderTarget(SceneCaptureMipChain[MipIndex - 1], SceneCaptureMipChain[MipIndex]);
+				}
 			}
 		}