From 28854363d44fa2cb65231ddad1b132b9b8cabbfe Mon Sep 17 00:00:00 2001 From: TonyPeng Date: Tue, 15 Jul 2014 09:20:33 -0700 Subject: [PATCH] Coding standard --- interface/src/avatar/AvatarManager.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 0c2dbbd668..bc84aa6b87 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -159,8 +159,7 @@ void AvatarManager::clearOtherAvatars() { _myAvatar->clearLookAtTargetAvatar(); } -Avatar* AvatarManager::getAvatarFromIndex(int avatarIndex) -{ +Avatar* AvatarManager::getAvatarFromIndex(int avatarIndex) { Avatar* avatar = NULL; int numAvatars = _avatarHash.count(); if (avatarIndex < numAvatars) { @@ -173,45 +172,39 @@ Avatar* AvatarManager::getAvatarFromIndex(int avatarIndex) return avatar; } -void AvatarManager::addAvatarLocalLight(int avatarIndex) -{ +void AvatarManager::addAvatarLocalLight(int avatarIndex) { Avatar* avatar = getAvatarFromIndex(avatarIndex); if (avatar) { avatar->addLocalLight(); } } -void AvatarManager::removeAvatarLocalLight(int avatarIndex) -{ +void AvatarManager::removeAvatarLocalLight(int avatarIndex) { Avatar* avatar = getAvatarFromIndex(avatarIndex); if (avatar) { avatar->removeLocalLight(); } } -void AvatarManager::setAvatarLightDirection(const glm::vec3& direction, int lightIndex, int avatarIndex) -{ +void AvatarManager::setAvatarLightDirection(const glm::vec3& direction, int lightIndex, int avatarIndex) { Avatar* avatar = getAvatarFromIndex(avatarIndex); if (avatar) { avatar->setLocalLightDirection(direction, lightIndex); } } -void AvatarManager::setAvatarLightColor(const glm::vec3& color, int lightIndex, int avatarIndex) -{ +void AvatarManager::setAvatarLightColor(const glm::vec3& color, int lightIndex, int avatarIndex) { Avatar* avatar = getAvatarFromIndex(avatarIndex); if (avatar) { avatar->setLocalLightColor(color, lightIndex); } } -int AvatarManager::getNumAvatars() -{ +int AvatarManager::getNumAvatars() { return _avatarHash.count(); } -QString AvatarManager::getAvatarHashKey(int index) -{ +QString AvatarManager::getAvatarHashKey(int index) { QString id = ((_avatarHash.keys())[index]).toString(); std::string idString = id.toStdString(); return id;