TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-05 21:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1340 from marauder2k9-torque/ImageAsset-NamedTexTarget

Browse source 
NamedTexTargets as ImageAssets
This commit is contained in:
Brian Roberts 2024-12-23 03:12:22 -06:00 • committed by GitHub
commit 69fa4b389f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 168 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gui/controls/guiPopUpCtrl.h
View file

@ -126,9 +126,9 @@ protected:
NumBitmapModes = 2
};
DECLARE_IMAGEASSET_ARRAY(GuiPopUpMenuCtrl, Bitmap, NumBitmapModes);
DECLARE_IMAGEASSET_ARRAY(GuiPopUpMenuCtrl, Bitmap, NumBitmapModes, onBitmapChanged);
DECLARE_IMAGEASSET_ARRAY_SETGET(GuiPopUpMenuCtrl, Bitmap);
void onBitmapChanged() {}
Point2I mBitmapBounds; // Added
S32 mIdMax;

4
Engine/source/gui/controls/guiPopUpCtrlEx.h
View file

@ -131,9 +131,9 @@ class GuiPopUpMenuCtrlEx : public GuiTextCtrl
NumBitmapModes = 2
};
DECLARE_IMAGEASSET_ARRAY(GuiPopUpMenuCtrlEx, Bitmap, NumBitmapModes);
DECLARE_IMAGEASSET_ARRAY(GuiPopUpMenuCtrlEx, Bitmap, NumBitmapModes, onBitmapChanged);
DECLARE_IMAGEASSET_ARRAY_SETGET(GuiPopUpMenuCtrlEx, Bitmap);
void onBitmapChanged() {}
Point2I mBitmapBounds; // Added
S32 mIdMax;