Emulated HMD tracking fixes

Author: meruune

driver_00Amethyst/BodyTracker.cpp

@@ -114,17 +114,7 @@ void BodyTracker::update()
         _pose.poseIsValid = _valid;
         _pose.deviceIsConnected = _active;
 
-        auto pose = _pose; // Copy the pose
-
-        // Adjust for kinect-based HMD pose emulation
-        if (m_is_head_override_active)
-        {
-            pose.vecPosition[0] += 1.0;
-            pose.vecPosition[1] += 1.0;
-            pose.vecPosition[2] += 1.0;
-        }
-
-        vr::VRServerDriverHost()->TrackedDevicePoseUpdated(_index, pose, sizeof pose);
+        vr::VRServerDriverHost()->TrackedDevicePoseUpdated(_index, _pose, sizeof _pose);
     }
 }
 

driver_00Amethyst/ServerProvider.cpp

@@ -215,10 +215,13 @@ bool ServerProvider::HandleDevicePoseUpdated(uint32_t openVRID, vr::DriverPose_t
     // Apply pose overrides for selected IDs
     if (pose_overrides_.contains(openVRID))
     {
-        pose.qRotation.w = pose_overrides_[openVRID].Orientation.W;
-        pose.qRotation.x = pose_overrides_[openVRID].Orientation.X;
-        pose.qRotation.y = pose_overrides_[openVRID].Orientation.Y;
-        pose.qRotation.z = pose_overrides_[openVRID].Orientation.Z;
+        if (openVRID != 0)
+        {
+            pose.qRotation.w = pose_overrides_[openVRID].Orientation.W;
+            pose.qRotation.x = pose_overrides_[openVRID].Orientation.X;
+            pose.qRotation.y = pose_overrides_[openVRID].Orientation.Y;
+            pose.qRotation.z = pose_overrides_[openVRID].Orientation.Z;
+        }
 
         pose.vecPosition[0] = pose_overrides_[openVRID].Position.X;
         pose.vecPosition[1] = pose_overrides_[openVRID].Position.Y;