TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1478 from Azaezel/alpha41/bitmapBonk

Browse source 
fix a couple cases of old direct references
This commit is contained in:
Brian Roberts 2025-05-21 12:42:08 -05:00 • committed by GitHub
commit 95fb6a3768
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/gui/controls/guiAnimBitmapCtrl.cpp
View file

@ -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);

6
Engine/source/gui/controls/guiBitmapBarCtrl.cpp
View file

@ -56,12 +56,12 @@ void GuiBitmapBarCtrl::initPersistFields()
void GuiBitmapBarCtrl::onRender(Point2I offset, const RectI &updateRect) void GuiBitmapBarCtrl::onRender(Point2I offset, const RectI &updateRect)
{ {
if (mBitmap) if (getBitmap())
{ {
GFX->getDrawUtil()->clearBitmapModulation(); GFX->getDrawUtil()->clearBitmapModulation();
GFX->getDrawUtil()->setBitmapModulation(mColor); GFX->getDrawUtil()->setBitmapModulation(mColor);
F32 pct = (mPercent / 100.0); F32 pct = (mPercent / 100.0);
GFXTextureObject* texture = mBitmap; GFXTextureObject* texture = getBitmap();
Point2I modifiedSRC; Point2I modifiedSRC;
modifiedSRC.x = mVertical ? (F32)texture->mBitmapSize.x : (F32)(texture->mBitmapSize.x*pct); modifiedSRC.x = mVertical ? (F32)texture->mBitmapSize.x : (F32)(texture->mBitmapSize.x*pct);
modifiedSRC.y = mVertical ? (F32)(texture->mBitmapSize.y*pct) : (F32)texture->mBitmapSize.y; modifiedSRC.y = mVertical ? (F32)(texture->mBitmapSize.y*pct) : (F32)texture->mBitmapSize.y;
@ -92,7 +92,7 @@ void GuiBitmapBarCtrl::onRender(Point2I offset, const RectI &updateRect)
GFX->getDrawUtil()->drawBitmapStretchSR(texture, destRegion, srcRegion, GFXBitmapFlip_None, GFXTextureFilterLinear, false); GFX->getDrawUtil()->drawBitmapStretchSR(texture, destRegion, 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);

8
Engine/source/gui/game/guiIdleCamFadeBitmapCtrl.cpp
View file

@ -115,14 +115,14 @@ public:
} }
ColorI color(255,255,255,alpha); ColorI color(255,255,255,alpha);
if (mBitmap) if (getBitmap())
{ {
GFX->getDrawUtil()->setBitmapModulation(color); GFX->getDrawUtil()->setBitmapModulation(color);
if(mWrap) if(mWrap)
{ {
GFXTextureObject* texture = mBitmap; GFXTextureObject* texture = getBitmap();
RectI srcRegion; RectI srcRegion;
RectI dstRegion; RectI dstRegion;
F32 xdone = ((F32)getExtent().x/(F32)texture->mBitmapSize.x)+1; F32 xdone = ((F32)getExtent().x/(F32)texture->mBitmapSize.x)+1;
@ -145,11 +145,11 @@ public:
else else
{ {
RectI rect(offset, getExtent()); RectI rect(offset, getExtent());
GFX->getDrawUtil()->drawBitmapStretch(mBitmap, rect); GFX->getDrawUtil()->drawBitmapStretch(getBitmap(), rect);
} }
} }
if (mProfile->mBorder || !mBitmap) if (mProfile->mBorder || !getBitmap())
{ {
RectI rect(offset.x, offset.y, getExtent().x, getExtent().y); RectI rect(offset.x, offset.y, getExtent().x, getExtent().y);
ColorI borderCol(mProfile->mBorderColor); ColorI borderCol(mProfile->mBorderColor);