From add7bb26ed4d731d8167b3c6eed21a358c4c8166 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Tue, 8 Apr 2014 14:55:46 -0700
Subject: [PATCH] Use the head height to determine the pushback amount.

---
 interface/src/Application.cpp   |  4 ++--
 interface/src/avatar/Avatar.cpp | 10 +++++-----
 interface/src/avatar/Avatar.h   |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index db75034e7f..0b702c98a0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -532,8 +532,8 @@ void Application::paintGL() {
         // if the head would intersect the near clip plane, we must push the camera out
         glm::vec3 relativePosition = glm::inverse(_myCamera.getTargetRotation()) *
             (_myAvatar->getHead()->getPosition() - _myCamera.getTargetPosition());
-        const float HEAD_RADIUS = 0.1f;
-        float pushback = relativePosition.z + _myCamera.getNearClip() + HEAD_RADIUS;
+        const float HEAD_EXPANSION = 1.1f;
+        float pushback = relativePosition.z + _myCamera.getNearClip() + _myAvatar->getHeadHeight() * HEAD_EXPANSION;
         if (pushback > 0.0f) {
             _myCamera.setTargetPosition(_myCamera.getTargetPosition() +
                 _myCamera.getTargetRotation() * glm::vec3(0.0f, 0.0f, pushback));
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 05f74755df..86378c6cdf 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -524,6 +524,11 @@ void Avatar::updateShapePositions() {
     headModel.updateShapePositions();
 }
 
+float Avatar::getHeadHeight() const {
+    Extents extents = getHead()->getFaceModel().getBindExtents();
+    return extents.maximum.y - extents.minimum.y;
+}
+
 bool Avatar::findCollisions(const QVector<const Shape*>& shapes, CollisionList& collisions) {
     // TODO: Andrew to fix: also collide against _skeleton
     //bool collided = _skeletonModel.findCollisions(shapes, collisions);
@@ -750,11 +755,6 @@ float Avatar::getSkeletonHeight() const {
     return extents.maximum.y - extents.minimum.y;
 }
 
-float Avatar::getHeadHeight() const {
-    Extents extents = getHead()->getFaceModel().getBindExtents();
-    return extents.maximum.y - extents.minimum.y;
-}
-
 bool Avatar::collisionWouldMoveAvatar(CollisionInfo& collision) const {
     if (!collision._data || collision._type != MODEL_COLLISION) {
         return false;
diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h
index f57982b514..fca7173add 100755
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@@ -151,6 +151,8 @@ public:
     virtual float getBoundingRadius() const;
     void updateShapePositions();
 
+    float getHeadHeight() const;
+
 public slots:
     void updateCollisionFlags();
 
@@ -179,7 +181,6 @@ protected:
     void setScale(float scale);
 
     float getSkeletonHeight() const;
-    float getHeadHeight() const;
     float getPelvisFloatingHeight() const;
     float getPelvisToHeadLength() const;