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

Tilemap: Clamp sampled tileset height to multiple of 32

Browse source
This commit is contained in:
Jonas Kulla 2013-09-30 01:38:46 +02:00
parent c6fc1cb5ad
commit 9d34fc966b
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/tilemap.cpp
View file

@ -243,6 +243,10 @@ struct TilemapPrivate
Vec2i size; Vec2i size;
/* Effective tileset height,
* clamped to a multiple of 32 */
int efTilesetH;
/* Indices of usable /* Indices of usable
* (not null, not disposed) autotiles */ * (not null, not disposed) autotiles */
QVector<uint8_t> usableATs; QVector<uint8_t> usableATs;
@ -357,6 +361,8 @@ struct TilemapPrivate
memset(autotiles, 0, sizeof(autotiles)); memset(autotiles, 0, sizeof(autotiles));
atlas.animatedATs.reserve(autotileCount); atlas.animatedATs.reserve(autotileCount);
atlas.efTilesetH = 0;
tiles.animated = false; tiles.animated = false;
tiles.frameIdx = 0; tiles.frameIdx = 0;
tiles.aniIdx = 0; tiles.aniIdx = 0;
@ -447,7 +453,10 @@ struct TilemapPrivate
return; return;
} }
atlas.size = TileAtlas::minSize(tileset->height(), glState.caps.maxTexSize); int tsH = tileset->height();
atlas.efTilesetH = tsH - (tsH % 32);
atlas.size = TileAtlas::minSize(atlas.efTilesetH, glState.caps.maxTexSize);
if (atlas.size.x < 0) if (atlas.size.x < 0)
throw Exception(Exception::MKXPError, throw Exception(Exception::MKXPError,
@ -591,7 +600,7 @@ struct TilemapPrivate
Q_FOREACH (uint8_t i, atlas.usableATs) Q_FOREACH (uint8_t i, atlas.usableATs)
autotiles[i]->flush(); autotiles[i]->flush();
TileAtlas::BlitList blits = TileAtlas::calcBlits(tileset->height(), atlas.size); TileAtlas::BlitList 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);
@ -768,7 +777,7 @@ struct TilemapPrivate
int tileX = tsInd % 8; int tileX = tsInd % 8;
int tileY = tsInd / 8; int tileY = tsInd / 8;
Vec2i texPos = TileAtlas::tileToAtlasCoor(tileX, tileY, tileset->height(), atlas.size.y); Vec2i texPos = TileAtlas::tileToAtlasCoor(tileX, tileY, atlas.efTilesetH, atlas.size.y);
FloatRect texRect((float) texPos.x+.5, (float) texPos.y+.5, 31, 31); FloatRect texRect((float) texPos.x+.5, (float) texPos.y+.5, 31, 31);
FloatRect posRect(x*32, y*32, 32, 32); FloatRect posRect(x*32, y*32, 32, 32);