From fa7570e6fa51cb65171ea6db3b9647f8c9f6da3c Mon Sep 17 00:00:00 2001
From: Sebastian Pape <Sebastian.Pape@rwth-aachen.de>
Date: Fri, 13 Sep 2019 10:52:19 +0200
Subject: [PATCH] Cleaned up and readded F10 Binding
---
Content/DoorOverlay.uasset | Bin 21406 -> 21302 bytes
.../Private/CAVEOverlayController.cpp | 29 ++++++++++--------
.../CAVEOverlay/Private/DoorOverlayData.cpp | 5 ---
3 files changed, 16 insertions(+), 18 deletions(-)
delete mode 100644 Source/CAVEOverlay/Private/DoorOverlayData.cpp
diff --git a/Content/DoorOverlay.uasset b/Content/DoorOverlay.uasset
index 16120de5acd753b3846a98ed20e35e3121557c7a..54882e27755333031706fbdd602fd809f3b146f8 100644
GIT binary patch
delta 5045
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
delta 5144
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
Ni~w>PIoPZ<4*)^?UYh^_
diff --git a/Source/CAVEOverlay/Private/CAVEOverlayController.cpp b/Source/CAVEOverlay/Private/CAVEOverlayController.cpp
index 0c667b6..d15ec0f 100644
--- a/Source/CAVEOverlay/Private/CAVEOverlayController.cpp
+++ b/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(""));
- }
}
diff --git a/Source/CAVEOverlay/Private/DoorOverlayData.cpp b/Source/CAVEOverlay/Private/DoorOverlayData.cpp
deleted file mode 100644
index 9ef86d7..0000000
--- a/Source/CAVEOverlay/Private/DoorOverlayData.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "DoorOverlayData.h"
-
--
GitLab