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

Rename typedef and fix wrong documenting comment

This commit is contained in:
Jonas Kulla 2014-01-16 19:16:09 +01:00
parent 316457b988
commit b0a41a23e0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tileatlas.h
View File

@ -46,16 +46,17 @@ struct Blit
{} {}
}; };
typedef std::vector<Blit> BlitList; typedef std::vector<Blit> BlitVec;
/* Calculates the minimum atlas size required to hold /* Calculates the minimum atlas size required to hold
* a tileset of height 'tilesetH'. If the required dimensions * a tileset of height 'tilesetH'. If the required dimensions
* exceed 'maxAtlasSize', Vec2i(-1, -1) is returned. */ * exceed 'maxAtlasSize', Vec2i(-1, -1) is returned. */
Vec2i minSize(int tilesetH, int maxAtlasSize); Vec2i minSize(int tilesetH, int maxAtlasSize);
/* Calculates a series of blits necessary to fill dstRows /* Calculates a series of blits necessary to fill an atlas
* with srcRows without wasting any space */ * of size 'atlasSize' with a tileset of height 'tilesetH'.
BlitList calcBlits(int tilesetH, const Vec2i &atlasSize); * Usually fed results from 'minSize()'. */
BlitVec calcBlits(int tilesetH, const Vec2i &atlasSize);
/* Translates a tile coordinate (not pixel!) to a physical /* Translates a tile coordinate (not pixel!) to a physical
* pixel coordinate in the atlas */ * pixel coordinate in the atlas */

2
src/tilemap.cpp
View File

@ -630,7 +630,7 @@ struct TilemapPrivate
for (size_t i = 0; i < atlas.usableATs.size(); ++i) for (size_t i = 0; i < atlas.usableATs.size(); ++i)
autotiles[atlas.usableATs[i]]->flush(); autotiles[atlas.usableATs[i]]->flush();
TileAtlas::BlitList blits = TileAtlas::calcBlits(atlas.efTilesetH, atlas.size); TileAtlas::BlitVec blits = TileAtlas::calcBlits(atlas.efTilesetH, atlas.size);
/* Clear atlas */ /* Clear atlas */
FBO::bind(atlas.gl.fbo, FBO::Draw); FBO::bind(atlas.gl.fbo, FBO::Draw);