Skip to content

chore(pathfinder): Cleanup formatting and fix an incomplete optimization in PathfindZoneManager:calculateZones() #2360

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 5 commits into from
Feb 28, 2026
Merged

chore(pathfinder): Cleanup formatting and fix an incomplete optimization in PathfindZoneManager:calculateZones() #2360

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61084a9
chore(pathfinder): Change leading spaces to leading tabs in PathfindZ…
Mauller Feb 27, 2026
21afa34
chore(pathfinder): Change open braces to be K&R style in PathfindZone…
Mauller Feb 27, 2026
5664d42
chore(pathfinder): Change while loops to for loops in PathfindZoneMan…
Mauller Feb 27, 2026
0b2702f
chore(pathfinder): Remove register variable and use member variable d…
Mauller Feb 27, 2026
2b8e7fd
fix(pathfinder): Add missing logical block for zone type optimization…
Mauller Feb 27, 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
234 changes: 97 additions & 137 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp
View file
Open in desktop
Comment thread
xezon marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -2618,195 +2618,157 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
Int collapsedZones[maxZones];
collapsedZones[0] = 0;

i = 1;
while ( i < totalZones )
{
for (i=1; i<totalZones; i++) {
Int zone = zoneEquivalency[ i ];
if (zone == i)
{
if (zone == i) {
collapsedZones[ i ] = m_maxZone;
++m_maxZone;
}
else
else
collapsedZones[ i ] = collapsedZones[zone];

++i;
}
}

// Now map the zones in the map back into the collapsed zones.
j=globalBounds.lo.y;
while( j<=globalBounds.hi.y )
{
i=globalBounds.lo.x;
while( i<=globalBounds.hi.x )
{
PathfindCell &cell = map[i][j];
for( j=globalBounds.lo.y; j<=globalBounds.hi.y; j++ ) {
for( i=globalBounds.lo.x; i<=globalBounds.hi.x; i++ ) {
PathfindCell &cell = map[i][j];
cell.setZone(collapsedZones[cell.getZone()]);
++i;
}
++j;
}

i = 0;
while ( i <= LAYER_LAST )
{
PathfindLayer &r_thisLayer = layers[i];

for (i=0; i<=LAYER_LAST; i++) {
PathfindLayer &r_thisLayer = layers[i];

Int zone = collapsedZones[r_thisLayer.getZone()];
if (zone == 0)
{
if (zone == 0) {
zone = m_maxZone;
m_maxZone++;
}

r_thisLayer.setZone( zone );
r_thisLayer.applyZone();
r_thisLayer.setZone( zone );
r_thisLayer.applyZone();

if (!r_thisLayer.isUnused() && !r_thisLayer.isDestroyed())
{
if (!r_thisLayer.isUnused() && !r_thisLayer.isDestroyed()) {
ICoord2D ndx;
r_thisLayer.getStartCellIndex(&ndx);
setBridge(ndx.x, ndx.y, true);
r_thisLayer.getEndCellIndex(&ndx);
setBridge(ndx.x, ndx.y, true);
}

++i;
}

allocateZones();

for (xBlock=0; xBlock<xCount; xBlock++)
{
for (yBlock=0; yBlock<yCount; yBlock++)
{
for (xBlock=0; xBlock<xCount; xBlock++) {
for (yBlock=0; yBlock<yCount; yBlock++) {
IRegion2D bounds;
bounds.lo.x = globalBounds.lo.x + xBlock*ZONE_BLOCK_SIZE;
bounds.lo.y = globalBounds.lo.y + yBlock*ZONE_BLOCK_SIZE;
bounds.hi.x = bounds.lo.x + ZONE_BLOCK_SIZE - 1; // bounds are inclusive.
bounds.hi.y = bounds.lo.y + ZONE_BLOCK_SIZE - 1; // bounds are inclusive.

if (bounds.hi.x > globalBounds.hi.x)
if (bounds.hi.x > globalBounds.hi.x)
bounds.hi.x = globalBounds.hi.x;

if (bounds.hi.y > globalBounds.hi.y)
if (bounds.hi.y > globalBounds.hi.y)
bounds.hi.y = globalBounds.hi.y;

m_zoneBlocks[xBlock][yBlock].blockCalculateZones(map, layers, bounds);
}
}

i = 0;
while ( i < m_zonesAllocated )
{
m_groundCliffZones[i] = m_groundWaterZones[i] = m_groundRubbleZones[i] = m_terrainZones[i] = m_crusherZones[i] = m_hierarchicalZones[i] = i;
i++;
}
// Determine water/ground equivalent zones, and ground/cliff equivalent zones.
for (i=0; i<m_zonesAllocated; i++) {
m_groundCliffZones[i] = i;
m_groundWaterZones[i] = i;
m_groundRubbleZones[i] = i;
m_terrainZones[i] = i;
m_crusherZones[i] = i;
m_hierarchicalZones[i] = i;

@Mauller Mauller Feb 27, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note - This change is how it was implemented in generals, it makes comparissons in winmerge easier and is far cleaner than the refactor zero hour introduced

}

REGISTER UnsignedInt maxZone = m_maxZone;
j=globalBounds.lo.y;
while( j <= globalBounds.hi.y )
{
i=globalBounds.lo.x;
while( i <= globalBounds.hi.x )
{
PathfindCell &r_thisCell = map[i][j];
for( j=globalBounds.lo.y; j<=globalBounds.hi.y; j++ ) {
for( i=globalBounds.lo.x; i<=globalBounds.hi.x; i++ ) {
PathfindCell &r_thisCell = map[i][j];

if ( (r_thisCell.getConnectLayer() > LAYER_GROUND) &&
(r_thisCell.getType() == PathfindCell::CELL_CLEAR) )
{
(r_thisCell.getType() == PathfindCell::CELL_CLEAR) ) {
PathfindLayer *layer = layers + r_thisCell.getConnectLayer();
resolveZones(r_thisCell.getZone(), layer->getZone(), m_hierarchicalZones, maxZone);
resolveZones(r_thisCell.getZone(), layer->getZone(), m_hierarchicalZones, m_maxZone);
}

if ( i > globalBounds.lo.x && r_thisCell.getZone() != map[i-1][j].getZone() )
{
const PathfindCell &r_leftCell = map[i-1][j];
if ( i > globalBounds.lo.x && r_thisCell.getZone() != map[i-1][j].getZone() ) {
const PathfindCell &r_leftCell = map[i-1][j];

if (r_thisCell.getType() == r_leftCell.getType())
applyZone(r_thisCell, r_leftCell, m_hierarchicalZones, maxZone);//if this is true, skip all the ones below
else
{
Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below
applyZone(r_thisCell, r_leftCell, m_hierarchicalZones, m_maxZone);//if this is true, skip all the ones below
else {
Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below

if (terrain(r_thisCell, r_leftCell))
{
applyZone(r_thisCell, r_leftCell, m_terrainZones, maxZone);
notTerrainOrCrusher = FALSE;
}
if (terrain(r_thisCell, r_leftCell)) {
applyZone(r_thisCell, r_leftCell, m_terrainZones, m_maxZone);
notTerrainOrCrusher = FALSE;
}

if (crusherGround(r_thisCell, r_leftCell))
{
applyZone(r_thisCell, r_leftCell, m_crusherZones, maxZone);
notTerrainOrCrusher = FALSE;
}
if (crusherGround(r_thisCell, r_leftCell)) {
applyZone(r_thisCell, r_leftCell, m_crusherZones, m_maxZone);
notTerrainOrCrusher = FALSE;
}

if ( notTerrainOrCrusher )
{
if (waterGround(r_thisCell, r_leftCell))
applyZone(r_thisCell, r_leftCell, m_groundWaterZones, maxZone);
else if (groundRubble(r_thisCell, r_leftCell))
applyZone(r_thisCell, r_leftCell, m_groundRubbleZones, maxZone);
else if (groundCliff(r_thisCell, r_leftCell))
applyZone(r_thisCell, r_leftCell, m_groundCliffZones, maxZone);
}
if ( notTerrainOrCrusher ) {
if (waterGround(r_thisCell, r_leftCell))
applyZone(r_thisCell, r_leftCell, m_groundWaterZones, m_maxZone);
else if (groundRubble(r_thisCell, r_leftCell))
applyZone(r_thisCell, r_leftCell, m_groundRubbleZones, m_maxZone);
else if (groundCliff(r_thisCell, r_leftCell))
applyZone(r_thisCell, r_leftCell, m_groundCliffZones, m_maxZone);
}

}
}

}
}

if (j>globalBounds.lo.y && r_thisCell.getZone()!=map[i][j-1].getZone())
{
const PathfindCell &r_topCell = map[i][j-1];
if (j>globalBounds.lo.y && r_thisCell.getZone()!=map[i][j-1].getZone()) {
const PathfindCell &r_topCell = map[i][j-1];

if (r_thisCell.getType() == r_topCell.getType())
applyZone(r_thisCell, r_topCell, m_hierarchicalZones, maxZone);
else
{
Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below
if (r_thisCell.getType() == r_topCell.getType())
applyZone(r_thisCell, r_topCell, m_hierarchicalZones, m_maxZone);
else {
Bool notTerrainOrCrusher = TRUE; // if this is false, skip the if-else-ladder below

if (terrain(r_thisCell, r_topCell))
{
applyZone(r_thisCell, r_topCell, m_terrainZones, maxZone);
notTerrainOrCrusher = FALSE;
}
if (terrain(r_thisCell, r_topCell)) {
applyZone(r_thisCell, r_topCell, m_terrainZones, m_maxZone);
notTerrainOrCrusher = FALSE;
}

if (crusherGround(r_thisCell, r_topCell))
{
applyZone(r_thisCell, r_topCell, m_crusherZones, maxZone);
notTerrainOrCrusher = FALSE;
}
if (crusherGround(r_thisCell, r_topCell)) {
applyZone(r_thisCell, r_topCell, m_crusherZones, m_maxZone);
notTerrainOrCrusher = FALSE;
}

if (waterGround(r_thisCell,r_topCell))
applyZone(r_thisCell, r_topCell, m_groundWaterZones, maxZone);
else if (groundRubble(r_thisCell, r_topCell))
applyZone(r_thisCell, r_topCell, m_groundRubbleZones, maxZone);
else if (groundCliff(r_thisCell,r_topCell))
applyZone(r_thisCell, r_topCell, m_groundCliffZones, maxZone);
if (notTerrainOrCrusher) {
Comment thread
xezon marked this conversation as resolved.
if (waterGround(r_thisCell, r_topCell))
applyZone(r_thisCell, r_topCell, m_groundWaterZones, m_maxZone);
else if (groundRubble(r_thisCell, r_topCell))
applyZone(r_thisCell, r_topCell, m_groundRubbleZones, m_maxZone);
else if (groundCliff(r_thisCell, r_topCell))
applyZone(r_thisCell, r_topCell, m_groundCliffZones, m_maxZone);
}

@Mauller Mauller Feb 27, 2026 •
edited
Loading

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note - This change is why the PR wants to be merged by rebase. It will make the dif cleaner in the unification PR as well.

This is a small optimisation overall and wants to be seperate in case we needed to revert it.


}
}

}
}

++i;
}
}

++j;
//FLATTEN HIERARCHICAL ZONES
for (i=1; i<m_maxZone; i++) {
Int zone = m_hierarchicalZones[i];
m_hierarchicalZones[i] = m_hierarchicalZones[zone];

@Mauller Mauller Feb 27, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note - This change is how it was implemented in generals, minus the comment being removed. I left the zero hour comment above the for loop instead to keep the code block clearer.

}

//FLATTEN HIERARCHICAL ZONES
{
i = 1;
REGISTER Int zone;
while ( i < maxZone )
{ // Flatten hierarchical zones.
zone = m_hierarchicalZones[i];
m_hierarchicalZones[i] = m_hierarchicalZones[ zone ];
++i;
}
}

//THIS BLOCK IS 20%
//THIS BLOCK IS 20%
flattenZones(m_groundCliffZones, m_hierarchicalZones, m_maxZone);
flattenZones(m_groundWaterZones, m_hierarchicalZones, m_maxZone);
flattenZones(m_groundRubbleZones, m_hierarchicalZones, m_maxZone);
Expand All @@ -2818,21 +2780,19 @@ void PathfindZoneManager::calculateZones( PathfindCell **map, PathfindLayer laye
QueryPerformanceCounter((LARGE_INTEGER *)&endTime64);
timeToUpdate = ((double)(endTime64-startTime64) / (double)(freq64));

if ( updateSamples < 400 )
{
averageTimeToUpdate = ((averageTimeToUpdate * updateSamples) + timeToUpdate) / (updateSamples + 1.0f);
updateSamples++;
DEBUG_LOG(("computing...: %f", averageTimeToUpdate));
}
else if ( updateSamples == 400 )
{
DEBUG_LOG((" =============DONE============= Average time to calculate zones: %f", averageTimeToUpdate));
DEBUG_LOG((" Percent of baseline : %f", averageTimeToUpdate/0.003335f));
updateSamples = 777;
if ( updateSamples < 400 ) {
averageTimeToUpdate = ((averageTimeToUpdate * updateSamples) + timeToUpdate) / (updateSamples + 1.0f);
updateSamples++;
DEBUG_LOG(("computing...: %f", averageTimeToUpdate));
}
else if ( updateSamples == 400 ) {
DEBUG_LOG((" =============DONE============= Average time to calculate zones: %f", averageTimeToUpdate));
DEBUG_LOG((" Percent of baseline : %f", averageTimeToUpdate/0.003335f));
updateSamples = 777;
#ifdef forceRefreshCalling
s_stopForceCalling = TRUE;
s_stopForceCalling = TRUE;
#endif
}
}

#endif
#endif
Expand Down Expand Up @@ -2967,7 +2927,7 @@ void PathfindZoneManager::updateZonesForModify(PathfindCell **map, PathfindLayer
}
}
}
}
}
}
#ifdef DEBUG_QPF
#if defined(DEBUG_LOGGING)
Expand Down
Loading