From 7afd990e2e4ac8c9c29862da4bcf2cea98ac8112 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Mon, 4 May 2015 22:27:41 -0700 Subject: [PATCH] Fix Mixamo avatar clipping in HMD view --- interface/src/avatar/MyAvatar.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 557d630ebf..ec89eb0953 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1178,14 +1178,8 @@ void MyAvatar::renderBody(ViewFrustum* renderFrustum, RenderArgs::RenderMode ren } else { float clipDistance = _skeletonModel.getHeadClipDistance(); if (OculusManager::isConnected()) { - // If avatar is horizontally in front of camera, increase clip distance by the amount it is in front. - glm::vec3 cameraToAvatar = _position - cameraPos; - cameraToAvatar.y = 0.0f; - glm::vec3 cameraLookAt = camera->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f); - float headOffset = glm::dot(cameraLookAt, cameraToAvatar); - if (headOffset > 0) { - clipDistance += headOffset; - } + clipDistance = glm::length(getEyePosition() + + camera->getOrientation() * glm::vec3(0.0f, 0.0f, -clipDistance) - cameraPos); } renderFrustum->setNearClip(clipDistance); }