baz/Nakatomi
baz
/
Nakatomi
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: baz:633c66ff6f952b74a6587e277374c44f1816c0f0
Branches Tags
baz:master
..
compare: baz:b68fd35f4d5966b92290606e6b0242fdd04141ec
Branches Tags
baz:master

4 Commits
633c66ff6f ... b68fd35f4d

Author SHA1 Message Date
baz b68fd35f4d Add NS_BulletImpact to weapons 2024-03-07 02:10:54 +00:00
baz 76fb2475d2 Use NiagaraSystem to spawn Particle Effects on bullet impact 2024-03-07 02:10:11 +00:00
baz cda5b81484 Change UParticleSystem usage to UNiagaraSystem 2024-03-07 02:09:36 +00:00
baz 2470daa098 Add Niagara to build dependency modules 2024-03-07 02:09:04 +00:00
11 changed files with 80 additions and 34 deletions
Show Stats Expand all files Collapse all files

BIN
Content/Weapons/Pistol/Pistol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Weapons/Shotgun/Shotgun.uasset (Stored with Git LFS)
View File

Binary file not shown.

56
Source/Nakatomi/EnemyCharacter.cpp
View File

@ -4,6 +4,7 @@
#include "EnemyAIController.h"
#include "EnemyHealthComponent.h"
#include "InteractableComponent.h"
#include "NiagaraFunctionLibrary.h"
#include "BehaviorTree/BehaviorTree.h"
#include "BehaviorTree/BlackboardComponent.h"
#include "BehaviorTree/BlackboardData.h"
@ -33,8 +34,9 @@ void AEnemyCharacter::OnFire()
CurrentWeapon->SetCurrentWeaponStatus(Firing);
TArray<FHitResult> Hits = TArray<FHitResult>();
CalculateHits(&Hits);
ProcessHits(Hits);
FVector direction = FVector::ZeroVector;
CalculateHits(&Hits, &direction);
ProcessHits(Hits, direction);
CurrentWeapon->PlayFireSoundAtLocation(GetActorLocation());
@ -68,7 +70,7 @@ void AEnemyCharacter::PlayOnFireAnimations()
Super::PlayOnFireAnimations();
}
void AEnemyCharacter::CalculateHits(TArray<FHitResult>* hits)
void AEnemyCharacter::CalculateHits(TArray<FHitResult>* hits, FVector* dir)
{
// Set up randomness
const int32 RandomSeed = FMath::Rand();
@ -108,7 +110,7 @@ void AEnemyCharacter::CalculateHits(TArray<FHitResult>* hits)
}
}
void AEnemyCharacter::ProcessHits(TArray<FHitResult> hits)
void AEnemyCharacter::ProcessHits(TArray<FHitResult> hits, FVector dir)
{
for (FHitResult Hit : hits)
{
@ -117,10 +119,18 @@ void AEnemyCharacter::ProcessHits(TArray<FHitResult> hits)
SpawnParameters.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
// Spawn field actor
FTransform transform;
transform.SetLocation(Hit.ImpactPoint);
auto field = GetWorld()->SpawnActor<AFieldSystemActor>(CurrentWeapon->GetFieldSystemActor(), transform,
SpawnParameters);
if (CurrentWeapon->GetFieldSystemActor())
{
FTransform transform;
transform.SetLocation(Hit.ImpactPoint);
auto field = GetWorld()->SpawnActor<AFieldSystemActor>(CurrentWeapon->GetFieldSystemActor(), transform,
SpawnParameters);
if (field)
{
field->Destroy();
}
}
if (Hit.GetActor())
{
@ -135,6 +145,36 @@ void AEnemyCharacter::ProcessHits(TArray<FHitResult> hits)
GetController(), this);
}
}
auto staticMeshComponent = Hit.GetActor()->GetComponentByClass<UStaticMeshComponent>();
if (staticMeshComponent && !staticMeshComponent->IsSimulatingPhysics() && CurrentWeapon->GetDecalActor())
{
FTransform transform;
transform.SetLocation(Hit.ImpactPoint);
auto decalActor = GetWorld()->SpawnActor<ADecalActor>(CurrentWeapon->GetDecalActor(), transform,
SpawnParameters);
auto rot = Hit.ImpactNormal.Rotation();
rot.Roll += 90.0f;
rot.Yaw += 180.0f;
decalActor->SetActorRotation(rot);
}
if (staticMeshComponent && !staticMeshComponent->IsSimulatingPhysics() &&
CurrentWeapon->GetImpactParticleSystem())
{
FTransform transform;
transform.SetLocation(Hit.ImpactPoint);
UNiagaraFunctionLibrary::SpawnSystemAtLocation(this,
CurrentWeapon->GetImpactParticleSystem(),
transform.GetLocation(),
dir.MirrorByVector(Hit.ImpactNormal).Rotation(),
FVector(1),
true);
}
}
}

4
Source/Nakatomi/EnemyCharacter.h
View File

@ -52,9 +52,9 @@ protected:
private:
virtual void PlayOnFireAnimations() override;
virtual void CalculateHits(TArray<FHitResult>* hits) override;
virtual void CalculateHits(TArray<FHitResult>* hits, FVector* dir) override;
virtual void ProcessHits(TArray<FHitResult> hits) override;
virtual void ProcessHits(TArray<FHitResult> hits, FVector dir) override;
protected:
virtual void OnDamaged() override;

2
Source/Nakatomi/Nakatomi.Build.cs
View File

