Had some rounding around the wrong way.
Change-Id: I90ea339c35074ca7287c069bdbdd106578b1501b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
struct helper{
static int divRoundUp(int a, int b){return (a+b-1)/b;}
};
struct helper{
static int divRoundUp(int a, int b){return (a+b-1)/b;}
};
- int rowsNeeded = helper::divRoundUp(state->frames(), helper::divRoundUp(maxSize, state->frameWidth()));
+ int rowsNeeded = helper::divRoundUp(state->frames(), (maxSize / state->frameWidth()));
if (rowsNeeded * state->frameHeight() > maxSize){
qWarning() << "SpriteEngine: Animation too large to fit in one texture..." << state->source().toLocalFile();
qWarning() << "SpriteEngine: Your texture max size today is " << maxSize;
}
state->m_generatedCount = rowsNeeded;
h += state->frameHeight() * rowsNeeded;
if (rowsNeeded * state->frameHeight() > maxSize){
qWarning() << "SpriteEngine: Animation too large to fit in one texture..." << state->source().toLocalFile();
qWarning() << "SpriteEngine: Your texture max size today is " << maxSize;
}
state->m_generatedCount = rowsNeeded;
h += state->frameHeight() * rowsNeeded;
- w = qMax(w, helper::divRoundUp(maxSize, state->frameWidth()));
+ w = qMax(w, ((int)(maxSize / state->frameWidth())) * state->frameWidth());
m_imageStateCount += rowsNeeded;
}else{
h += state->frameHeight();
m_imageStateCount += rowsNeeded;
}else{
h += state->frameHeight();