Skip to content

perf(terrain): Optimize terrain texture data access and add null checks #439

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
+6 −2
Open

perf(terrain): Optimize terrain texture data access and add null checks #439

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
8 changes: 6 additions & 2 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,11 @@ int TerrainTextureClass::update(WorldHeightMap *htMap)
ICoord2D position = pTile->m_tileLocationInTexture;
if (position.x<=0) continue; // all real tile offsets start at 2. jba.

UnsignedByte *pTileRGB = pTile->getRGBDataForWidth(tilePixelExtent);
if (!pTileRGB) continue;
Int i,j;
for (j=0; j<tilePixelExtent; j++) {
UnsignedByte *pBGR = pTile->getRGBDataForWidth(tilePixelExtent);
UnsignedByte *pBGR = pTileRGB;
pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
Int row = position.y+j;
UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
Expand Down Expand Up @@ -805,11 +807,13 @@ int AlphaEdgeTextureClass::update(WorldHeightMap *htMap)
if (!pTile) continue;
ICoord2D position = pTile->m_tileLocationInTexture;
if (position.x<=0) continue; // all real edge offsets start at 4. jba.
UnsignedByte *pEdgeRGB = pTile->getRGBDataForWidth(tilePixelExtent);
if (!pEdgeRGB) continue;
Int i,j;
Int column = position.x;
for (j=0; j<tilePixelExtent; j++) {
Int row = position.y+j;
UnsignedByte *pBGR = htMap->getEdgeTile(tileNdx)->getRGBDataForWidth(tilePixelExtent);
UnsignedByte *pBGR = pEdgeRGB;
pBGR += (tilePixelExtent-1-j)*TILE_BYTES_PER_PIXEL*tilePixelExtent; // invert to match.
UnsignedByte *pBGRX = ((UnsignedByte*)locked_rect.pBits) +
(row)*surface_desc.Width*pixelBytes;
Expand Down
Loading