From 9b0c199ed75752d71556adcc27244aacee49aa72 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 15 Dec 2015 15:30:56 -0800
Subject: [PATCH] updateAvatarPhysicsShape-->addAvatarToSimulation

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

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 9e881f49ea..504124c4a7 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -167,7 +167,7 @@ void Avatar::simulate(float deltaTime) {
     PerformanceTimer perfTimer("simulate");
 
     if (!isDead() && !_motionState) {
-        DependencyManager::get<AvatarManager>()->updateAvatarPhysicsShape(this);
+        DependencyManager::get<AvatarManager>()->addAvatarToSimulation(this);
     }
     animateScaleChanges(deltaTime);
 
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 38f191872e..312742e778 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -375,13 +375,14 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
     }
 }
 
-void AvatarManager::updateAvatarPhysicsShape(Avatar* avatar) {
+void AvatarManager::addAvatarToSimulation(Avatar* avatar) {
     assert(!avatar->getMotionState());
 
     ShapeInfo shapeInfo;
     avatar->computeShapeInfo(shapeInfo);
     btCollisionShape* shape = ObjectMotionState::getShapeManager()->getShape(shapeInfo);
     if (shape) {
+        // we don't add to the simulation now, we put it on a list to be added later
         AvatarMotionState* motionState = new AvatarMotionState(avatar, shape);
         avatar->setMotionState(motionState);
         _motionStatesToAdd.insert(motionState);
diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h
index d63df9fb76..1b165495c3 100644
--- a/interface/src/avatar/AvatarManager.h
+++ b/interface/src/avatar/AvatarManager.h
@@ -66,7 +66,7 @@ public:
     void handleOutgoingChanges(const VectorOfMotionStates& motionStates);
     void handleCollisionEvents(const CollisionEvents& collisionEvents);
 
-    void updateAvatarPhysicsShape(Avatar* avatar);
+    void addAvatarToSimulation(Avatar* avatar);
 
     // Expose results and parameter-tuning operations to other systems, such as stats and javascript.
     Q_INVOKABLE float getRenderDistance() { return _renderDistance; }