Fixed spawn decal for moving characters

Source/Cloud9/Game/Cloud9DeveloperSettings.cpp

@@ -47,6 +47,8 @@ FString UCloud9DeveloperSettings::WeaponRecoilDecayCoefficientName = "r.WeaponRe
 FString UCloud9DeveloperSettings::DrawShotDirectionAxisName = "r.DrawShotDirectionAxis";
 FString UCloud9DeveloperSettings::WeaponDebugDamageInfoName = "r.WeaponDebugDamageInfo";
 FString UCloud9DeveloperSettings::TaggingScaleName = "r.TaggingScale";
+FString UCloud9DeveloperSettings::DecalLifeSpanName = "r.DecalLifeSpan";
+FString UCloud9DeveloperSettings::DecalFadeScreenSizeName = "r.DecalFadeScreenSizeName";
 FString UCloud9DeveloperSettings::VolumeName = "r.Volume";
 
 // ReSharper disable once CppPossiblyUninitializedMember
@@ -75,6 +77,8 @@ UCloud9DeveloperSettings::UCloud9DeveloperSettings(const FObjectInitializer& Obj
 	WeaponDebugDamageInfo = 0;
 	DrawShotDirectionAxis = 0;
 	TaggingScale = 1.0f;
+	DecalLifeSpan = 20.0f;
+	DecalFadeScreenSize = 0.0f;
 }
 
 UCloud9DeveloperSettings* UCloud9DeveloperSettings::Get()
@@ -252,6 +256,18 @@ void UCloud9DeveloperSettings::InitializeCVars()
 			TEXT("Scalar for player tagging modifier when hit. Lower values for greater tagging")
 		);
 
+		RegisterConsoleVariable(
+			DecalLifeSpan,
+			*DecalLifeSpanName,
+			TEXT("Life span of the decals")
+		);
+
+		RegisterConsoleVariable(
+			DecalFadeScreenSize,
+			*DecalFadeScreenSizeName,
+			TEXT("Decal size to fade off screen")
+		);
+
 		log(Display, "%s", this | EUObject::Stringify{} | EFString::ToCStr{});
 	}
 }

Source/Cloud9/Game/Cloud9DeveloperSettings.h

@@ -75,6 +75,8 @@ class CLOUD9_API UCloud9DeveloperSettings : public UDeveloperSettings
 	static FString DrawShotDirectionAxisName;
 	static FString WeaponDebugDamageInfoName;
 	static FString TaggingScaleName;
+	static FString DecalLifeSpanName;
+	static FString DecalFadeScreenSizeName;
 	static FString VolumeName;
 
 	// properties
@@ -144,6 +146,12 @@ class CLOUD9_API UCloud9DeveloperSettings : public UDeveloperSettings
 	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category=Debug)
 	float TaggingScale;
 
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category=Debug)
+	float DecalLifeSpan;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category=Debug)
+	float DecalFadeScreenSize;
+
 	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category=Debug)
 	EUnUsedEnum UnUsedEnum;
 

Source/Cloud9/Physicals/Cloud9PhysicalMaterial.cpp

@@ -26,28 +26,14 @@ bool IsVertical(FVector Normal)
 	return FMath::IsNearlyEqual(Normal.Z, 1.0f, 0.1f);
 }
 
-FRotator GetNormalSurfaceRotation(FVector Normal, float Roll)
-{
-	constexpr let DecalVPitch = 90.0f;
-	constexpr let DecalVRoll = -180.0f;
-	constexpr let DecalHYaw = 90.0f;
-	constexpr let DecalHRoll = -90.0;
-
-	let Corrective = IsVertical(Normal)
-		                 ? FRotator{DecalVPitch, Roll, DecalVRoll}
-		                 : FRotator{Roll, DecalHYaw, DecalHRoll};
-
-	return Normal.Rotation() + Corrective;
-}
-
 UMaterialInterface* UCloud9PhysicalMaterial::GetRandomFirearmDecal() const { return GetRandomItem(FirearmDecals); }
 
 FVector UCloud9PhysicalMaterial::GetFirearmDecalSize() const { return FirearmDecalSize; }
 
 FRotator UCloud9PhysicalMaterial::GetFirearmDecalRotation(FVector Normal) const
 {
 	let RandomRotation = FMath::RandRange(FirearmDecalRotationMin, FirearmDecalRotationMax);
-	return GetNormalSurfaceRotation(Normal, RandomRotation);
+	return Normal.Rotation() + FRotator{0.0f, 0.0f, RandomRotation};
 }
 
 USoundBase* UCloud9PhysicalMaterial::GetRandomFirearmHitSound() const { return GetRandomItem(FirearmHitSounds); }
