From c57b1a8b7045c92e9cc1afb24e0654d80ee51c4c Mon Sep 17 00:00:00 2001 From: Azaezel Date: Fri, 14 Oct 2016 17:26:13 -0500 Subject: [PATCH] clang reports: unclear || + && and &+| mixes. --- Engine/source/T3D/aiPlayer.cpp | 6 +++--- Engine/source/T3D/camera.cpp | 2 +- Engine/source/T3D/decal/decalManager.cpp | 4 ++-- Engine/source/T3D/lightFlareData.cpp | 2 +- Engine/source/T3D/player.cpp | 6 +++--- Engine/source/T3D/shapeImage.cpp | 10 +++++----- Engine/source/T3D/staticShape.cpp | 2 +- Engine/source/T3D/turret/aiTurretShape.cpp | 2 +- Engine/source/core/strings/unicode.cpp | 2 +- Engine/source/core/tagDictionary.cpp | 2 +- Engine/source/environment/river.cpp | 4 ++-- Engine/source/gfx/gl/gfxGLStateBlock.cpp | 2 +- Engine/source/gui/containers/guiRolloutCtrl.cpp | 2 +- Engine/source/navigation/navMesh.cpp | 6 ++++-- Engine/source/renderInstance/renderPrePassMgr.cpp | 4 ++-- Engine/source/scene/sceneContainer.cpp | 2 +- 16 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Engine/source/T3D/aiPlayer.cpp b/Engine/source/T3D/aiPlayer.cpp index 88b500205..f4e71cb91 100644 --- a/Engine/source/T3D/aiPlayer.cpp +++ b/Engine/source/T3D/aiPlayer.cpp @@ -1043,9 +1043,9 @@ NavMesh *AIPlayer::findNavMesh() const } else { - if(getNavSize() == Small && !m->mSmallCharacters || - getNavSize() == Regular && !m->mRegularCharacters || - getNavSize() == Large && !m->mLargeCharacters) + if((getNavSize() == Small && !m->mSmallCharacters) || + (getNavSize() == Regular && !m->mRegularCharacters) || + (getNavSize() == Large && !m->mLargeCharacters)) continue; } if(!mesh || m->getWorldBox().getVolume() < mesh->getWorldBox().getVolume()) diff --git a/Engine/source/T3D/camera.cpp b/Engine/source/T3D/camera.cpp index 11914542a..a2acc3838 100644 --- a/Engine/source/T3D/camera.cpp +++ b/Engine/source/T3D/camera.cpp @@ -572,7 +572,7 @@ void Camera::processTick(const Move* move) // process input/determine rotation vector if(virtualMode != StationaryMode && virtualMode != TrackObjectMode && - (!mLocked || virtualMode != OrbitObjectMode && virtualMode != OrbitPointMode)) + (!mLocked || ((virtualMode != OrbitObjectMode) && (virtualMode != OrbitPointMode)))) { if(!strafeMode) { diff --git a/Engine/source/T3D/decal/decalManager.cpp b/Engine/source/T3D/decal/decalManager.cpp index f992705d1..2d2491a7f 100644 --- a/Engine/source/T3D/decal/decalManager.cpp +++ b/Engine/source/T3D/decal/decalManager.cpp @@ -632,9 +632,9 @@ DecalInstance* DecalManager::getClosestDecal( const Point3F &pos ) } } - if ( !collectedInsts.empty() && + if ( (!collectedInsts.empty() && collectedInsts[closestIndex] && - closestDistance < 1.0f || + closestDistance < 1.0f) || worldInstSphere.isContained( pos ) ) return collectedInsts[closestIndex]; else diff --git a/Engine/source/T3D/lightFlareData.cpp b/Engine/source/T3D/lightFlareData.cpp index 84058f6c8..37963c546 100644 --- a/Engine/source/T3D/lightFlareData.cpp +++ b/Engine/source/T3D/lightFlareData.cpp @@ -440,7 +440,7 @@ void LightFlareData::prepRender(SceneRenderState *state, LightFlareState *flareS // We can only skip rendering if the light is not // visible, and it has elapsed the fade out time. if (mIsZero(occlusionFade) || - !lightVisible && visDelta > FadeOutTime) + (!lightVisible && visDelta > FadeOutTime)) return; const RectI &viewport = GFX->getViewport(); diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp index db6a2ca42..850b35bb9 100644 --- a/Engine/source/T3D/player.cpp +++ b/Engine/source/T3D/player.cpp @@ -3930,9 +3930,9 @@ void Player::updateActionThread() if (mMountPending) mMountPending = (isMounted() ? 0 : (mMountPending - 1)); - if (mActionAnimation.action == PlayerData::NullAnimation || - ((!mActionAnimation.waitForEnd || mActionAnimation.atEnd)) && - !mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0) + if ((mActionAnimation.action == PlayerData::NullAnimation) || + ((!mActionAnimation.waitForEnd || mActionAnimation.atEnd) && + (!mActionAnimation.holdAtEnd && (mActionAnimation.delayTicks -= !mMountPending) <= 0))) { //The scripting language will get a call back when a script animation has finished... // example: When the chat menu animations are done playing... diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp index cc8022b24..11c95bb7c 100644 --- a/Engine/source/T3D/shapeImage.cpp +++ b/Engine/source/T3D/shapeImage.cpp @@ -2638,7 +2638,7 @@ void ShapeBase::setImageState(U32 imageSlot, U32 newState,bool force) F32 randomPos = Platform::getRandom(); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.animThread[i] && image.state->sequence[i] != -1 && image.state->flashSequence[i]) { @@ -2779,7 +2779,7 @@ void ShapeBase::setImageState(U32 imageSlot, U32 newState,bool force) updateAnimThread(imageSlot, imageShapeIndex, lastState); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; // Start spin thread @@ -2834,7 +2834,7 @@ void ShapeBase::updateAnimThread(U32 imageSlot, S32 imageShapeIndex, ShapeBaseIm F32 randomPos = Platform::getRandom(); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.animThread[i] && stateData.sequence[i] != -1) @@ -3076,7 +3076,7 @@ TICKAGAIN: U32 imageShapeIndex = getImageShapeIndex(image); for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.spinThread[i]) @@ -3131,7 +3131,7 @@ void ShapeBase::updateImageAnimation(U32 imageSlot, F32 dt) // Advance animation threads for (U32 i=0; ishapeIsValid[i] || i != imageShapeIndex && !image.doAnimateAllShapes) + if (!image.dataBlock->shapeIsValid[i] || (i != imageShapeIndex && !image.doAnimateAllShapes)) continue; if (image.ambientThread[i]) diff --git a/Engine/source/T3D/staticShape.cpp b/Engine/source/T3D/staticShape.cpp index ffad91dd3..1ffd5436c 100644 --- a/Engine/source/T3D/staticShape.cpp +++ b/Engine/source/T3D/staticShape.cpp @@ -252,7 +252,7 @@ void StaticShape::onUnmount(ShapeBase*,S32) U32 StaticShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bstream) { U32 retMask = Parent::packUpdate(connection,mask,bstream); - if (bstream->writeFlag(mask & PositionMask | ExtendedInfoMask)) + if (bstream->writeFlag(mask & (PositionMask | ExtendedInfoMask))) { // Write the transform (do _not_ use writeAffineTransform. Since this is a static diff --git a/Engine/source/T3D/turret/aiTurretShape.cpp b/Engine/source/T3D/turret/aiTurretShape.cpp index 5d895c8ab..ac36e30ea 100644 --- a/Engine/source/T3D/turret/aiTurretShape.cpp +++ b/Engine/source/T3D/turret/aiTurretShape.cpp @@ -1157,7 +1157,7 @@ U32 AITurretShape::packUpdate(NetConnection *connection, U32 mask, BitStream *bs U32 retMask = Parent::packUpdate(connection,mask,bstream); // Indicate that the transform has changed to update the scan box - bstream->writeFlag(mask & PositionMask | ExtendedInfoMask); + bstream->writeFlag(mask & (PositionMask | ExtendedInfoMask)); // Handle any state changes that need to be passed along if (bstream->writeFlag(mask & TurretStateMask)) diff --git a/Engine/source/core/strings/unicode.cpp b/Engine/source/core/strings/unicode.cpp index 64acee244..109327fe1 100644 --- a/Engine/source/core/strings/unicode.cpp +++ b/Engine/source/core/strings/unicode.cpp @@ -481,7 +481,7 @@ U32 oneUTF32toUTF8(const UTF32 codepoint, UTF8 *threeByteCodeunitBuf) // Process the 1st byte. filter based on the # of expected bytes. mask = sgByteMask8LUT[bytecount]; marker = ( ~mask << 1 ); - threeByteCodeunitBuf[0] = marker | working & mask; + threeByteCodeunitBuf[0] = marker | (working & mask); PROFILE_END(); return bytecount; diff --git a/Engine/source/core/tagDictionary.cpp b/Engine/source/core/tagDictionary.cpp index a25ed4f5b..1b9b80dd4 100644 --- a/Engine/source/core/tagDictionary.cpp +++ b/Engine/source/core/tagDictionary.cpp @@ -296,7 +296,7 @@ bool TagDictionary::match(const char* pattern, const char* str) return !*str; case '*': - return match(pattern+1, str) || *str && match(pattern, str+1); + return match(pattern+1, str) || (*str && match(pattern, str+1)); case '?': return *str && match(pattern+1, str+1); diff --git a/Engine/source/environment/river.cpp b/Engine/source/environment/river.cpp index ff11fdbc6..7d01827ec 100644 --- a/Engine/source/environment/river.cpp +++ b/Engine/source/environment/river.cpp @@ -2160,8 +2160,8 @@ void River::_makeRenderBatches( const Point3F &cameraPos ) F32 dist = getMin( dist0, dist1 ); highDetail = ( dist < lodDistSquared ); - if ( highDetail && lastDetail == 0 || - !highDetail && lastDetail == 1 ) + if ( (highDetail && lastDetail == 0) || + (!highDetail && lastDetail == 1) ) { // We hit a segment with a different lod than the previous. // Save what we have so far... diff --git a/Engine/source/gfx/gl/gfxGLStateBlock.cpp b/Engine/source/gfx/gl/gfxGLStateBlock.cpp index 9d446f27a..87d2b5953 100644 --- a/Engine/source/gfx/gl/gfxGLStateBlock.cpp +++ b/Engine/source/gfx/gl/gfxGLStateBlock.cpp @@ -99,7 +99,7 @@ void GFXGLStateBlock::activate(const GFXGLStateBlock* oldState) #define STATE_CHANGE(state) (!oldState || oldState->mDesc.state != mDesc.state) #define TOGGLE_STATE(state, enum) if(mDesc.state) glEnable(enum); else glDisable(enum) -#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) if(mDesc.state) glEnable(enum); else glDisable(enum) +#define CHECK_TOGGLE_STATE(state, enum) if(!oldState || oldState->mDesc.state != mDesc.state) {if(mDesc.state) glEnable(enum); else glDisable(enum);} // Blending CHECK_TOGGLE_STATE(blendEnable, GL_BLEND); diff --git a/Engine/source/gui/containers/guiRolloutCtrl.cpp b/Engine/source/gui/containers/guiRolloutCtrl.cpp index 919846b66..3a226f0bc 100644 --- a/Engine/source/gui/containers/guiRolloutCtrl.cpp +++ b/Engine/source/gui/containers/guiRolloutCtrl.cpp @@ -189,7 +189,7 @@ bool GuiRolloutCtrl::_onMouseUp( const GuiEvent &event, bool lockedMouse ) { // If Ctrl/Cmd-clicking a header, collapse all sibling GuiRolloutCtrls. - if( ( mAutoCollapseSiblings && !mIsExpanded && !( event.modifier & SI_PRIMARY_CTRL ) + if( (( mAutoCollapseSiblings && !mIsExpanded && !( event.modifier & SI_PRIMARY_CTRL )) || ( !mAutoCollapseSiblings && event.modifier & SI_PRIMARY_CTRL ) ) ) { for( SimSet::iterator iter = getParent()->begin(); iter != getParent()->end(); ++ iter ) diff --git a/Engine/source/navigation/navMesh.cpp b/Engine/source/navigation/navMesh.cpp index 9fb84c309..b98c648b3 100644 --- a/Engine/source/navigation/navMesh.cpp +++ b/Engine/source/navigation/navMesh.cpp @@ -1143,9 +1143,10 @@ void NavMesh::buildLinks() // Iterate over links for(U32 j = 0; j < mLinkIDs.size(); j++) { + if (mLinksUnsynced[j]) + { if(tile.box.isContained(getLinkStart(j)) || - tile.box.isContained(getLinkEnd(j)) && - mLinksUnsynced[j]) + tile.box.isContained(getLinkEnd(j))) { // Mark tile for build. mDirtyTiles.push_back_unique(i); @@ -1160,6 +1161,7 @@ void NavMesh::buildLinks() } } } + } if(mDirtyTiles.size()) ctx->startTimer(RC_TIMER_TOTAL); } diff --git a/Engine/source/renderInstance/renderPrePassMgr.cpp b/Engine/source/renderInstance/renderPrePassMgr.cpp index 2c3f2c4c2..6175c3eec 100644 --- a/Engine/source/renderInstance/renderPrePassMgr.cpp +++ b/Engine/source/renderInstance/renderPrePassMgr.cpp @@ -612,9 +612,9 @@ void ProcessedPrePassMaterial::_determineFeatures( U32 stageNum, mIsLightmappedGeometry = ( fd.features.hasFeature( MFT_ToneMap ) || fd.features.hasFeature( MFT_LightMap ) || fd.features.hasFeature( MFT_VertLit ) || - ( bEnableMRTLightmap && fd.features.hasFeature( MFT_IsTranslucent ) || + ( bEnableMRTLightmap && (fd.features.hasFeature( MFT_IsTranslucent ) || fd.features.hasFeature( MFT_ForwardShading ) || - fd.features.hasFeature( MFT_IsTranslucentZWrite ) ) ); + fd.features.hasFeature( MFT_IsTranslucentZWrite) ) ) ); // Integrate proper opaque stencil write state mUserDefined.addDesc( mPrePassMgr->getOpaqueStenciWriteDesc( mIsLightmappedGeometry ) ); diff --git a/Engine/source/scene/sceneContainer.cpp b/Engine/source/scene/sceneContainer.cpp index f5a271794..b4dd2058c 100644 --- a/Engine/source/scene/sceneContainer.cpp +++ b/Engine/source/scene/sceneContainer.cpp @@ -307,7 +307,7 @@ void SceneContainer::insertIntoBins(SceneObject* obj, // For huge objects, dump them into the overflow bin. Otherwise, everything // goes into the grid... // - if ((maxX - minX + 1) < csmNumBins || (maxY - minY + 1) < csmNumBins && !obj->isGlobalBounds()) + if ((maxX - minX + 1) < csmNumBins || ((maxY - minY + 1) < csmNumBins && !obj->isGlobalBounds())) { SceneObjectRef** pCurrInsert = &obj->mBinRefHead;