Skip to content
Snippets Groups Projects
Commit 487a5db5 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Merge branch 'refactor/condense_imc' into 'dev/5.3'

refactor(pawn): Condense IMCs

See merge request vr-vis/VR-Group/unreal-development/plugins/rwth-vr-toolkit!69
parents a8334e49 70263d94
No related branches found
No related tags found
2 merge requests!80UE5.3-2023.1-rc2,!69refactor(pawn): Condense IMCs
Showing
with 1 addition and 11 deletions
No preview for this file type
File deleted
No preview for this file type
File deleted
File deleted
No preview for this file type
No preview for this file type
File deleted
No preview for this file type
File deleted
No preview for this file type
File deleted
File added
File added
File added
No preview for this file type
No preview for this file type
No preview for this file type
File deleted
......@@ -2,7 +2,6 @@
#include "CoreMinimal.h"
#include "EnhancedInputComponent.h"
#include "EnhancedInputSubsystems.h"
#include "IDisplayCluster.h"
#include "MotionControllerComponent.h"
#include "Camera/CameraComponent.h"
......@@ -165,7 +164,7 @@ void ACAVEOverlayController::BeginPlay()
// Input config
if (URWTHVRUtilities::IsPrimaryNode())
{
if (CycleDoorTypeInputAction == nullptr || IMCCaveOverlayInputMapping == nullptr)
if (CycleDoorTypeInputAction == nullptr)
{
UE_LOGFMT(LogCAVEOverlay, Error, "Input action and mapping not set in CaveOverlayController!");
return;
......@@ -174,15 +173,6 @@ void ACAVEOverlayController::BeginPlay()
UEnhancedInputComponent* Input = Cast<UEnhancedInputComponent>(PC->InputComponent);
Input->BindAction(CycleDoorTypeInputAction, ETriggerEvent::Triggered, this,
&ACAVEOverlayController::CycleDoorType);
if (const ULocalPlayer* LocalPlayer = PC->GetLocalPlayer())
{
if (UEnhancedInputLocalPlayerSubsystem* InputSystem =
LocalPlayer->GetSubsystem<UEnhancedInputLocalPlayerSubsystem>())
{
InputSystem->AddMappingContext(IMCCaveOverlayInputMapping, 0);
}
}
}
// Bind the cluster events that manage the door state.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment