From bb07804aab6ab3d9fbd8c38eceb6a3fcf101b4bc Mon Sep 17 00:00:00 2001 From: Daniel Rupp <daniel.rupp@rwth-aachen.de> Date: Fri, 28 Jul 2023 12:49:11 +0200 Subject: [PATCH] custom logging stream, removed unused inclued which results in failed cave pipeline --- .../Private/Pawn/ContinuousMovementComponent.cpp | 6 +++--- Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp | 4 ++-- Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp | 1 - .../Private/Utility/VirtualRealityUtilities.cpp | 3 +++ Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h | 5 ----- .../Public/Utility/VirtualRealityUtilities.h | 8 ++++++++ 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Source/RWTHVRToolkit/Private/Pawn/ContinuousMovementComponent.cpp b/Source/RWTHVRToolkit/Private/Pawn/ContinuousMovementComponent.cpp index 9177fb24..7630cb33 100644 --- a/Source/RWTHVRToolkit/Private/Pawn/ContinuousMovementComponent.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/ContinuousMovementComponent.cpp @@ -38,7 +38,7 @@ void UContinuousMovementComponent::SetupInputActions() UEnhancedInputLocalPlayerSubsystem* InputSubsystem = ULocalPlayer::GetSubsystem<UEnhancedInputLocalPlayerSubsystem>(PlayerController->GetLocalPlayer()); if(!InputSubsystem) { - UE_LOG(LogTemp,Error,TEXT("InputSubsystem IS NOT VALID")); + UE_LOG(Toolkit,Error,TEXT("InputSubsystem IS NOT VALID")); return; } // add Input Mapping context @@ -47,7 +47,7 @@ void UContinuousMovementComponent::SetupInputActions() UEnhancedInputComponent* EI = Cast<UEnhancedInputComponent>(VRPawn->InputComponent); if(!EI) { - UE_LOG(LogTemp,Error,TEXT("Cannot cast Input Component to Enhanced Inpu Component in VRPawnMovement")); + UE_LOG(Toolkit,Error,TEXT("Cannot cast Input Component to Enhanced Inpu Component in VRPawnMovement")); return; } @@ -180,5 +180,5 @@ void UContinuousMovementComponent::OnBeginUp(const FInputActionValue& Value) { const float MoveValue = Value.Get<FVector2D>().X; //the right hand is rotated on desktop to follow the cursor so it's forward is also changing with cursor position - VRPawn->AddMovementInput(VRPawn->Head->GetUpVector(), MoveValue); + VRPawn->AddMovementInput(FVector::UpVector, MoveValue); } diff --git a/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp b/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp index 4b32da47..f1b4720d 100644 --- a/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp @@ -130,11 +130,11 @@ void UVRPawnMovement::ShiftVertically(float DiffernceDistance, float VerticalAcc VerticalSpeed += VerticalAcceleration * DeltaSeconds; if (VerticalSpeed*DeltaSeconds < DiffernceDistance) { - UpdatedComponent->AddLocalOffset(FVector(0.f, 0.f, Direction * VerticalSpeed * DeltaSeconds)); + UpdatedComponent->AddWorldOffset(FVector(0.f, 0.f, Direction * VerticalSpeed * DeltaSeconds)); } else { - UpdatedComponent->AddLocalOffset(FVector(0.f, 0.f, Direction * DiffernceDistance)); + UpdatedComponent->AddWorldOffset(FVector(0.f, 0.f, Direction * DiffernceDistance)); VerticalSpeed = 0; } } diff --git a/Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp b/Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp index c94916dc..276cfb1f 100644 --- a/Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp @@ -2,7 +2,6 @@ #include "Pawn/VirtualRealityPawn.h" -#include "AITypes.h" #include "Engine/LocalPlayer.h" #include "GameFramework/PlayerController.h" #include "Pawn/UniversalTrackedComponent.h" diff --git a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp index 01f92157..4beeb13e 100644 --- a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp +++ b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp @@ -15,6 +15,9 @@ #include "IHeadMountedDisplay.h" #include "AudioDevice.h" + +DEFINE_LOG_CATEGORY(Toolkit); + bool UVirtualRealityUtilities::IsDesktopMode() { return !IsRoomMountedMode() && !IsHeadMountedMode(); diff --git a/Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h b/Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h index aff028d9..01e71bae 100644 --- a/Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h +++ b/Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h @@ -12,11 +12,6 @@ class UCameraComponent; class ULiveLinkComponentController; -/** - * Custom logging for all RWTHToolkit related stuff - */ - - /** * */ diff --git a/Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h b/Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h index 9e49046b..19e7a719 100644 --- a/Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h +++ b/Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h @@ -5,6 +5,14 @@ #include "UObject/ConstructorHelpers.h" #include "VirtualRealityUtilities.generated.h" + + +/** + * Custom log category for all RWTHVRToolkit related components + */ +DECLARE_LOG_CATEGORY_EXTERN(Toolkit, Log, All); + + UENUM(BlueprintType) enum class ENamedClusterComponent : uint8 { -- GitLab