ShibaGit/M4_CPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Minor - Petit changement pour le spawn des balles"

Browse Source 
This reverts commit 406bafff0a.
This commit is contained in:
NisemonoQ
2025-10-30 22:44:26 +01:00
parent 406bafff0a
commit ed5475299e
4 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/.idea.M4_CPP.dir/.idea/.name generated
View File

@@ -1 +0,0 @@
M4_CPP

1
Source/M4_CPP/private/M4_PlayerPawn.cpp
View File

@@ -97,7 +97,6 @@ void AM4_PlayerPawn::Shoot(const FInputActionInstance& Inst)
const FRotator InitialRotation = FRotator(0.f); const FRotator InitialRotation = FRotator(0.f);
AM4_Projectile* Projectile = World->SpawnActor<AM4_Projectile>(Proj, InitialLocation, InitialRotation, SpawnParams); AM4_Projectile* Projectile = World->SpawnActor<AM4_Projectile>(Proj, InitialLocation, InitialRotation, SpawnParams);
FVector LaunchDirection = FVector(InitialLocation); FVector LaunchDirection = FVector(InitialLocation);
if (Projectile) if (Projectile)

32
Source/M4_CPP/private/M4_Projectile.cpp
View File

@@ -6,7 +6,6 @@
// Sets default values // Sets default values
AM4_Projectile::AM4_Projectile() AM4_Projectile::AM4_Projectile()
{ {
PrimaryActorTick.bCanEverTick = true; PrimaryActorTick.bCanEverTick = true;
if(!RootComponent) if(!RootComponent)
@@ -20,6 +19,7 @@ AM4_Projectile::AM4_Projectile()
RootComponent = CollisionComp; RootComponent = CollisionComp;
} }
if(!ProjectileMovementComponent) if(!ProjectileMovementComponent)
{ {
ProjectileMovementComponent = CreateDefaultSubobject<UProjectileMovementComponent>(TEXT("ProjectileMovementComponent")); ProjectileMovementComponent = CreateDefaultSubobject<UProjectileMovementComponent>(TEXT("ProjectileMovementComponent"));
@@ -29,20 +29,17 @@ AM4_Projectile::AM4_Projectile()
ProjectileMovementComponent->bRotationFollowsVelocity = false; ProjectileMovementComponent->bRotationFollowsVelocity = false;
ProjectileMovementComponent->bShouldBounce = false; ProjectileMovementComponent->bShouldBounce = false;
ProjectileMovementComponent->ProjectileGravityScale = 0.0f; ProjectileMovementComponent->ProjectileGravityScale = 0.0f;
LastMove = GetActorLocation();
} }
if (!ProjectileMeshComponent) if (ProjectileMovementComponent)
{ {
ProjectileMeshComponent = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("ProjectileMeshComponent")); ProjectileMeshComponent = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("ProjectileMeshComponent"));
static ConstructorHelpers::FObjectFinder<UStaticMesh> Mesh(TEXT("/Game/CTP/04_Mesh/SM_Projectile.SM_Projectile")); static ConstructorHelpers::FObjectFinder<UStaticMesh> Mesh(TEXT("/Game/CTP/04_Mesh/SM_Projectile.SM_Projectile"));
if(Mesh.Succeeded()) if(Mesh.Succeeded())
{ {
ProjectileMeshComponent->SetStaticMesh(Mesh.Object); ProjectileMeshComponent->SetStaticMesh(Mesh.Object);
GEngine->AddOnScreenDebugMessage(-1, 5.0f, FColor::Blue, TEXT("Using the Wand!")); }
}
static ConstructorHelpers::FObjectFinder<UMaterial> Material(TEXT("/Game/CTP/05_Material/M_Player.M_Player")); static ConstructorHelpers::FObjectFinder<UMaterial> Material(TEXT("/Game/CTP/05_Material/M_Player.M_Player"));
if (Material.Succeeded()) if (Material.Succeeded())
@@ -52,24 +49,20 @@ AM4_Projectile::AM4_Projectile()
ProjectileMeshComponent->SetMaterial(0, ProjectileMat); ProjectileMeshComponent->SetMaterial(0, ProjectileMat);
ProjectileMeshComponent->SetRelativeScale3D(FVector(.2f, .2f, .25f)); ProjectileMeshComponent->SetRelativeScale3D(FVector(.2f, .2f, .25f));
//ProjectileMeshComponent->SetRelativeLocation();
ProjectileMeshComponent->SetMobility(EComponentMobility::Movable); ProjectileMeshComponent->SetMobility(EComponentMobility::Movable);
ProjectileMeshComponent->SetupAttachment(RootComponent); ProjectileMeshComponent->SetupAttachment(RootComponent);
GEngine->AddOnScreenDebugMessage(-1, 5.0f, FColor::Blue, TEXT("Using the Wand!"));
} }
} //InitialLifeSpan = 2.f;
void AM4_Projectile::BeginPlay()
{
Super::BeginPlay();
LastMove = GetActorLocation();
SetActorLocation(LastMove);
} }
void AM4_Projectile::ShootDirection(const FVector& ShootDir) void AM4_Projectile::ShootDirection(const FVector& ShootDir)
{ {
ProjectileMovementComponent->Velocity = -1.f * (ShootDir * ProjectileMovementComponent->InitialSpeed); ProjectileMovementComponent->Velocity = -1.f * (ShootDir * ProjectileMovementComponent->InitialSpeed);
} }
void AM4_Projectile::OnHit(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector Impulse, const FHitResult& Hit) void AM4_Projectile::OnHit(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector Impulse, const FHitResult& Hit)
@@ -81,4 +74,5 @@ void AM4_Projectile::OnHit(UPrimitiveComponent* HitComp, AActor* OtherActor, UPr
void AM4_Projectile::Tick( float DeltaTime ) void AM4_Projectile::Tick( float DeltaTime )
{ {
Super::Tick( DeltaTime ); Super::Tick( DeltaTime );
} }

10
Source/M4_CPP/public/M4_Projectile.h
View File

@@ -13,26 +13,24 @@ class M4_CPP_API AM4_Projectile : public AActor
{ {
GENERATED_BODY() GENERATED_BODY()
UPROPERTY(VisibleAnywhere, Category = Movement)
UProjectileMovementComponent* ProjectileMovementComponent;
public: public:
AM4_Projectile(); AM4_Projectile();
virtual void BeginPlay() override;
virtual void Tick( float DeltaTime ) override; virtual void Tick( float DeltaTime ) override;
UPROPERTY(VisibleDefaultsOnly, Category = Projectile) UPROPERTY(VisibleDefaultsOnly, Category = Projectile)
UMeshComponent* CollisionComp; UMeshComponent* CollisionComp;
UPROPERTY(VisibleAnywhere, Category = Movement)
UProjectileMovementComponent* ProjectileMovementComponent;
UPROPERTY(VisibleDefaultsOnly, Category = Projectile) UPROPERTY(VisibleDefaultsOnly, Category = Projectile)
UStaticMeshComponent* ProjectileMeshComponent; UStaticMeshComponent* ProjectileMeshComponent;
UPROPERTY(VisibleDefaultsOnly, Category = Movement) UPROPERTY(VisibleDefaultsOnly, Category = Movement)
UMaterialInstanceDynamic* ProjectileMat; UMaterialInstanceDynamic* ProjectileMat;
FVector LastMove = FVector::ZeroVector;
void ShootDirection(const FVector& ShootDir); void ShootDirection(const FVector& ShootDir);
void OnHit(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,FVector Impulse, const FHitResult& Hit); void OnHit(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp,FVector Impulse, const FHitResult& Hit);