From 9673133bf4d76aade057a5a0d3d50e7cf2d33af7 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Fri, 20 Nov 2015 14:26:37 -0800 Subject: [PATCH] whitespace (reduce diffs) --- interface/src/avatar/Avatar.cpp | 1 + interface/src/avatar/AvatarManager.h | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 26fb9c1b2e..d3f47703fc 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -606,6 +606,7 @@ glm::quat Avatar::computeRotationFromBodyToWorldUp(float proportion) const { } void Avatar::fixupModelsInScene() { + // check to see if when we added our models to the scene they were ready, if they were not ready, then // fix them up in the scene render::ScenePointer scene = qApp->getMain3DScene(); diff --git a/interface/src/avatar/AvatarManager.h b/interface/src/avatar/AvatarManager.h index 9918fc9374..96383b7e60 100644 --- a/interface/src/avatar/AvatarManager.h +++ b/interface/src/avatar/AvatarManager.h @@ -65,6 +65,7 @@ public: void getObjectsToChange(VectorOfMotionStates& motionStates); void handleOutgoingChanges(const VectorOfMotionStates& motionStates); void handleCollisionEvents(const CollisionEvents& collisionEvents); + void updateAvatarPhysicsShape(Avatar* avatar); // Expose results and parameter-tuning operations to other systems, such as stats and javascript. @@ -108,8 +109,6 @@ private: PIDController _renderDistanceController { }; SimpleMovingAverage _renderDistanceAverage { 10 }; - - SetOfAvatarMotionStates _avatarMotionStates; SetOfMotionStates _motionStatesToAdd; VectorOfMotionStates _motionStatesToDelete;