From c432a34cfbab7d8d4cdec840201705c018c6a4dc Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 23 Jan 2014 14:51:29 -0800
Subject: [PATCH] fix rendering of Avatars

---
 interface/src/Application.cpp        | 8 ++------
 interface/src/Application.h          | 1 -
 interface/src/avatar/AvatarManager.h | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6617d04e38..713d97b06a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2668,7 +2668,7 @@ void Application::updateShadowMap() {
 
     glTranslatef(translation.x, translation.y, translation.z);
 
-    renderAvatars(true);
+    _avatarManager.renderAvatars(true);
     _particles.render();
 
     glPopMatrix();
@@ -2896,7 +2896,7 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
         }
     }
 
-    renderAvatars(whichCamera.getMode() == CAMERA_MODE_MIRROR, selfAvatarOnly);
+    _avatarManager.renderAvatars(whichCamera.getMode() == CAMERA_MODE_MIRROR, selfAvatarOnly);
 
     if (!selfAvatarOnly) {
         //  Render the world box
@@ -3464,10 +3464,6 @@ void Application::renderCoverageMapsRecursively(CoverageMap* map) {
     }
 }
 
-void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) {
-    
-}
-
 // renderViewFrustum()
 //
 // Description: this will render the view frustum bounds for EITHER the head
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 284e3139e9..bddca72e54 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -304,7 +304,6 @@ private:
     void updateShadowMap();
     void displayOverlay();
     void displayStats();
-    void renderAvatars(bool forceRenderHead, bool selfAvatarOnly = false);
     void renderViewFrustum(ViewFrustum& viewFrustum);
 
     void checkBandwidthMeterClick();
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index ea3647ecd7..4775a39ba8 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -34,7 +34,7 @@ public:
                                   glm::vec3& eyePosition);
     
     void updateAvatars(float deltaTime, const glm::vec3& mouseRayOrigin, const glm::vec3& mouseRayDirection);
-    void renderAvatars(bool forceRenderHead, bool selfAvatarOnly);
+    void renderAvatars(bool forceRenderHead, bool selfAvatarOnly = false);
     
     void clearHash();