From 37aee099686036ae4c37192327cb94a9302c3af6 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 7 May 2013 15:43:28 -0700
Subject: [PATCH] fix order of angle calculations

---
 audio-mixer/src/main.cpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp
index 8215a32e80..06250c42af 100644
--- a/audio-mixer/src/main.cpp
+++ b/audio-mixer/src/main.cpp
@@ -168,23 +168,20 @@ void *sendBuffer(void *args) {
                                 }
                             }
                             
-                            if (absoluteAngleToSource > 180) {
-                                absoluteAngleToSource -= 360;
-                            } else if (absoluteAngleToSource < -180) {
-                                absoluteAngleToSource += 360;
+                            bearingRelativeAngleToSource = absoluteAngleToSource - agentBearing;
+                            
+                            if (bearingRelativeAngleToSource > 180) {
+                                bearingRelativeAngleToSource -= 360;
+                            } else if (bearingRelativeAngleToSource < -180) {
+                                bearingRelativeAngleToSource += 360;
                             }
                             
-                            bearingRelativeAngleToSource = absoluteAngleToSource - agentBearing;
                             bearingRelativeAngleToSource *= (M_PI / 180);
                             
                             float angleOfDelivery = absoluteAngleToSource - otherAgentBuffer->getBearing();
                             
-                            if (angleOfDelivery < -180) {
-                                angleOfDelivery += 360;
-                            }
-                            
                             float offAxisCoefficient = MAX_OFF_AXIS_ATTENUATION +
-                            (OFF_AXIS_ATTENUATION_FORMULA_STEP * (fabsf(angleOfDelivery) / 90.0f));
+                                (OFF_AXIS_ATTENUATION_FORMULA_STEP * (fabsf(angleOfDelivery) / 90.0f));
                             
                             printf("AD: %f, OC: %f\n", angleOfDelivery, offAxisCoefficient);