Compare commits

..

No commits in common. "e8d7c49a4e29d846443c49d0a90fa5ab84d9063f" and "9b0cfbecc359f03134c0bfb493072c1c515320e4" have entirely different histories.

2 changed files with 5 additions and 26 deletions

View File

@ -4,13 +4,12 @@
#include "Pickup.h"
#include "PlayerCharacter.h"
#include "Kismet/GameplayStatics.h"
// Sets default values
APickup::APickup()
{
// Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it.
PrimaryActorTick.bCanEverTick = true;
// Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it.
PrimaryActorTick.bCanEverTick = false;
// Create Sphere Component
SphereComponent = CreateDefaultSubobject<USphereComponent>(TEXT("Sphere Component"));
@ -30,22 +29,10 @@ void APickup::Tick(float DeltaSeconds)
Super::Tick(DeltaSeconds);
// TODO: Move actor towards player when in range
FVector actorLocation = GetActorLocation();
FVector playerLocation = UGameplayStatics::GetPlayerCharacter(GetWorld(), 0)->GetActorLocation();
double currentDistance = FVector::Distance(actorLocation, playerLocation);
if (currentDistance <= PickupMovementRange)
{
double speed = 400 / currentDistance;
UE_LOG(LogTemp, Warning, TEXT("The integer value is: %f"), speed);
FVector location = FMath::VInterpTo(actorLocation, playerLocation, DeltaSeconds, speed);
SetActorLocation(location);
}
}
void APickup::OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
const FHitResult& SweepResult)
UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
{
if (APlayerCharacter* PlayerCharacter = Cast<APlayerCharacter>(OtherActor))
{
@ -53,3 +40,4 @@ void APickup::OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* O
Destroy();
}
}

View File

@ -12,14 +12,6 @@ class VAMPIRES_API APickup : public AActor
{
GENERATED_BODY()
public:
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
double PickupMovementRange = 500;
UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
double PickupMovementSpeed = 1000;
private:
UPROPERTY()
USphereComponent* SphereComponent;
@ -35,7 +27,6 @@ protected:
public:
virtual void Tick(float DeltaSeconds) override;
UFUNCTION()
virtual void OnBeginOverlap(UPrimitiveComponent* OverlappedComponent, AActor* OtherActor,
UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep,
const FHitResult& SweepResult);