Skip to content

perf(gamelogic): Bound terrain deformation scans #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

Draft
bobtista wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Draft

perf(gamelogic): Bound terrain deformation scans #3258

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: 5 additions & 5 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,7 +2706,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
Real totalHeight = 0;
Int numSamples = 0;
for (i=iMin.x; i<=iMax.x; i++) {
for (j=0; j<=iMax.y; j++) {
for (j=MAX(0, 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 @@ -2732,7 +2732,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=MAX(0, 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 @@ -2797,7 +2797,7 @@ void TerrainLogic::flattenTerrain(Object *obj)
Real totalHeight = 0;
Int numSamples = 0;
for (i=iMin.x; i<=iMax.x; i++) {
for (j=0; j<=iMax.y; j++) {
for (j=MAX(0, 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 @@ -2815,7 +2815,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=MAX(0, 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 @@ -2892,7 +2892,7 @@ void TerrainLogic::createCraterInTerrain(Object *obj)

for (Int i = iMin.x; i <= iMax.x; i++ )
{
for ( Int j=0; j <= iMax.y; j++ )
for ( Int j=MAX( 0, iMin.y ); j <= iMax.y; ++j )
{
deltaX = ( i * MAP_XY_FACTOR ) - pos->x;
deltaY = ( j * MAP_XY_FACTOR ) - pos->y;
Expand Down
Loading