From 197adce4debef454f373a40169341b8c8044723f Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Thu, 10 Apr 2014 17:14:49 -0700
Subject: [PATCH] Fall intersection off with angle to other avatar.

---
 interface/src/Application.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8caf339a75..1f7ca11d71 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -547,13 +547,19 @@ void Application::paintGL() {
                     avatar->getBoundingRadius() + pushbackRadius) {
                 continue;
             }
+            float angle = angleBetween(avatar->getPosition() - _myCamera.getTargetPosition(), planeNormal);
+            if (angle > PI_OVER_TWO) {
+                continue;
+            }
+            float scale = qMax(angle / PI_OVER_TWO, 0.0f);
+            scale = 1.0f - powf(scale, 4.0f);
             static CollisionList collisions(64);
             collisions.clear();
             if (!avatar->findPlaneCollisions(plane, collisions)) {
                 continue;
             }
             for (int i = 0; i < collisions.size(); i++) {
-                pushback = qMax(pushback, glm::length(collisions.getCollision(i)->_penetration));
+                pushback = qMax(pushback, glm::length(collisions.getCollision(i)->_penetration) * scale);
             }
         }
         const float MAX_PUSHBACK = 0.35f;