Skip to content

bugfix(partitioning): Correct cell world coordinate calculation for overlap checks #477

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix(partitioning): Correct cell world coordinate calculation for overlap checks #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions Generals/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1887,13 +1887,19 @@ void PartitionData::doCircleFillPrecise(Real centerX, Real centerY, Real radius)
ThePartitionManager->worldToCell(centerX + radius, centerY + radius, &maxCellX, &maxCellY);

Real cellSize = ThePartitionManager->getCellSize();
Real halfCellSize = cellSize * 0.5f;

for (Int x = minCellX; x <= maxCellX; ++x)
{
for (Int y = minCellY; y <= maxCellY; ++y)
{
Real cellWorldX = x * cellSize;
Real cellWorldY = y * cellSize;
// getCellCenterPos returns the world-space center of the cell, accounting for
// m_worldExtents.lo offset. Subtracting halfCellSize gives the lower-left corner,
// which is what doesCircleOverlapCell expects.
Real cellWorldX, cellWorldY;
ThePartitionManager->getCellCenterPos(x, y, cellWorldX, cellWorldY);
cellWorldX -= halfCellSize;
cellWorldY -= halfCellSize;

if (doesCircleOverlapCell(centerX, centerY, radius, cellWorldX, cellWorldY, cellSize))
{
Expand Down
10 changes: 8 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Object/PartitionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1891,13 +1891,19 @@ void PartitionData::doCircleFillPrecise(Real centerX, Real centerY, Real radius)
ThePartitionManager->worldToCell(centerX + radius, centerY + radius, &maxCellX, &maxCellY);

Real cellSize = ThePartitionManager->getCellSize();
Real halfCellSize = cellSize * 0.5f;

for (Int x = minCellX; x <= maxCellX; ++x)
{
for (Int y = minCellY; y <= maxCellY; ++y)
{
Real cellWorldX = x * cellSize;
Real cellWorldY = y * cellSize;
// getCellCenterPos returns the world-space center of the cell, accounting for
// m_worldExtents.lo offset. Subtracting halfCellSize gives the lower-left corner,
// which is what doesCircleOverlapCell expects.
Real cellWorldX, cellWorldY;
ThePartitionManager->getCellCenterPos(x, y, cellWorldX, cellWorldY);
cellWorldX -= halfCellSize;
cellWorldY -= halfCellSize;

if (doesCircleOverlapCell(centerX, centerY, radius, cellWorldX, cellWorldY, cellSize))
{
Expand Down
Loading