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

Compare commits

base: baz:18ab3a54346dc514647ecc9da63cad857759124f
Branches Tags
baz:master
..
compare: baz:e2e32e009234a8c66c16dad11aeeba6582899c99
Branches Tags
baz:master

No commits in common. "18ab3a54346dc514647ecc9da63cad857759124f" and "e2e32e009234a8c66c16dad11aeeba6582899c99" have entirely different histories.
18ab3a5434 ... e2e32e0092

11 changed files with 14 additions and 25 deletions
Show Stats Expand all files Collapse all files

BIN
Content/Assets/Keycard/M_KeycardBody.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Keycard/M_KeycardIndent.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Keycard/SM_Keycard.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/HealthPickups/HealthCross.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/HealthPickups/HealthPickupMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/HealthPickups/TestHealthPickup.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Pickups/HealthPickups/HealthCross.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Pickups/HealthPickups/HealthPickupMaterial.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Pickups/HealthPickups/TestHealthPickup.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Pickups/LevelKeyPickups/RedKeycardPickup.uasset (Stored with Git LFS)
View File

Binary file not shown.

9
Source/Nakatomi/StaticMeshPickup.cpp
View File

@ -14,8 +14,9 @@ AStaticMeshPickup::AStaticMeshPickup()
void AStaticMeshPickup::BeginPlay() void AStaticMeshPickup::BeginPlay()
{ {
Super::BeginPlay(); Super::BeginPlay();
StartingLocation = StaticMeshComponent->GetRelativeLocation(); StaticMeshComponent->SetWorldLocation(this->GetActorLocation());
StartingLocation = this->GetActorLocation();
StaticMeshComponent->SetCollisionProfileName(FName("NoCollision")); StaticMeshComponent->SetCollisionProfileName(FName("NoCollision"));
} }
@ -25,10 +26,10 @@ void AStaticMeshPickup::Tick(float DeltaTime)
if (StaticMeshComponent) if (StaticMeshComponent)
{ {
// Rotate StaticMesh in desired direction // Rotate Weapon in desired direction
StaticMeshComponent->AddLocalRotation((SpinRotation * RotationSpeed) * DeltaTime); StaticMeshComponent->AddLocalRotation((SpinRotation * RotationSpeed) * DeltaTime);
// Bob StaticMesh up and down // Bob weapon up and down
const float Time = GetWorld()->GetRealTimeSeconds(); const float Time = GetWorld()->GetRealTimeSeconds();
const float Sine = FMath::Abs(FMath::Sin(Time * MovementSpeed)); const float Sine = FMath::Abs(FMath::Sin(Time * MovementSpeed));
StaticMeshComponent->SetRelativeLocation(StartingLocation + ((MovementDirection * Sine) * MovementDistance)); StaticMeshComponent->SetRelativeLocation(StartingLocation + ((MovementDirection * Sine) * MovementDistance));