From e1d47e702813f4f68a5588464d23b7beb000ae48 Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <ajt@highfidelity.io>
Date: Fri, 18 Mar 2016 16:23:30 -0700
Subject: [PATCH] OculusLegacyDisplayPlugin: mac os x and linux fixes

---
 plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp | 5 ++---
 plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
index c0d27f8699..b8a1d7c35f 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
@@ -35,14 +35,13 @@ void OculusLegacyDisplayPlugin::resetSensors() {
     ovrHmd_RecenterPose(_hmd);
 }
 
-glm::mat4 OculusLegacyDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
+void OculusLegacyDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
     Lock lock(_mutex);
     _trackingState = ovrHmd_GetTrackingState(_hmd, ovr_GetTimeInSeconds());
-    lastFrameSeen = frameIndex;
     _headPoseCache.set(toGlm(_trackingState.HeadPose.ThePose));
 }
 
-glm::mat4 OculusLegacyDisplayPlugin::getHeadPose(uint32_t frameIndex) const {
+glm::mat4 OculusLegacyDisplayPlugin::getHeadPose() const {
     return _headPoseCache.get();
 }
 
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
index 4f13c49f2f..f100028beb 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.h
@@ -54,7 +54,7 @@ private:
     //ovrTexture _eyeTextures[2]; // FIXME - not currently in use
     mutable int _hmdScreen { -1 };
     bool _hswDismissed { false };
-    ThreadSafeValueCache _headPoseCache { glm::mat4() };
+    ThreadSafeValueCache<glm::mat4> _headPoseCache { glm::mat4() };
 };