OculusLegacyDisplayPlugin: mac os x and linux fixes

This commit is contained in:
Anthony J. Thibault 2016-03-18 16:23:30 -07:00
parent 4321c5a62b
commit e1d47e7028
2 changed files with 3 additions and 4 deletions

View file

@ -35,14 +35,13 @@ void OculusLegacyDisplayPlugin::resetSensors() {
ovrHmd_RecenterPose(_hmd); ovrHmd_RecenterPose(_hmd);
} }
glm::mat4 OculusLegacyDisplayPlugin::updateHeadPose(uint32_t frameIndex) { void OculusLegacyDisplayPlugin::updateHeadPose(uint32_t frameIndex) {
Lock lock(_mutex); Lock lock(_mutex);
_trackingState = ovrHmd_GetTrackingState(_hmd, ovr_GetTimeInSeconds()); _trackingState = ovrHmd_GetTrackingState(_hmd, ovr_GetTimeInSeconds());
lastFrameSeen = frameIndex;
_headPoseCache.set(toGlm(_trackingState.HeadPose.ThePose)); _headPoseCache.set(toGlm(_trackingState.HeadPose.ThePose));
} }
glm::mat4 OculusLegacyDisplayPlugin::getHeadPose(uint32_t frameIndex) const { glm::mat4 OculusLegacyDisplayPlugin::getHeadPose() const {
return _headPoseCache.get(); return _headPoseCache.get();
} }

View file

@ -54,7 +54,7 @@ private:
//ovrTexture _eyeTextures[2]; // FIXME - not currently in use //ovrTexture _eyeTextures[2]; // FIXME - not currently in use
mutable int _hmdScreen { -1 }; mutable int _hmdScreen { -1 };
bool _hswDismissed { false }; bool _hswDismissed { false };
ThreadSafeValueCache _headPoseCache { glm::mat4() }; ThreadSafeValueCache<glm::mat4> _headPoseCache { glm::mat4() };
}; };