Cleaned up and readded F10 Binding

Source/CAVEOverlay/Private/CAVEOverlayController.cpp

@@ -21,11 +21,11 @@
 DEFINE_LOG_CATEGORY(LogCAVEOverlay);
 
 template <std::size_t S>
-bool ContainsFString(const std::array<FString, S>& A, const FString& Entry)
+bool ContainsFString(const std::array<FString, S>& Array, const FString& Entry)
 {
-	for (FString CS : A)
+	for (FString Current_Entry : Array)
 	{
-		if (CS.Equals(Entry, ESearchCase::IgnoreCase)) return true;
+		if (Current_Entry.Equals(Entry, ESearchCase::IgnoreCase)) return true;
 	}
 	return false;
 }
@@ -188,6 +188,7 @@ void ACAVEOverlayController::BeginPlay()
 
 	//Input config
 	InputComponent->BindAction("Action4", EInputEvent::IE_Pressed, this, &ACAVEOverlayController::CycleDoorType);
+	InputComponent->BindKey(EKeys::F10, EInputEvent::IE_Pressed, this, &ACAVEOverlayController::CycleDoorType);
 
 	//Determine the screen-type for later usage
 	if (IDisplayCluster::Get().GetClusterMgr()->GetNodeId().Equals(Screen_Main, ESearchCase::IgnoreCase))
@@ -261,6 +262,18 @@ void ACAVEOverlayController::Tick(float DeltaTime)
 		bAttached = true;
 	}
 
+	//FPS Counter
+	if (Overlay) {
+		if (Door_Current_Mode == EDoor_Mode::DOOR_DEBUG && ContainsFString(Screens_FPS, IDisplayCluster::Get().GetClusterMgr()->GetNodeId()))
+		{
+			Overlay->FPS->SetText(FText::FromString(FString::Printf(TEXT("FPS: %.1f"), 1.0f / DeltaTime)));
+		}
+		else
+		{
+			Overlay->FPS->SetText(FText::FromString(""));
+		}
+	}
+	
 	if (!Shutter_Glasses) return; //Display Cluster not initialized
 
 	//Tape Logic
@@ -317,14 +330,4 @@ void ACAVEOverlayController::Tick(float DeltaTime)
 		Sign_Positive_X->SetVisibility(false);
 		Sign_Positive_Y->SetVisibility(false);
 	}
-
-	//FPS
-	if (Overlay && EDoor_Mode::DOOR_DEBUG && ContainsFString(Screens_FPS, IDisplayCluster::Get().GetClusterMgr()->GetNodeId()))
-	{
-		Overlay->FPS->SetText(FText::FromString(FString::Printf(TEXT("FPS: %.1f"), 1.0f / DeltaTime)));
-	}
-	else
-	{
-		Overlay->FPS->SetText(FText::FromString(""));
-	}
 }

Source/CAVEOverlay/Private/DoorOverlayData.cpp

-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "DoorOverlayData.h"
-