ActualHorse/Unrealzilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crosshairs are now only visible when nothing is hit by the line trace, to further improve visibility.

Browse Source
This commit is contained in:
Jamie Greunbaum 2023-03-27 14:07:20 -04:00
parent da81ee271e
commit 1d15350610
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/UI/UMG_BugPlacementOverlay.uasset
View File

Binary file not shown.

6
Source/Unrealzilla/Private/BugPlacerPawn.cpp
View File

@ -94,17 +94,18 @@ void ABugPlacerPawn::TraceTimerElapsed()
if (ABugMarkerActor *Marker = Cast<ABugMarkerActor>(TraceHit.GetActor())) if (ABugMarkerActor *Marker = Cast<ABugMarkerActor>(TraceHit.GetActor()))
{ {
this->PlacementMarkerRoot->SetVisibility(true, false); this->PlacementMarkerRoot->SetVisibility(true, false);
this->ShowDummyMarker(false);
this->UpdateBugInformation(Marker->GetBugData()); this->UpdateBugInformation(Marker->GetBugData());
this->ShowDummyMarker(false);
} }
else else
{ {
this->PlacementMarkerRoot->SetVisibility(true, true); this->PlacementMarkerRoot->SetVisibility(true, true);
this->ShowDummyMarker(true);
this->UpdateBugInformation(FJSONBugData()); this->UpdateBugInformation(FJSONBugData());
this->ShowDummyMarker(true);
} }
this->PlacementMarkerRoot->SetWorldLocationAndRotation(TraceHit.ImpactPoint, FRotationMatrix::MakeFromZ(TraceHit.ImpactNormal).ToQuat()); this->PlacementMarkerRoot->SetWorldLocationAndRotation(TraceHit.ImpactPoint, FRotationMatrix::MakeFromZ(TraceHit.ImpactNormal).ToQuat());
this->ShowCrosshairs(false);
const FVector TraceOriginLocation = this->TraceOriginComponent->GetComponentLocation(); const FVector TraceOriginLocation = this->TraceOriginComponent->GetComponentLocation();
FVector FacingVector = (TraceHit.ImpactPoint - TraceOriginLocation); FVector FacingVector = (TraceHit.ImpactPoint - TraceOriginLocation);
@ -118,6 +119,7 @@ void ABugPlacerPawn::TraceTimerElapsed()
{ {
this->PlacementMarkerRoot->SetRelativeLocationAndRotation(FVector::ZeroVector, FRotator::ZeroRotator); this->PlacementMarkerRoot->SetRelativeLocationAndRotation(FVector::ZeroVector, FRotator::ZeroRotator);
this->PlacementMarkerRoot->SetVisibility(false, true); this->PlacementMarkerRoot->SetVisibility(false, true);
this->ShowCrosshairs(true);
const FVector TraceOriginLocation = this->TraceOriginComponent->GetComponentLocation(); const FVector TraceOriginLocation = this->TraceOriginComponent->GetComponentLocation();
FVector FacingVector = (TraceEnd - TraceOriginLocation); FVector FacingVector = (TraceEnd - TraceOriginLocation);

2
Source/Unrealzilla/Public/BugPlacerPawn.h
View File

@ -30,6 +30,8 @@ public:
void UpdateBugInformation(const FJSONBugData &BugData); void UpdateBugInformation(const FJSONBugData &BugData);
UFUNCTION(BlueprintImplementableEvent) UFUNCTION(BlueprintImplementableEvent)
void ShowDummyMarker(const bool bShow); void ShowDummyMarker(const bool bShow);
UFUNCTION(BlueprintImplementableEvent)
void ShowCrosshairs(const bool bShow);
UFUNCTION(BlueprintCallable, meta=(WorldContext="WorldContextObject")) UFUNCTION(BlueprintCallable, meta=(WorldContext="WorldContextObject"))
static void SpawnBugPlacerPawn(const UObject *WorldContextObject, TSubclassOf<ABugPlacerPawn> Class); static void SpawnBugPlacerPawn(const UObject *WorldContextObject, TSubclassOf<ABugPlacerPawn> Class);