@@ -76,7 +62,7 @@ FVector UCloud9PhysicalMaterial::GetBackgroundDecalLocation(FVector Location, FV
 FRotator UCloud9PhysicalMaterial::GetBackgroundDecalRotation(FVector Normal) const
 {
 	let RandomRotation = FMath::RandRange(FirearmBackgroundDecalRotationMin, FirearmBackgroundDecalRotationMax);
-	return GetNormalSurfaceRotation(Normal, RandomRotation);
+	return Normal.Rotation() + FRotator{0.0f, 0.0f, RandomRotation};
 }
 
 

Source/Cloud9/Tools/Extensions/UWorld.h

@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "Engine/DecalActor.h"
-#include "Components/DecalComponent.h"
 #include "GameFramework/GameModeBase.h"
 #include "Kismet/GameplayStatics.h"
 
@@ -63,42 +61,6 @@ namespace EUWorld
 		OPERATOR_BODY(SpawnActor)
 	};
 
-	struct SpawnDecal
-	{
-		UMaterialInterface* Material;
-		FVector DecalSize;
-		FVector Location;
-		FRotator Rotator;
-		float LifeSpan = 20.0f;
-		float FadeScreenSize = 0.001f;
-		AActor* Owner = nullptr;
-		APawn* Instigator = nullptr;
-
-		FORCEINLINE ADecalActor* operator()(UWorld* Self) const
-		{
-			FActorSpawnParameters Parameters;
-			Parameters.Owner = Owner;
-			Parameters.Instigator = Instigator;
-
-			if (let Actor = Self->SpawnActor<ADecalActor>(ADecalActor::StaticClass(), Location, Rotator, Parameters))
-			{
-				if (let Decal = Actor->GetDecal(); IsValid(Decal))
-				{
-					Decal->SetDecalMaterial(Material);
-					Decal->SetLifeSpan(LifeSpan);
-					Decal->SetFadeScreenSize(FadeScreenSize);
-					Decal->DecalSize = DecalSize;
-					return Actor;
-				}
-			}
-
-			return nullptr;
-		}
-
-		OPERATOR_BODY(SpawnDecal)
-	};
-
-
 	template <typename BlockType>
 	struct AsyncAfter
 	{

Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp

@@ -27,6 +27,7 @@
 #include "Engine/StaticMeshActor.h"
 #include "NiagaraFunctionLibrary.h"
 #include "Components/WidgetInteractionComponent.h"
+#include "Components/DecalComponent.h"
 
 #include "Cloud9/Tools/Macro/Common.h"
 #include "Cloud9/Tools/Macro/Logging.h"
@@ -567,14 +568,18 @@ EFirearmFireStatus ACloud9WeaponFirearm::GunFire(
 
 				if (let HitDecal = PhysicalMaterial->GetRandomFirearmDecal(); IsValid(HitDecal))
 				{
-					GetWorld() | EUWorld::SpawnDecal{
-						.Material = HitDecal,
-						.DecalSize = PhysicalMaterial->GetFirearmDecalSize(),
-						.Location = LineHit.Location,
-						.Rotator = PhysicalMaterial->GetFirearmDecalRotation(LineHit.Normal),
-						.Owner = DamagedActor,
-						.Instigator = Character
-					};
+					var Decal = UGameplayStatics::SpawnDecalAttached(
+						HitDecal,
+						PhysicalMaterial->GetFirearmDecalSize(),
+						LineHit.GetComponent(),
+						NAME_None,
+						LineHit.Location,
+						PhysicalMaterial->GetFirearmDecalRotation(LineHit.ImpactNormal),
+						EAttachLocation::KeepWorldPosition,
+						Settings->DecalLifeSpan
+					);
+
+					Decal->SetFadeScreenSize(Settings->DecalFadeScreenSize);
 				}
 
 				if (let HitSound = PhysicalMaterial->GetRandomFirearmHitSound(); IsValid(HitSound))
@@ -608,15 +613,19 @@ EFirearmFireStatus ACloud9WeaponFirearm::GunFire(
 
 						if (IsBackgroundHit)
 						{
-							GetWorld() | EUWorld::SpawnDecal{
-								.Material = BackgroundDecal,
-								.DecalSize = PhysicalMaterial->GetBackgroundDecalSize(),
-								.Location = PhysicalMaterial->GetBackgroundDecalLocation(
+							var Decal = UGameplayStatics::SpawnDecalAttached(
+								BackgroundDecal,
+								PhysicalMaterial->GetBackgroundDecalSize(),
+								BackgroundHit.GetComponent(),
+								NAME_None,
+								PhysicalMaterial->GetBackgroundDecalLocation(
 									BackgroundHit.Location, BackgroundHit.Normal),
-								.Rotator = PhysicalMaterial->GetBackgroundDecalRotation(BackgroundHit.Normal),
-								.Owner = LineHit.Actor.Get(),
-								.Instigator = Character
-							};
+								PhysicalMaterial->GetBackgroundDecalRotation(BackgroundHit.ImpactNormal),
+								EAttachLocation::KeepWorldPosition,
+								Settings->DecalLifeSpan
+							);
+
+							Decal->SetFadeScreenSize(Settings->DecalFadeScreenSize);
 						}
 					}
 				}