From 5c91c1b48e476ba97e73424c699ed2c814317482 Mon Sep 17 00:00:00 2001 From: David Gilbert <gilbert@vr.rwth-aachen.de> Date: Tue, 26 Nov 2024 16:45:22 +0100 Subject: [PATCH] chore(utilities): Removes previously deprecated functions to get cluster components by name. --- .../Utility/RWTHVRClusterUtilities.cpp | 40 ------------------- .../Public/Utility/RWTHVRClusterUtilities.h | 9 ----- 2 files changed, 49 deletions(-) diff --git a/Source/RWTHVRCluster/Private/Utility/RWTHVRClusterUtilities.cpp b/Source/RWTHVRCluster/Private/Utility/RWTHVRClusterUtilities.cpp index 2893475..49760e9 100644 --- a/Source/RWTHVRCluster/Private/Utility/RWTHVRClusterUtilities.cpp +++ b/Source/RWTHVRCluster/Private/Utility/RWTHVRClusterUtilities.cpp @@ -70,43 +70,3 @@ EDisplayClusterEyeStereoOffset URWTHVRClusterUtilities::GetNodeEyeType() const ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor(); return (RootActor) ? RootActor->GetDefaultCamera()->GetStereoOffset() : EDisplayClusterEyeStereoOffset::None; } - -USceneComponent* URWTHVRClusterUtilities::GetClusterComponent(const FString& Name) -{ - const ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor(); - return (RootActor) ? RootActor->GetComponentByName<USceneComponent>(Name) : nullptr; -} - -USceneComponent* URWTHVRClusterUtilities::GetNamedClusterComponent(const ENamedClusterComponent& Component) -{ - switch (Component) - { - case ENamedClusterComponent::NCC_CAVE_ORIGIN: - return GetClusterComponent("cave_origin"); - case ENamedClusterComponent::NCC_CAVE_CENTER: - return GetClusterComponent("cave_center"); - case ENamedClusterComponent::NCC_CAVE_LHT: - return GetClusterComponent("left_hand_target"); - case ENamedClusterComponent::NCC_CAVE_RHT: - return GetClusterComponent("right_hand_target"); - case ENamedClusterComponent::NCC_SHUTTERGLASSES: - return GetClusterComponent("shutter_glasses"); - case ENamedClusterComponent::NCC_ROLV_ORIGIN: - return GetClusterComponent("rolv_origin"); - case ENamedClusterComponent::NCC_FLYSTICK: - return GetClusterComponent("flystick"); - case ENamedClusterComponent::NCC_CALIBRATIO: - return GetClusterComponent("calibratio"); - case ENamedClusterComponent::NCC_TRACKING_ORIGIN: - USceneComponent* Result; - if ((Result = GetClusterComponent("cave_origin"))) - return Result; - if ((Result = GetClusterComponent("rolv_origin"))) - return Result; - if ((Result = GetClusterComponent("tdw_origin_floor"))) - return Result; - return nullptr; - default: - return nullptr; - } -} diff --git a/Source/RWTHVRCluster/Public/Utility/RWTHVRClusterUtilities.h b/Source/RWTHVRCluster/Public/Utility/RWTHVRClusterUtilities.h index 0ead84a..ded7d9d 100644 --- a/Source/RWTHVRCluster/Public/Utility/RWTHVRClusterUtilities.h +++ b/Source/RWTHVRCluster/Public/Utility/RWTHVRClusterUtilities.h @@ -58,13 +58,4 @@ public: UFUNCTION(BlueprintPure, Category = "RWTHVRCluster") static EDisplayClusterEyeStereoOffset GetNodeEyeType(); - - // Get Component of Display Cluster by it's name, which is specified in the nDisplay config - UE_DEPRECATED(5.4, "GetClusterComponent has been removed because it is obsolete.") - UFUNCTION(BlueprintPure, BlueprintCallable, Category = "RWTHVRCluster", meta = (DeprecatedFunction)) - static USceneComponent* GetClusterComponent(const FString& Name); - - UE_DEPRECATED(5.4, "GetNamedClusterComponent has been removed because it is obsolete.") - UFUNCTION(BlueprintPure, BlueprintCallable, Category = "RWTHVRCluster", meta = (DeprecatedFunction)) - static USceneComponent* GetNamedClusterComponent(const ENamedClusterComponent& Component); }; -- GitLab