From 8ebb3e52d8be7cfc452462acd59af585c75726a3 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 2 Feb 2018 11:42:55 -0800 Subject: [PATCH] Misc bug fixes --- assignment-client/src/audio/AudioMixerSlave.cpp | 8 +++----- interface/src/AvatarBookmarks.cpp | 12 ++++++------ interface/src/AvatarEntitiesBookmarks.cpp | 12 ++++++------ libraries/animation/src/Rig.cpp | 4 ++-- libraries/networking/src/AddressManager.cpp | 2 +- libraries/networking/src/NodeList.cpp | 4 ++-- libraries/plugins/src/plugins/PluginManager.cpp | 3 ++- libraries/recording/src/recording/Deck.cpp | 4 ++-- .../render-utils/src/DeferredLightingEffect.cpp | 2 -- libraries/shared/src/QVariantGLM.cpp | 2 +- libraries/shared/src/TriangleSet.h | 2 +- libraries/ui/src/QmlWindowClass.cpp | 1 - libraries/ui/src/ui/Menu.cpp | 1 - plugins/oculus/src/OculusBaseDisplayPlugin.cpp | 2 +- 14 files changed, 27 insertions(+), 32 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp index 6d150a0dc3..705642b8a5 100644 --- a/assignment-client/src/audio/AudioMixerSlave.cpp +++ b/assignment-client/src/audio/AudioMixerSlave.cpp @@ -170,7 +170,7 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) { auto nodeID = node->getUUID(); // compute the node's max relative volume - float nodeVolume; + float nodeVolume = 0.0f; for (auto& streamPair : nodeData->getAudioStreams()) { auto nodeStream = streamPair.second; @@ -187,10 +187,8 @@ bool AudioMixerSlave::prepareMix(const SharedNodePointer& listener) { } // max-heapify the nodes by relative volume - throttledNodes.push_back(std::make_pair(nodeVolume, node)); - if (!throttledNodes.empty()) { - std::push_heap(throttledNodes.begin(), throttledNodes.end()); - } + throttledNodes.push_back({ nodeVolume, node }); + std::push_heap(throttledNodes.begin(), throttledNodes.end()); } } }); diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp index 5b9c45eef5..0f177e3d15 100644 --- a/interface/src/AvatarBookmarks.cpp +++ b/interface/src/AvatarBookmarks.cpp @@ -121,13 +121,13 @@ void AvatarBookmarks::addBookmark() { const QVariant& avatarScale = myAvatar->getAvatarScale(); // If Avatar attachments ever change, this is where to update them, when saving remember to also append to AVATAR_BOOKMARK_VERSION - QVariantMap *bookmark = new QVariantMap; - bookmark->insert(ENTRY_VERSION, AVATAR_BOOKMARK_VERSION); - bookmark->insert(ENTRY_AVATAR_URL, avatarUrl); - bookmark->insert(ENTRY_AVATAR_SCALE, avatarScale); - bookmark->insert(ENTRY_AVATAR_ATTACHMENTS, myAvatar->getAttachmentsVariant()); + QVariantMap bookmark; + bookmark.insert(ENTRY_VERSION, AVATAR_BOOKMARK_VERSION); + bookmark.insert(ENTRY_AVATAR_URL, avatarUrl); + bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale); + bookmark.insert(ENTRY_AVATAR_ATTACHMENTS, myAvatar->getAttachmentsVariant()); - Bookmarks::addBookmarkToFile(bookmarkName, *bookmark); + Bookmarks::addBookmarkToFile(bookmarkName, bookmark); }); } diff --git a/interface/src/AvatarEntitiesBookmarks.cpp b/interface/src/AvatarEntitiesBookmarks.cpp index d108bf3a23..21d3657346 100644 --- a/interface/src/AvatarEntitiesBookmarks.cpp +++ b/interface/src/AvatarEntitiesBookmarks.cpp @@ -144,13 +144,13 @@ void AvatarEntitiesBookmarks::addBookmark() { const QString& avatarUrl = myAvatar->getSkeletonModelURL().toString(); const QVariant& avatarScale = myAvatar->getAvatarScale(); - QVariantMap *bookmark = new QVariantMap; - bookmark->insert(ENTRY_VERSION, AVATAR_ENTITIES_BOOKMARK_VERSION); - bookmark->insert(ENTRY_AVATAR_URL, avatarUrl); - bookmark->insert(ENTRY_AVATAR_SCALE, avatarScale); - bookmark->insert(ENTRY_AVATAR_ENTITIES, myAvatar->getAvatarEntitiesVariant()); + QVariantMap bookmark; + bookmark.insert(ENTRY_VERSION, AVATAR_ENTITIES_BOOKMARK_VERSION); + bookmark.insert(ENTRY_AVATAR_URL, avatarUrl); + bookmark.insert(ENTRY_AVATAR_SCALE, avatarScale); + bookmark.insert(ENTRY_AVATAR_ENTITIES, myAvatar->getAvatarEntitiesVariant()); - Bookmarks::addBookmarkToFile(bookmarkName, *bookmark); + Bookmarks::addBookmarkToFile(bookmarkName, bookmark); }); } diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index a939db92aa..672014fc55 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -1244,7 +1244,7 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab int handJointIndex = _animSkeleton->nameToJointIndex("LeftHand"); int armJointIndex = _animSkeleton->nameToJointIndex("LeftArm"); int elbowJointIndex = _animSkeleton->nameToJointIndex("LeftForeArm"); - if (!leftArmEnabled && elbowJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) { + if (!leftArmEnabled && handJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) { glm::vec3 poleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, hipsIndex, true); // smooth toward desired pole vector from previous pole vector... to reduce jitter @@ -1291,7 +1291,7 @@ void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnab int handJointIndex = _animSkeleton->nameToJointIndex("RightHand"); int armJointIndex = _animSkeleton->nameToJointIndex("RightArm"); int elbowJointIndex = _animSkeleton->nameToJointIndex("RightForeArm"); - if (!rightArmEnabled && elbowJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) { + if (!rightArmEnabled && handJointIndex >= 0 && armJointIndex >= 0 && elbowJointIndex >= 0) { glm::vec3 poleVector = calculateElbowPoleVector(handJointIndex, elbowJointIndex, armJointIndex, hipsIndex, false); // smooth toward desired pole vector from previous pole vector... to reduce jitter diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 4e1354d3aa..f5678d6bb8 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -666,7 +666,7 @@ bool AddressManager::handleViewpoint(const QString& viewpointString, bool should } emit locationChangeRequired(newPosition, orientationChanged, - LookupTrigger::VisitUserFromPAL ? cancelOutRollAndPitch(newOrientation): newOrientation, + trigger == LookupTrigger::VisitUserFromPAL ? cancelOutRollAndPitch(newOrientation): newOrientation, shouldFace ); diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 1c18125433..9aa88c1c0c 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -999,7 +999,7 @@ void NodeList::setAvatarGain(const QUuid& nodeID, float gain) { } sendPacket(std::move(setAvatarGainPacket), *audioMixer); - QWriteLocker{ &_avatarGainMapLock }; + QWriteLocker lock{ &_avatarGainMapLock }; _avatarGainMap[nodeID] = gain; } else { @@ -1011,7 +1011,7 @@ void NodeList::setAvatarGain(const QUuid& nodeID, float gain) { } float NodeList::getAvatarGain(const QUuid& nodeID) { - QReadLocker{ &_avatarGainMapLock }; + QReadLocker lock{ &_avatarGainMapLock }; auto it = _avatarGainMap.find(nodeID); if (it != _avatarGainMap.cend()) { return it->second; diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp index 630520957a..dbd6845676 100644 --- a/libraries/plugins/src/plugins/PluginManager.cpp +++ b/libraries/plugins/src/plugins/PluginManager.cpp @@ -214,9 +214,10 @@ const DisplayPluginList& PluginManager::getDisplayPlugins() { } void PluginManager::disableDisplayPlugin(const QString& name) { - std::remove_if(_displayPlugins.begin(), _displayPlugins.end(), [&](const DisplayPluginPointer& plugin){ + auto it = std::remove_if(_displayPlugins.begin(), _displayPlugins.end(), [&](const DisplayPluginPointer& plugin){ return plugin->getName() == name; }); + _displayPlugins.erase(it, _displayPlugins.end()); } diff --git a/libraries/recording/src/recording/Deck.cpp b/libraries/recording/src/recording/Deck.cpp index c9ac0524ad..69a8587581 100644 --- a/libraries/recording/src/recording/Deck.cpp +++ b/libraries/recording/src/recording/Deck.cpp @@ -187,14 +187,14 @@ void Deck::processFrames() { void Deck::removeClip(const ClipConstPointer& clip) { Locker lock(_mutex); - std::remove_if(_clips.begin(), _clips.end(), [&](const Clip::ConstPointer& testClip)->bool { + _clips.remove_if([&](const Clip::ConstPointer& testClip)->bool { return (clip == testClip); }); } void Deck::removeClip(const QString& clipName) { Locker lock(_mutex); - std::remove_if(_clips.begin(), _clips.end(), [&](const Clip::ConstPointer& clip)->bool { + _clips.remove_if([&](const Clip::ConstPointer& clip)->bool { return (clip->getName() == clipName); }); } diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index d0d9708c04..af7fc82cdf 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/libraries/render-utils/src/DeferredLightingEffect.cpp @@ -753,8 +753,6 @@ void DefaultLightingSetup::run(const RenderContextPointer& renderContext) { auto textureCache = DependencyManager::get(); { PROFILE_RANGE(render, "Process Default Skybox"); - auto textureCache = DependencyManager::get(); - QFileSelector fileSelector; fileSelector.setExtraSelectors(FileUtils::getFileSelectors()); auto skyboxUrl = fileSelector.select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx"); diff --git a/libraries/shared/src/QVariantGLM.cpp b/libraries/shared/src/QVariantGLM.cpp index b5b840c2ca..1c73315d94 100644 --- a/libraries/shared/src/QVariantGLM.cpp +++ b/libraries/shared/src/QVariantGLM.cpp @@ -66,7 +66,7 @@ void qListtoRgbColor(const QVariant& q, rgbColor& returnValue) { glm::vec3 qMapToGlmVec3(const QVariant& q) { QVariantMap qMap = q.toMap(); - if (qMap.contains("x") && qMap.contains("y") && qMap.contains("y")) { + if (qMap.contains("x") && qMap.contains("y") && qMap.contains("z")) { return glm::vec3( qMap["x"].toFloat(), qMap["y"].toFloat(), diff --git a/libraries/shared/src/TriangleSet.h b/libraries/shared/src/TriangleSet.h index 786f58804f..9f688f9def 100644 --- a/libraries/shared/src/TriangleSet.h +++ b/libraries/shared/src/TriangleSet.h @@ -85,7 +85,7 @@ public: protected: bool _isBalanced{ false }; - TriangleOctreeCell _triangleOctree; std::vector _triangles; + TriangleOctreeCell _triangleOctree; AABox _bounds; }; diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp index 0825d238bc..02c9707d95 100644 --- a/libraries/ui/src/QmlWindowClass.cpp +++ b/libraries/ui/src/QmlWindowClass.cpp @@ -37,7 +37,6 @@ static const uvec2 MIN_QML_WINDOW_SIZE { 120, 80 }; QVariantMap QmlWindowClass::parseArguments(QScriptContext* context) { const auto argumentCount = context->argumentCount(); - QString title; QVariantMap properties; if (argumentCount > 1) { if (!context->argument(0).isUndefined()) { diff --git a/libraries/ui/src/ui/Menu.cpp b/libraries/ui/src/ui/Menu.cpp index 4e61eba28f..b600fc7b29 100644 --- a/libraries/ui/src/ui/Menu.cpp +++ b/libraries/ui/src/ui/Menu.cpp @@ -300,7 +300,6 @@ QAction* Menu::getActionFromName(const QString& menuName, MenuWrapper* menu) { } foreach (QAction* menuAction, menuActions) { - QString actionText = menuAction->text(); if (menuName == menuAction->text()) { return menuAction; } diff --git a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp index d03419d025..d8f2db75c9 100644 --- a/plugins/oculus/src/OculusBaseDisplayPlugin.cpp +++ b/plugins/oculus/src/OculusBaseDisplayPlugin.cpp @@ -41,7 +41,7 @@ bool OculusBaseDisplayPlugin::beginFrameRender(uint32_t frameIndex) { std::array handPoses; // Make controller poses available to the presentation thread ovr_for_each_hand([&](ovrHandType hand) { - static const auto REQUIRED_HAND_STATUS = ovrStatus_OrientationTracked & ovrStatus_PositionTracked; + static const auto REQUIRED_HAND_STATUS = ovrStatus_OrientationTracked | ovrStatus_PositionTracked; if (REQUIRED_HAND_STATUS != (trackingState.HandStatusFlags[hand] & REQUIRED_HAND_STATUS)) { return; }