From 41c380eb23411d397bf9260c6402b8a9b9b31ece Mon Sep 17 00:00:00 2001 From: Lubosz Sarnecki Date: Mon, 12 Feb 2024 20:33:48 +0100 Subject: [PATCH] plugins/openvr: Strip trailing whitespace. --- plugins/openvr/src/OpenVrDisplayPlugin.cpp | 10 +++++----- plugins/openvr/src/OpenVrDisplayPlugin.h | 2 +- plugins/openvr/src/OpenVrHelpers.cpp | 4 ++-- plugins/openvr/src/ViveControllerManager.cpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp index b5c1f713e7..1f0820ef80 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp +++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp @@ -93,10 +93,10 @@ out vec4 FragColor; void main() { vec2 uv = vTexCoord; - + mat4 eyeInverseProjection; mat4 eyeProjection; - + float xoffset = 1.0; vec2 uvmin = vec2(0.0); vec2 uvmax = vec2(1.0); @@ -117,12 +117,12 @@ void main() { vec4 ndcSpace = vec4(vPosition, 1.0); ndcSpace.x *= 2.0; ndcSpace.x += xoffset; - + // Convert from NDC to eyespace vec4 eyeSpace = eyeInverseProjection * ndcSpace; eyeSpace /= eyeSpace.w; - // Convert to a noramlized ray + // Convert to a noramlized ray vec3 ray = eyeSpace.xyz; ray = normalize(ray); @@ -140,7 +140,7 @@ void main() { ndcSpace /= ndcSpace.w; ndcSpace.x -= xoffset; ndcSpace.x /= 2.0; - + // Calculate the new UV coordinates uv = (ndcSpace.xy / 2.0) + 0.5; if (any(greaterThan(uv, uvmax)) || any(lessThan(uv, uvmin))) { diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.h b/plugins/openvr/src/OpenVrDisplayPlugin.h index 9212a42639..b0c18d4eb1 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.h +++ b/plugins/openvr/src/OpenVrDisplayPlugin.h @@ -27,7 +27,7 @@ static const size_t COMPOSITING_BUFFER_SIZE = 3; struct CompositeInfo { using Queue = std::queue; using Array = std::array; - + gpu::TexturePointer texture; uint32_t textureID { 0 }; glm::mat4 pose; diff --git a/plugins/openvr/src/OpenVrHelpers.cpp b/plugins/openvr/src/OpenVrHelpers.cpp index d5cb7d6c8f..3cd4f51dd0 100644 --- a/plugins/openvr/src/OpenVrHelpers.cpp +++ b/plugins/openvr/src/OpenVrHelpers.cpp @@ -306,8 +306,8 @@ void handleOpenVrEvents() { #if DEV_BUILD //qDebug() << "OpenVR: Event " << activeHmd->GetEventTypeNameFromEnum((vr::EVREventType)event.eventType) << "(" << event.eventType << ")"; - // FIXME: Reinstate the line above and remove the following lines once the problem with excessive occurrences of - // VREvent_ActionBindingReloaded events is fixed in SteamVR for Linux. + // FIXME: Reinstate the line above and remove the following lines once the problem with excessive occurrences of + // VREvent_ActionBindingReloaded events is fixed in SteamVR for Linux. // https://github.com/ValveSoftware/SteamVR-for-Linux/issues/307 #ifdef Q_OS_LINUX if (event.eventType != vr::VREvent_ActionBindingReloaded) { diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp index 12659b0f9e..6321831e6a 100644 --- a/plugins/openvr/src/ViveControllerManager.cpp +++ b/plugins/openvr/src/ViveControllerManager.cpp @@ -1831,9 +1831,9 @@ void ViveControllerManager::InputDevice::setConfigFromString(const QString& valu } /*@jsdoc - *

The Controller.Hardware.Vive object has properties representing the Vive. The property values are integer + *

The Controller.Hardware.Vive object has properties representing the Vive. The property values are integer * IDs, uniquely identifying each output. Read-only.

- *

These outputs can be mapped to actions or functions or Controller.Standard items in a {@link RouteObject} + *

These outputs can be mapped to actions or functions or Controller.Standard items in a {@link RouteObject} * mapping.

* *