@ -11,7 +11,7 @@ public class Nakatomi : ModuleRules
PublicDependencyModuleNames.AddRange(new[]
{
"Core", "CoreUObject", "Engine", "InputCore", "EnhancedInput", "FieldSystemEngine",
"GeometryCollectionEngine", "UMG", "AIModule", "GameplayTasks", "NavigationSystem"
"GeometryCollectionEngine", "UMG", "AIModule", "GameplayTasks", "NavigationSystem", "Niagara"
});
PrivateDependencyModuleNames.AddRange(new string[] { });

4
Source/Nakatomi/NakatomiCharacter.cpp
View File

@ -257,11 +257,11 @@ bool ANakatomiCharacter::GetCrouched()
return false;
}
void ANakatomiCharacter::CalculateHits(TArray<FHitResult>* hits)
void ANakatomiCharacter::CalculateHits(TArray<FHitResult>* hits, FVector* dir)
{
}
void ANakatomiCharacter::ProcessHits(TArray<FHitResult> hits)
void ANakatomiCharacter::ProcessHits(TArray<FHitResult> hits, FVector dir)
{
}

4
Source/Nakatomi/NakatomiCharacter.h
View File

@ -116,9 +116,9 @@ public:
bool GetCrouched();
protected:
virtual void CalculateHits(TArray<FHitResult>* hits);
virtual void CalculateHits(TArray<FHitResult>* hits, FVector* dir);
virtual void ProcessHits(TArray<FHitResult> hits);
virtual void ProcessHits(TArray<FHitResult> hits, FVector dir);
virtual void PlayOnFireAnimations();

25
Source/Nakatomi/PlayerCharacter.cpp
View File

@ -14,6 +14,7 @@
#include "InteractableComponent.h"
#include "NakatomiCMC.h"
#include "WeaponThrowable.h"
#include "NiagaraFunctionLibrary.h"
#include "GameFramework/CharacterMovementComponent.h"
#define COLLISION_WEAPON ECC_GameTraceChannel1
@ -318,7 +319,7 @@ void APlayerCharacter::SetWalkingCallback(const FInputActionInstance& Instance)
}
}
void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits)
void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits, FVector* dir)
{
// Set up the collision query params, use the Weapon trace settings, Ignore the actor firing this trace
FCollisionQueryParams TraceParams(SCENE_QUERY_STAT(WeaponTrace), true, GetInstigator());
@ -349,6 +350,7 @@ void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits)
TraceStart = GetRootComponent()->GetComponentLocation();
FVector AimDir = CamHit.ImpactPoint - TraceStart;
AimDir.Normalize();
*dir = AimDir;
TraceStart = TraceStart + AimDir * ((GetInstigator()->GetActorLocation() - TraceStart) | AimDir);
// Calculate the hit results from the trace
@ -371,7 +373,7 @@ void APlayerCharacter::CalculateHits(TArray<FHitResult>* hits)
}
}
void APlayerCharacter::ProcessHits(TArray<FHitResult> hits)
void APlayerCharacter::ProcessHits(TArray<FHitResult> hits, FVector dir)
{
for (FHitResult Hit : hits)
{
@ -436,12 +438,14 @@ void APlayerCharacter::ProcessHits(TArray<FHitResult> hits)
{
FTransform transform;
transform.SetLocation(Hit.ImpactPoint);
UGameplayStatics::SpawnEmitterAtLocation(this,
CurrentWeapon->GetImpactParticleSystem(),
transform.GetLocation(),
FRotator::ZeroRotator,
true);
UNiagaraFunctionLibrary::SpawnSystemAtLocation(this,
CurrentWeapon->GetImpactParticleSystem(),
transform.GetLocation(),
dir.MirrorByVector(Hit.ImpactNormal).Rotation(),
FVector(1),
true);
}
}
@ -643,8 +647,9 @@ void APlayerCharacter::OnFire()
CurrentWeapon->SetCurrentWeaponStatus(Firing);
TArray<FHitResult> Hits = TArray<FHitResult>();
CalculateHits(&Hits);
ProcessHits(Hits);
FVector direction = FVector::ZeroVector;
CalculateHits(&Hits, &direction);
ProcessHits(Hits, direction);
CurrentWeapon->DecrementAmmoCount(1);

4
Source/Nakatomi/PlayerCharacter.h
View File

@ -243,9 +243,9 @@ public:
void SetIsThrowing(bool bIsThrowing);
protected:
virtual void CalculateHits(TArray<FHitResult>* hits) override;
virtual void CalculateHits(TArray<FHitResult>* hits, FVector* dir) override;
virtual void ProcessHits(TArray<FHitResult> hits) override;
virtual void ProcessHits(TArray<FHitResult> hits, FVector dir) override;
virtual void PlayOnFireAnimations() override;

2
Source/Nakatomi/Weapon.cpp
View File

@ -125,7 +125,7 @@ TSubclassOf<ADecalActor> AWeapon::GetDecalActor()
return DecalActor;
}
UParticleSystem* AWeapon::GetImpactParticleSystem()
UNiagaraSystem* AWeapon::GetImpactParticleSystem()
{
return ImpactParticleSystem;
}

5
Source/Nakatomi/Weapon.h
View File

@ -8,6 +8,7 @@
#include "NakatomiFieldSystemActor.h"
#include "WeaponProperties.h"
#include "WeaponThrowable.h"
#include "NiagaraSystem.h"
#include "Weapon.generated.h"
class ANakatomiCharacter;
@ -56,7 +57,7 @@ protected:
TSubclassOf<class ADecalActor> DecalActor;
UPROPERTY(EditDefaultsOnly)
UParticleSystem* ImpactParticleSystem;
UNiagaraSystem* ImpactParticleSystem;
public:
// Sets default values for this actor's properties
@ -105,5 +106,5 @@ public:
TSubclassOf<class ADecalActor> GetDecalActor();
UParticleSystem* GetImpactParticleSystem();
UNiagaraSystem* GetImpactParticleSystem();
};