Showing the changes to interface/src/Application.cpp (1 of 22 files). Show all
Unified · Split
| @@ -2006,7 +2006,7 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm:: · 2005 unmodified lines | |||
| 2006 | PerformanceWarning warn(showWarnings, "Application::updateAvatars()"); | 2006 | PerformanceWarning warn(showWarnings, "Application::updateAvatars()"); |
| 2007 | 2007 | ||
| 2008 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { | 2008 | foreach (const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) { |
| 2009 | QMutexLocker(&node->getMutex()); | 2009 | QMutexLocker locker(&node->getMutex()); |
| 2010 | if (node->getLinkedData()) { | 2010 | if (node->getLinkedData()) { |
| 2011 | Avatar *avatar = (Avatar *)node->getLinkedData(); | 2011 | Avatar *avatar = (Avatar *)node->getLinkedData(); |
| 2012 | if (!avatar->isInitialized()) { | 2012 | if (!avatar->isInitialized()) { |
| @@ -2168,7 +2168,6 @@ void Application::updateMouseVoxels(float deltaTime, glm::vec3& mouseRayOrigin, · 155 unmodified lines | |||
| 2168 | 2168 | ||
| 2169 | _mouseVoxel.s = 0.0f; | 2169 | _mouseVoxel.s = 0.0f; |
| 2170 | bool wasInitialized = _mouseVoxelScaleInitialized; | 2170 | bool wasInitialized = _mouseVoxelScaleInitialized; |
| 2171 | _mouseVoxelScaleInitialized = false; | ||
| 2172 | if (Menu::getInstance()->isVoxelModeActionChecked() && | 2171 | if (Menu::getInstance()->isVoxelModeActionChecked() && |
| 2173 | (fabs(_myAvatar.getVelocity().x) + | 2172 | (fabs(_myAvatar.getVelocity().x) + |
| 2174 | fabs(_myAvatar.getVelocity().y) + | 2173 | fabs(_myAvatar.getVelocity().y) + |
| @@ -3660,7 +3659,7 @@ void Application::renderAvatars(bool forceRenderHead, bool selfAvatarOnly) { · 1485 unmodified lines | |||
| 3660 | NodeList* nodeList = NodeList::getInstance(); | 3659 | NodeList* nodeList = NodeList::getInstance(); |
| 3661 | 3660 | ||
| 3662 | foreach (const SharedNodePointer& node, nodeList->getNodeHash()) { | 3661 | foreach (const SharedNodePointer& node, nodeList->getNodeHash()) { |
| 3663 | QMutexLocker(&node->getMutex()); | 3662 | QMutexLocker locker(&node->getMutex()); |
| 3664 | 3663 | ||
| 3665 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { | 3664 | if (node->getLinkedData() != NULL && node->getType() == NODE_TYPE_AGENT) { |
| 3666 | Avatar *avatar = (Avatar *)node->getLinkedData(); | 3665 | Avatar *avatar = (Avatar *)node->getLinkedData(); |