TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 00:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1235 from Azaezel/alpha41/clangTidyCleanups

Browse source 
clang tidy misc fixes
This commit is contained in:
Brian Roberts 2024-03-19 23:15:04 -05:00 • committed by GitHub
commit 8fbfcf1481
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gfx/bitmap/gBitmap.cpp
View file

@ -409,7 +409,7 @@ void GBitmap::allocateBitmapWithMips(const U32 in_width, const U32 in_height, co
mNumMipLevels++; mNumMipLevels++;
allocPixels += currWidth * currHeight * mBytesPerPixel; allocPixels += currWidth * currHeight * mBytesPerPixel;
} while (currWidth != 1 || currHeight != 1 && mNumMipLevels != in_numMips); } while ((currWidth != 1 || currHeight != 1) && (mNumMipLevels != in_numMips));
} }
AssertFatal(mNumMipLevels <= c_maxMipLevels, "GBitmap::allocateBitmap: too many miplevels"); AssertFatal(mNumMipLevels <= c_maxMipLevels, "GBitmap::allocateBitmap: too many miplevels");

2
Engine/source/platformSDL/sdlInputManager.cpp
View file

@ -822,7 +822,7 @@ DefineEngineStaticMethod(SDLInputManager, ControllerNameForIndex, const char *,
"@see https://wiki.libsdl.org/SDL_GameControllerNameForIndex \n" "@see https://wiki.libsdl.org/SDL_GameControllerNameForIndex \n"
"@ingroup Input") "@ingroup Input")
{ {
if (sdlIndex >= 0 && sdlIndex < SDL_NumJoysticks() || !SDL_IsGameController(sdlIndex)) if ((sdlIndex >= 0 && sdlIndex < SDL_NumJoysticks()) || (!SDL_IsGameController(sdlIndex)))
return SDL_GameControllerNameForIndex(sdlIndex); return SDL_GameControllerNameForIndex(sdlIndex);
return NULL; return NULL;
} }

2
Engine/source/shaderGen/HLSL/debugVizFeatureHLSL.cpp
View file

@ -33,7 +33,7 @@ void DebugVizHLSL::processPix(Vector<ShaderComponent*>& componentList,
S32 vizDisplayMode = Con::getIntVariable("$Viz_DisplayMode", 0); S32 vizDisplayMode = Con::getIntVariable("$Viz_DisplayMode", 0);
S32 surfaceVizMode = Con::getIntVariable("$Viz_SurfacePropertiesModeVar", -1); S32 surfaceVizMode = Con::getIntVariable("$Viz_SurfacePropertiesModeVar", -1);
if (surfaceVizMode != -1 && vizDisplayMode == 0 || vizDisplayMode == 1) if ((surfaceVizMode != -1 && vizDisplayMode == 0) || vizDisplayMode == 1)
{ {
if (color) if (color)
{ {