Skip to content
Snippets Groups Projects
Commit bb07804a authored by Daniel Rupp's avatar Daniel Rupp
Browse files

custom logging stream, removed unused inclued which results in failed cave pipeline

parent 318f30f5
No related branches found
No related tags found
1 merge request!13Draft: Improve walking implementation
...@@ -38,7 +38,7 @@ void UContinuousMovementComponent::SetupInputActions() ...@@ -38,7 +38,7 @@ void UContinuousMovementComponent::SetupInputActions()
UEnhancedInputLocalPlayerSubsystem* InputSubsystem = ULocalPlayer::GetSubsystem<UEnhancedInputLocalPlayerSubsystem>(PlayerController->GetLocalPlayer()); UEnhancedInputLocalPlayerSubsystem* InputSubsystem = ULocalPlayer::GetSubsystem<UEnhancedInputLocalPlayerSubsystem>(PlayerController->GetLocalPlayer());
if(!InputSubsystem) if(!InputSubsystem)
{ {
UE_LOG(LogTemp,Error,TEXT("InputSubsystem IS NOT VALID")); UE_LOG(Toolkit,Error,TEXT("InputSubsystem IS NOT VALID"));
return; return;
} }
// add Input Mapping context // add Input Mapping context
...@@ -47,7 +47,7 @@ void UContinuousMovementComponent::SetupInputActions() ...@@ -47,7 +47,7 @@ void UContinuousMovementComponent::SetupInputActions()
UEnhancedInputComponent* EI = Cast<UEnhancedInputComponent>(VRPawn->InputComponent); UEnhancedInputComponent* EI = Cast<UEnhancedInputComponent>(VRPawn->InputComponent);
if(!EI) 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; return;
} }
...@@ -180,5 +180,5 @@ void UContinuousMovementComponent::OnBeginUp(const FInputActionValue& Value) ...@@ -180,5 +180,5 @@ void UContinuousMovementComponent::OnBeginUp(const FInputActionValue& Value)
{ {
const float MoveValue = Value.Get<FVector2D>().X; 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 //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);
} }
...@@ -130,11 +130,11 @@ void UVRPawnMovement::ShiftVertically(float DiffernceDistance, float VerticalAcc ...@@ -130,11 +130,11 @@ void UVRPawnMovement::ShiftVertically(float DiffernceDistance, float VerticalAcc
VerticalSpeed += VerticalAcceleration * DeltaSeconds; VerticalSpeed += VerticalAcceleration * DeltaSeconds;
if (VerticalSpeed*DeltaSeconds < DiffernceDistance) 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 else
{ {
UpdatedComponent->AddLocalOffset(FVector(0.f, 0.f, Direction * DiffernceDistance)); UpdatedComponent->AddWorldOffset(FVector(0.f, 0.f, Direction * DiffernceDistance));
VerticalSpeed = 0; VerticalSpeed = 0;
} }
} }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#include "Pawn/VirtualRealityPawn.h" #include "Pawn/VirtualRealityPawn.h"
#include "AITypes.h"
#include "Engine/LocalPlayer.h" #include "Engine/LocalPlayer.h"
#include "GameFramework/PlayerController.h" #include "GameFramework/PlayerController.h"
#include "Pawn/UniversalTrackedComponent.h" #include "Pawn/UniversalTrackedComponent.h"
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
#include "IHeadMountedDisplay.h" #include "IHeadMountedDisplay.h"
#include "AudioDevice.h" #include "AudioDevice.h"
DEFINE_LOG_CATEGORY(Toolkit);
bool UVirtualRealityUtilities::IsDesktopMode() bool UVirtualRealityUtilities::IsDesktopMode()
{ {
return !IsRoomMountedMode() && !IsHeadMountedMode(); return !IsRoomMountedMode() && !IsHeadMountedMode();
......
...@@ -12,11 +12,6 @@ class UCameraComponent; ...@@ -12,11 +12,6 @@ class UCameraComponent;
class ULiveLinkComponentController; class ULiveLinkComponentController;
/**
* Custom logging for all RWTHToolkit related stuff
*/
/** /**
* *
*/ */
......
...@@ -5,6 +5,14 @@ ...@@ -5,6 +5,14 @@
#include "UObject/ConstructorHelpers.h" #include "UObject/ConstructorHelpers.h"
#include "VirtualRealityUtilities.generated.h" #include "VirtualRealityUtilities.generated.h"
/**
* Custom log category for all RWTHVRToolkit related components
*/
DECLARE_LOG_CATEGORY_EXTERN(Toolkit, Log, All);
UENUM(BlueprintType) UENUM(BlueprintType)
enum class ENamedClusterComponent : uint8 enum class ENamedClusterComponent : uint8
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment