|
@@ -219,7 +219,7 @@ bool guiAnimBitmapCtrl::ptSetFrameRanges(void *object, const char *index, const
|
|
|
|
|
|
void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
|
|
void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
|
|
{
|
|
{
|
|
- if (mBitmap)
|
|
|
|
|
|
+ if (getBitmap())
|
|
{
|
|
{
|
|
if (mFrameTime->getElapsedMs() > 1000 / mFramesPerSec) //fps to msfp conversion
|
|
if (mFrameTime->getElapsedMs() > 1000 / mFramesPerSec) //fps to msfp conversion
|
|
{
|
|
{
|
|
@@ -278,7 +278,7 @@ void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
|
|
GFX->getDrawUtil()->clearBitmapModulation();
|
|
GFX->getDrawUtil()->clearBitmapModulation();
|
|
GFX->getDrawUtil()->setBitmapModulation(mColor);
|
|
GFX->getDrawUtil()->setBitmapModulation(mColor);
|
|
|
|
|
|
- GFXTextureObject* texture = mBitmap;
|
|
|
|
|
|
+ GFXTextureObject* texture = getBitmap();
|
|
|
|
|
|
Point2I modifiedSRC = Point2I(texture->mBitmapSize.x / mAnimTexTiling.x, texture->mBitmapSize.y / mAnimTexTiling.y);
|
|
Point2I modifiedSRC = Point2I(texture->mBitmapSize.x / mAnimTexTiling.x, texture->mBitmapSize.y / mAnimTexTiling.y);
|
|
RectI srcRegion;
|
|
RectI srcRegion;
|
|
@@ -292,7 +292,7 @@ void guiAnimBitmapCtrl::onRender(Point2I offset, const RectI &updateRect)
|
|
GFX->getDrawUtil()->drawBitmapStretchSR(texture, updateRect, srcRegion, GFXBitmapFlip_None, GFXTextureFilterLinear, false);
|
|
GFX->getDrawUtil()->drawBitmapStretchSR(texture, updateRect, srcRegion, GFXBitmapFlip_None, GFXTextureFilterLinear, false);
|
|
}
|
|
}
|
|
|
|
|
|
- if (mProfile->mBorder || !mBitmap)
|
|
|
|
|
|
+ if (mProfile->mBorder || !getBitmap())
|
|
{
|
|
{
|
|
RectI rect(offset, getExtent());
|
|
RectI rect(offset, getExtent());
|
|
GFX->getDrawUtil()->drawRect(rect, mProfile->mBorderColor);
|
|
GFX->getDrawUtil()->drawRect(rect, mProfile->mBorderColor);
|