From 44861ee309e2e79ee807f8361e703cbe12d0cf9f Mon Sep 17 00:00:00 2001
From: Jan-Nikjas Hartmann <hartmann@vr.rwth-aachen.de>
Date: Mon, 28 Oct 2024 16:52:43 +0100
Subject: [PATCH] Small fixes so it compiles on the CAVE PC

---
 Source/AvatarPlugin/Private/AvatarComponent.cpp | 6 +++---
 Source/AvatarPlugin/Private/CalibrationPawn.cpp | 4 ++--
 Source/AvatarPlugin/Private/RigUnits.cpp        | 4 ++--
 Source/AvatarPlugin/Public/CalibrationWidget.h  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/AvatarPlugin/Private/AvatarComponent.cpp b/Source/AvatarPlugin/Private/AvatarComponent.cpp
index 59e6d6f..bb2835c 100644
--- a/Source/AvatarPlugin/Private/AvatarComponent.cpp
+++ b/Source/AvatarPlugin/Private/AvatarComponent.cpp
@@ -512,9 +512,9 @@ void UAvatarComponent::UpdateCalibration() {
 	pawn->UpdateMeshPositions(pose);
 
 	if (waitForRelease
-		&& (shouldPressLeftTrigger && shouldPressRightTrigger && (!leftTriggerPressed || !rightTriggerPressed)
-			|| shouldPressLeftTrigger && !leftTriggerPressed
-			|| shouldPressRightTrigger && !rightTriggerPressed)) {
+		&& ((shouldPressLeftTrigger && shouldPressRightTrigger && (!leftTriggerPressed || !rightTriggerPressed))
+			|| (shouldPressLeftTrigger && !leftTriggerPressed)
+			|| (shouldPressRightTrigger && !rightTriggerPressed))) {
 
 		waitForRelease = false;
 	}
diff --git a/Source/AvatarPlugin/Private/CalibrationPawn.cpp b/Source/AvatarPlugin/Private/CalibrationPawn.cpp
index 6c52a90..f13488c 100644
--- a/Source/AvatarPlugin/Private/CalibrationPawn.cpp
+++ b/Source/AvatarPlugin/Private/CalibrationPawn.cpp
@@ -140,7 +140,7 @@ void ACalibrationPawn::SetupPlayerInputComponent(UInputComponent* PlayerInputCom
 void ACalibrationPawn::ShowMeshes(bool show) {
 	Mesh_LeftHand->SetVisibility(show);
 	Mesh_RightHand->SetVisibility(show);
-	if (!calibrationComponent || calibrationComponent && calibrationComponent->useFootControllers) {
+	if ((!calibrationComponent) || (calibrationComponent && calibrationComponent->useFootControllers)) {
 		Mesh_LeftFoot->SetVisibility(show);
 		Mesh_RightFoot->SetVisibility(show);
 	}
@@ -157,7 +157,7 @@ void ACalibrationPawn::ShowControllerModels(bool show) {
 	if (RightHand && RightControllerVis) {
 		RightControllerVis->SetIsVisualizationActive(show);
 	}
-	if (!calibrationComponent || calibrationComponent && calibrationComponent->useFootControllers) {
+	if ((!calibrationComponent) || (calibrationComponent && calibrationComponent->useFootControllers)) {
 		LeftFootControllerVis->SetIsVisualizationActive(show);
 		RightFootControllerVis->SetIsVisualizationActive(show);
 	}
diff --git a/Source/AvatarPlugin/Private/RigUnits.cpp b/Source/AvatarPlugin/Private/RigUnits.cpp
index f40f347..e8befb6 100644
--- a/Source/AvatarPlugin/Private/RigUnits.cpp
+++ b/Source/AvatarPlugin/Private/RigUnits.cpp
@@ -39,10 +39,10 @@ FRigUnit_FeetCircularMean_Execute() {
 	LeftDegIn = leftangleDeg;
 	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;
 	}
-	if (PrevRightDeg > 90.f && rightangleDeg < -90 || PrevRightDeg < -90.f && rightangleDeg > 90) {
+	if ((PrevRightDeg > 90.f && rightangleDeg < -90) || (PrevRightDeg < -90.f && rightangleDeg > 90)) {
 		SwitchMode = !SwitchMode;
 	}
 	
diff --git a/Source/AvatarPlugin/Public/CalibrationWidget.h b/Source/AvatarPlugin/Public/CalibrationWidget.h
index c679389..7ed999c 100644
--- a/Source/AvatarPlugin/Public/CalibrationWidget.h
+++ b/Source/AvatarPlugin/Public/CalibrationWidget.h
@@ -9,7 +9,7 @@
 #include "Components/CanvasPanel.h"
 #include "Components/CanvasPanelSlot.h"
 #include "Components/Image.h"
-#include "Components/Textblock.h"
+#include "Components/TextBlock.h"
 #include "Components/ProgressBar.h"
 #include "Kismet/GameplayStatics.h"
 
-- 
GitLab