TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 23:35:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1016 from Azaezel/alpha41/mangledMath

Browse source 
clean up math varsize complaints
This commit is contained in:
Brian Roberts 2023-05-08 21:28:49 -05:00 • committed by GitHub
commit a6f03897ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 73 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/terrain/terrFile.cpp
View file

@ -115,7 +115,7 @@ void TerrainFile::_buildGridMap()
for ( S32 i = mGridLevels; i >= 0; i-- )
{
mGridMap[i] = grid;
grid += 1 << ( 2 * ( mGridLevels - i ) );
grid += (U64)1 << (U64)( 2 * ( mGridLevels - i ) );
}
for( S32 i = mGridLevels; i >= 0; i-- )

2
Engine/source/terrain/terrFile.h
View file

@ -201,7 +201,7 @@ inline TerrainSquare* TerrainFile::findSquare( U32 level, U32 x, U32 y ) const
x >>= level;
y >>= level;
return mGridMap[level] + x + ( y << ( mGridLevels - level ) );
return mGridMap[level] + x + U64( y << U32( mGridLevels - level ) );
}
inline void TerrainFile::setHeight( U32 x, U32 y, U16 height )