MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Remove Qt style forloop

Browse source
This commit is contained in:
Jonas Kulla 2013-12-27 06:19:30 +01:00
parent f3def32461
commit fbf02cf2ce
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tilemap.cpp
View file

@ -627,8 +627,8 @@ struct TilemapPrivate
updateAutotileInfo(); updateAutotileInfo();
Q_FOREACH (uint8_t i, atlas.usableATs) for (size_t i = 0; i < atlas.usableATs.size(); ++i)
autotiles[i]->flush(); autotiles[atlas.usableATs[i]]->flush();
TileAtlas::BlitList blits = TileAtlas::calcBlits(atlas.efTilesetH, atlas.size); TileAtlas::BlitList blits = TileAtlas::calcBlits(atlas.efTilesetH, atlas.size);
@ -643,13 +643,16 @@ struct TilemapPrivate
glState.clearColor.pop(); glState.clearColor.pop();
/* Blit autotiles */ /* Blit autotiles */
Q_FOREACH (uint8_t i, atlas.usableATs) for (size_t i = 0; i < atlas.usableATs.size(); ++i)
{ {
int blitW = std::min(autotiles[i]->width(), atAreaW); const uint8_t atInd = atlas.usableATs[i];
int blitH = std::min(autotiles[i]->height(), atAreaH); Bitmap *autotile = autotiles[atInd];
FBO::bind(autotiles[i]->getGLTypes().fbo, FBO::Read); int blitW = std::min(autotile->width(), atAreaW);
FBO::blit(0, 0, 0, i*autotileH, blitW, blitH); int blitH = std::min(autotile->height(), atAreaH);
FBO::bind(autotile->getGLTypes().fbo, FBO::Read);
FBO::blit(0, 0, 0, atInd*autotileH, blitW, blitH);
} }
/* Blit tileset */ /* Blit tileset */