Skip to content
Snippets Groups Projects
Commit 44861ee3 authored by Jan-Nikjas Hartmann's avatar Jan-Nikjas Hartmann
Browse files

Small fixes so it compiles on the CAVE PC

parent 148f5ab5
Branches 5.3
No related tags found
No related merge requests found
...@@ -512,9 +512,9 @@ void UAvatarComponent::UpdateCalibration() { ...@@ -512,9 +512,9 @@ void UAvatarComponent::UpdateCalibration() {
pawn->UpdateMeshPositions(pose); pawn->UpdateMeshPositions(pose);
if (waitForRelease if (waitForRelease
&& (shouldPressLeftTrigger && shouldPressRightTrigger && (!leftTriggerPressed || !rightTriggerPressed) && ((shouldPressLeftTrigger && shouldPressRightTrigger && (!leftTriggerPressed || !rightTriggerPressed))
|| shouldPressLeftTrigger && !leftTriggerPressed || (shouldPressLeftTrigger && !leftTriggerPressed)
|| shouldPressRightTrigger && !rightTriggerPressed)) { || (shouldPressRightTrigger && !rightTriggerPressed))) {
waitForRelease = false; waitForRelease = false;
} }
......
...@@ -140,7 +140,7 @@ void ACalibrationPawn::SetupPlayerInputComponent(UInputComponent* PlayerInputCom ...@@ -140,7 +140,7 @@ void ACalibrationPawn::SetupPlayerInputComponent(UInputComponent* PlayerInputCom
void ACalibrationPawn::ShowMeshes(bool show) { void ACalibrationPawn::ShowMeshes(bool show) {
Mesh_LeftHand->SetVisibility(show); Mesh_LeftHand->SetVisibility(show);
Mesh_RightHand->SetVisibility(show); Mesh_RightHand->SetVisibility(show);
if (!calibrationComponent || calibrationComponent && calibrationComponent->useFootControllers) { if ((!calibrationComponent) || (calibrationComponent && calibrationComponent->useFootControllers)) {
Mesh_LeftFoot->SetVisibility(show); Mesh_LeftFoot->SetVisibility(show);
Mesh_RightFoot->SetVisibility(show); Mesh_RightFoot->SetVisibility(show);
} }
...@@ -157,7 +157,7 @@ void ACalibrationPawn::ShowControllerModels(bool show) { ...@@ -157,7 +157,7 @@ void ACalibrationPawn::ShowControllerModels(bool show) {
if (RightHand && RightControllerVis) { if (RightHand && RightControllerVis) {
RightControllerVis->SetIsVisualizationActive(show); RightControllerVis->SetIsVisualizationActive(show);
} }
if (!calibrationComponent || calibrationComponent && calibrationComponent->useFootControllers) { if ((!calibrationComponent) || (calibrationComponent && calibrationComponent->useFootControllers)) {
LeftFootControllerVis->SetIsVisualizationActive(show); LeftFootControllerVis->SetIsVisualizationActive(show);
RightFootControllerVis->SetIsVisualizationActive(show); RightFootControllerVis->SetIsVisualizationActive(show);
} }
......
...@@ -39,10 +39,10 @@ FRigUnit_FeetCircularMean_Execute() { ...@@ -39,10 +39,10 @@ FRigUnit_FeetCircularMean_Execute() {
LeftDegIn = leftangleDeg; LeftDegIn = leftangleDeg;
RightDegIn = rightangleDeg; RightDegIn = rightangleDeg;
if (PrevLeftDeg > 90.f && leftangleDeg < -90 || PrevLeftDeg < -90.f && leftangleDeg > 90) { if ((PrevLeftDeg > 90.f && leftangleDeg < -90) || (PrevLeftDeg < -90.f && leftangleDeg > 90)) {
SwitchMode = !SwitchMode; SwitchMode = !SwitchMode;
} }
if (PrevRightDeg > 90.f && rightangleDeg < -90 || PrevRightDeg < -90.f && rightangleDeg > 90) { if ((PrevRightDeg > 90.f && rightangleDeg < -90) || (PrevRightDeg < -90.f && rightangleDeg > 90)) {
SwitchMode = !SwitchMode; SwitchMode = !SwitchMode;
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "Components/CanvasPanel.h" #include "Components/CanvasPanel.h"
#include "Components/CanvasPanelSlot.h" #include "Components/CanvasPanelSlot.h"
#include "Components/Image.h" #include "Components/Image.h"
#include "Components/Textblock.h" #include "Components/TextBlock.h"
#include "Components/ProgressBar.h" #include "Components/ProgressBar.h"
#include "Kismet/GameplayStatics.h" #include "Kismet/GameplayStatics.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment