Skip to content
Snippets Groups Projects
Commit 73c75e1c authored by Marcel Krüger's avatar Marcel Krüger Committed by David Gilbert
Browse files

Applied comment line number changes

parent f36b1dd7
No related branches found
No related tags found
1 merge request!36Huge reformatting / cosmetic fixes commit.
...@@ -221,8 +221,8 @@ void ACAVEOverlayController::BeginPlay() ...@@ -221,8 +221,8 @@ void ACAVEOverlayController::BeginPlay()
Overlay = CreateWidget<UDoorOverlayData>(GetWorld()->GetFirstPlayerController(), OverlayClass); Overlay = CreateWidget<UDoorOverlayData>(GetWorld()->GetFirstPlayerController(), OverlayClass);
Overlay->AddToViewport(0); Overlay->AddToViewport(0);
SetDoorMode(DoorCurrentMode); SetDoorMode(DoorCurrentMode);
Overlay->CornerText->SetText(FText::FromString(""));
//Set Text to "" until someone presses the key for the first time //Set Text to "" until someone presses the key for the first time
Overlay->CornerText->SetText(FText::FromString(""));
if (!bAttachedToCAVEOrigin && CaveOrigin) if (!bAttachedToCAVEOrigin && CaveOrigin)
{ {
...@@ -252,10 +252,11 @@ float ACAVEOverlayController::CalculateOpacityFromPosition(const FVector& Positi ...@@ -252,10 +252,11 @@ float ACAVEOverlayController::CalculateOpacityFromPosition(const FVector& Positi
bool ACAVEOverlayController::PositionInDoorOpening(const FVector& Position) const bool ACAVEOverlayController::PositionInDoorOpening(const FVector& Position) const
{ {
return FMath::IsWithinInclusive(-Position.X, WallDistance + 10 - 20 - WallCloseDistance, WallDistance + 10)
//Overlap both sides 10cm //Overlap both sides 10cm
return FMath::IsWithinInclusive(-Position.X, WallDistance + 10 - 20 - WallCloseDistance, WallDistance + 10)
//Overlap one side 10cm
&& FMath::IsWithinInclusive(-Position.Y, WallDistance + 10 - DoorCurrentOpeningWidthAbsolute, && FMath::IsWithinInclusive(-Position.Y, WallDistance + 10 - DoorCurrentOpeningWidthAbsolute,
WallDistance + 10); //Overlap one side 10cm WallDistance + 10);
} }
// Called every frame // Called every frame
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
void FActivateConsoleInShipping::Register() void FActivateConsoleInShipping::Register()
{ {
if (FApp::GetBuildConfiguration() != EBuildConfiguration::Shipping) return;
/* Should only enable console in shipping */ /* Should only enable console in shipping */
if (FApp::GetBuildConfiguration() != EBuildConfiguration::Shipping) return;
On_Post_World_Initialization_Delegate.BindRaw(this, &FActivateConsoleInShipping::OnSessionStart); On_Post_World_Initialization_Delegate.BindRaw(this, &FActivateConsoleInShipping::OnSessionStart);
StartHandle = FWorldDelegates::OnPostWorldInitialization.Add(On_Post_World_Initialization_Delegate); StartHandle = FWorldDelegates::OnPostWorldInitialization.Add(On_Post_World_Initialization_Delegate);
......
...@@ -207,7 +207,7 @@ void AVirtualRealityPawn::UpdateRightHandForDesktopInteraction() const ...@@ -207,7 +207,7 @@ void AVirtualRealityPawn::UpdateRightHandForDesktopInteraction() const
// Todo rewrite this in some other way or attach it differently, this is horrible // Todo rewrite this in some other way or attach it differently, this is horrible
void AVirtualRealityPawn::AttachDCRAtoPawn() void AVirtualRealityPawn::AttachDCRAtoPawn()
{ {
if (!CaveSetupActorClass->IsValidLowLevelFast()) if (!CaveSetupActorClass || !CaveSetupActorClass->IsValidLowLevelFast())
{ {
UE_LOGFMT(Toolkit, Warning, "No CaveSetup Actor class set in pawn!"); UE_LOGFMT(Toolkit, Warning, "No CaveSetup Actor class set in pawn!");
return; return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment