Skip to content

perf(terrainlogic): Fix bounds of terrain deformation scans in TerrainLogic::flattenTerrain() #3258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 4 commits into from
Oct 2, 2026
+17 −5
Merged

perf(terrainlogic): Fix bounds of terrain deformation scans in TerrainLogic::flattenTerrain() #3258

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56733ad
perf(gamelogic): Bound terrain deformation scans
bobtista Sep 4, 2026
0995c38
refactor(terrain): Use std::max for deformation bounds
bobtista Sep 24, 2026
0f18622
refactor(gamelogic): Remove the redundant algorithm include
bobtista Sep 24, 2026
f30f6f7
refactor(gamelogic): Clamp deformation rows before the loops for reta…
bobtista Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions Core/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2663,12 +2663,16 @@ void TerrainLogic::flattenTerrain(Object *obj)
iMin.y = REAL_TO_INT_FLOOR(minY/MAP_XY_FACTOR);
iMax.x = REAL_TO_INT_FLOOR(maxX/MAP_XY_FACTOR);
iMax.y = REAL_TO_INT_FLOOR(maxY/MAP_XY_FACTOR);
#if RETAIL_COMPATIBLE_CRC
// TheSuperHackers @info bobtista 29/09/2026 Retail scans from row 0, so rows below the map edge stay untouched.
iMin.y = std::max(0, iMin.y);
#endif

Int i, j;
Real totalHeight = 0;
Int numSamples = 0;
for (i=iMin.x; i<=iMax.x; i++) {
for (j=0; j<=iMax.y; j++) {
for (j=iMin.y; j<=iMax.y; ++j) {
Vector3 testPt(i*MAP_XY_FACTOR, j*MAP_XY_FACTOR, 0);
Bool match = false;
unsigned char flags;
Expand All @@ -2694,7 +2698,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
if (rawDataHeight>centerHeight) rawDataHeight = centerHeight;

for (i=iMin.x; i<=iMax.x; i++) {
for (j=0; j<=iMax.y; j++) {
for (j=iMin.y; j<=iMax.y; ++j) {
Vector3 testPt(i*MAP_XY_FACTOR, j*MAP_XY_FACTOR, 0);
Bool match = false;
unsigned char flags;
Expand Down Expand Up @@ -2754,12 +2758,16 @@ void TerrainLogic::flattenTerrain(Object *obj)
iMin.y = REAL_TO_INT_FLOOR((pos->y-radius)/MAP_XY_FACTOR);
iMax.x = REAL_TO_INT_FLOOR((pos->x+radius)/MAP_XY_FACTOR);
iMax.y = REAL_TO_INT_FLOOR((pos->y+radius)/MAP_XY_FACTOR);
#if RETAIL_COMPATIBLE_CRC
// TheSuperHackers @info bobtista 29/09/2026 Retail scans from row 0, so rows below the map edge stay untouched.
iMin.y = std::max(0, iMin.y);
#endif

Int i, j;
Real totalHeight = 0;
Int numSamples = 0;
for (i=iMin.x; i<=iMax.x; i++) {
for (j=0; j<=iMax.y; j++) {
for (j=iMin.y; j<=iMax.y; ++j) {
Vector3 testPt(i*MAP_XY_FACTOR, j*MAP_XY_FACTOR, 0);
Bool match = false;
Real dx = testPt.X - pos->x;
Expand All @@ -2777,7 +2785,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
Real avgHeight = totalHeight/numSamples;
Int rawDataHeight = REAL_TO_INT_FLOOR(0.5f + avgHeight/MAP_HEIGHT_SCALE);
for (i=iMin.x; i<=iMax.x; i++) {
for (j=0; j<=iMax.y; j++) {
for (j=iMin.y; j<=iMax.y; ++j) {
Vector3 testPt(i*MAP_XY_FACTOR, j*MAP_XY_FACTOR, 0);
Bool match = false;
Real dx = testPt.X - pos->x;
Expand Down Expand Up @@ -2847,12 +2855,16 @@ void TerrainLogic::createCraterInTerrain(Object *obj)
iMin.y = REAL_TO_INT_FLOOR( ( pos->y - radius ) / MAP_XY_FACTOR );
iMax.x = REAL_TO_INT_FLOOR( ( pos->x + radius ) / MAP_XY_FACTOR );
iMax.y = REAL_TO_INT_FLOOR( ( pos->y + radius ) / MAP_XY_FACTOR );
#if RETAIL_COMPATIBLE_CRC
// TheSuperHackers @info bobtista 29/09/2026 Retail scans from row 0, so rows below the map edge stay untouched.
iMin.y = std::max( 0, iMin.y );
#endif

Real deltaX, deltaY;

for (Int i = iMin.x; i <= iMax.x; i++ )
{
for ( Int j=0; j <= iMax.y; j++ )
for ( Int j=iMin.y; j <= iMax.y; ++j )
Comment thread
xezon marked this conversation as resolved.
{
deltaX = ( i * MAP_XY_FACTOR ) - pos->x;
deltaY = ( j * MAP_XY_FACTOR ) - pos->y;
Expand Down
Loading