From 946c1062b527b8a9548cc6d33cba0d2151898d90 Mon Sep 17 00:00:00 2001
From: jwendt <wendt@vr.rwth-aachen.de>
Date: Tue, 26 Jun 2018 15:26:54 +0200
Subject: [PATCH] Fix integration_test_hmd images to new specular value and
male clang happy
---
library/phx/input/vr_controller.cpp | 4 +---
tests/reference_images/hmd_test_left.png | 4 ++--
tests/reference_images/hmd_test_right.png | 4 ++--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/library/phx/input/vr_controller.cpp b/library/phx/input/vr_controller.cpp
index e677c72c..97d39c52 100644
--- a/library/phx/input/vr_controller.cpp
+++ b/library/phx/input/vr_controller.cpp
@@ -114,7 +114,7 @@ glm::vec2 VRController::GetAxesValue(AxesId axes_id) {
vr_system_->GetInt32TrackedDeviceProperty(
id_, static_cast<vr::ETrackedDeviceProperty>(
vr::Prop_Axis0Type_Int32 + i)));
- if (type == static_cast < vr::EVRControllerAxisType>(axes_id)) {
+ if (type == static_cast<vr::EVRControllerAxisType>(axes_id)) {
vr::VRControllerAxis_t axes = controller_state.rAxis[i];
return glm::vec2(axes.x, axes.y);
}
@@ -131,10 +131,8 @@ VRController::GetControllerRoleForTrackedDeviceIndex(
switch (vr_system_->GetControllerRoleForTrackedDeviceIndex(device_index)) {
case vr::TrackedControllerRole_LeftHand:
return LEFT_CONTROLLER;
- break;
case vr::TrackedControllerRole_RightHand:
return RIGHT_CONTROLLER;
- break;
case vr::TrackedControllerRole_Invalid:
break;
}
diff --git a/tests/reference_images/hmd_test_left.png b/tests/reference_images/hmd_test_left.png
index 9989f7ae..2f975671 100644
--- a/tests/reference_images/hmd_test_left.png
+++ b/tests/reference_images/hmd_test_left.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e4a6d5d6c1eed96056d964381617ec97dd3b6c9d26717cdc55c1e66c8343feed
-size 115516
+oid sha256:52c050bf258acaf19f3914bcc2792e4b130cc07e8c7017b8a4c5b69dcccec76f
+size 116885
diff --git a/tests/reference_images/hmd_test_right.png b/tests/reference_images/hmd_test_right.png
index 33f5fa27..2519d5d6 100644
--- a/tests/reference_images/hmd_test_right.png
+++ b/tests/reference_images/hmd_test_right.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e07eb1a9c5bfea732801cbd4b6d6321c7797d815645b23fa205a14fa50d76b3d
-size 115419
+oid sha256:a9ea7817c7c1254c1765bf4a0977dd7b430d8419d1355f60b92dce461befae35
+size 116057
--
GitLab