gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix drawing creatures in UICreature 

I will leave this ugly hack for the time being, but I do encourage to change it later on. The whole "resize" boolean makes no sense since the outfit is resized by the destination rectangle anyway. I believe we should give it a try with a real size of the object defined in dat by the user for creatures bigger than 32x32.

Please keep in mind that we did cut bigger creatures to 48x48 (2*Otc::TILE_PIXELS*0.75f) before as well, so nothing really changed besides ability to properly draw bigger creatures than 64x64 on battlelist.
This commit is contained in:
Konrad Kuśnierz 2015-05-12 23:44:10 +02:00
parent 6bd0e37670
commit c3c2ac80e7
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/client/creature.cpp
View File

@ -200,29 +200,24 @@ void Creature::drawOutfit(const Rect& destRect, bool resize)
else else
exactSize = g_things.rawGetThingType(m_outfit.getAuxId(), m_outfit.getCategory())->getExactSize(); exactSize = g_things.rawGetThingType(m_outfit.getAuxId(), m_outfit.getCategory())->getExactSize();
int frameSize;
if(!resize)
frameSize = std::max<int>(exactSize * 0.75f, 2 * Otc::TILE_PIXELS * 0.75f);
else if(!(frameSize = exactSize))
return;
if(g_graphics.canUseFBO()) { if(g_graphics.canUseFBO()) {
const FrameBufferPtr& outfitBuffer = g_framebuffers.getTemporaryFrameBuffer(); const FrameBufferPtr& outfitBuffer = g_framebuffers.getTemporaryFrameBuffer();
outfitBuffer->resize(Size(exactSize, exactSize)); outfitBuffer->resize(Size(frameSize, frameSize));
outfitBuffer->bind(); outfitBuffer->bind();
g_painter->setAlphaWriting(true); g_painter->setAlphaWriting(true);
g_painter->clear(Color::alpha); g_painter->clear(Color::alpha);
internalDrawOutfit(Point(exactSize - Otc::TILE_PIXELS, exactSize - Otc::TILE_PIXELS) + getDisplacement(), 1, false, true, Otc::South); internalDrawOutfit(Point(frameSize - Otc::TILE_PIXELS, frameSize - Otc::TILE_PIXELS) + getDisplacement(), 1, false, true, Otc::South);
outfitBuffer->release(); outfitBuffer->release();
outfitBuffer->draw(destRect, Rect(0,0,frameSize,frameSize));
Rect srcRect;
if(resize)
srcRect.resize(exactSize, exactSize);
else
srcRect.resize(exactSize*0.75f, exactSize*0.75f);
srcRect.moveBottomRight(Point(exactSize - 1, exactSize - 1));
outfitBuffer->draw(destRect, srcRect);
} else { } else {
float scaleFactor; float scaleFactor = destRect.width() / (float)frameSize;
if(resize) Point dest = destRect.bottomRight() - (Point(Otc::TILE_PIXELS,Otc::TILE_PIXELS) - getDisplacement()) * scaleFactor;
scaleFactor = destRect.width() / (float)exactSize;
else
scaleFactor = destRect.width() / (float)(exactSize*0.75f);
Point dest = destRect.bottomRight() - (Point(exactSize - Otc::TILE_PIXELS, exactSize - Otc::TILE_PIXELS) - getDisplacement()) * scaleFactor;
internalDrawOutfit(dest, scaleFactor, false, true, Otc::South); internalDrawOutfit(dest, scaleFactor, false, true, Otc::South);
} }
} }