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

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0

Browse source
This commit is contained in:
JeffR 2022-02-17 18:30:23 -06:00
commit 6a357d8dfb
1537 changed files with 173488 additions and 37732 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/gui/core/guiControl.cpp
View file

@ -843,7 +843,11 @@ bool GuiControl::onWake()
//increment the profile
mProfile->incLoadCount();
mTooltipProfile->incLoadCount();
if (mTooltipProfile)
{
mTooltipProfile->incLoadCount();
}
// Only invoke script callbacks if we have a namespace in which to do so
// This will suppress warnings
@ -869,7 +873,11 @@ void GuiControl::onSleep()
//decrement the profile reference
mProfile->decLoadCount();
mTooltipProfile->decLoadCount();
if (mTooltipProfile)
{
mTooltipProfile->decLoadCount();
}
// Set Flag
mAwake = false;
@ -2898,7 +2906,7 @@ static ConsoleDocFragment _sGuiControlSetExtent2(
"GuiControl", // The class to place the method in; use NULL for functions.
"void setExtent( Point2I p );" ); // The definition string.
DefineEngineMethod( GuiControl, setExtent, void, ( const char* extOrX, const char* y ), (""),
DefineEngineMethod( GuiControl, setExtent, void, ( const char* extOrX, const char* y ), ("", nullAsType<const char*>()),
"( Point2I p | int x, int y ) Set the width and height of the control.\n\n"
"@hide" )
{

6
Engine/source/gui/core/guiTypes.cpp
View file

@ -68,7 +68,7 @@ GFX_ImplementTextureProfile(GFXGuiCursorProfile,
GFX_ImplementTextureProfile(GFXDefaultGUIProfile,
GFXTextureProfile::DiffuseMap,
GFXTextureProfile::PreserveSize |
GFXTextureProfile::Static | GFXTextureProfile::SRGB |
GFXTextureProfile::Static | GFXTextureProfile::KeepBitmap | GFXTextureProfile::SRGB |
GFXTextureProfile::NoPadding,
GFXTextureProfile::NONE);
@ -79,7 +79,7 @@ GuiCursor::GuiCursor()
mRenderOffset.set(0.0f,0.0f);
mExtent.set(1,1);
INIT_IMAGEASSET(Bitmap);
INIT_ASSET(Bitmap);
}
GuiCursor::~GuiCursor()
@ -324,7 +324,7 @@ GuiControlProfile::GuiControlProfile(void) :
mMouseOverSelected = false;
// bitmap members
INIT_IMAGEASSET(Bitmap);
INIT_ASSET(Bitmap);
mUseBitmapArray = false;
mChildrenProfileName = NULL;

6
Engine/source/gui/core/guiTypes.h
View file

@ -345,7 +345,7 @@ private:
typedef SimObject Parent;
DECLARE_IMAGEASSET(GuiCursor, Bitmap, onImageChanged, GFXGuiCursorProfile);
DECLARE_IMAGEASSET_SETGET(GuiCursor, Bitmap);
DECLARE_ASSET_SETGET(GuiCursor, Bitmap);
Point2I mHotSpot;
Point2F mRenderOffset;
@ -455,7 +455,7 @@ public:
StringTableEntry mBitmapName;
StringTableEntry mBitmapAssetId;
AssetPtr<ImageAsset> mBitmapAsset;
GFXTextureProfile* mBitmapProfile = &GFXTexturePersistentSRGBProfile;
GFXTextureProfile* mBitmapProfile = &GFXDefaultGUIProfile;
public:
const StringTableEntry getBitmapFile() const { return mBitmapName; }
void setBitmapFile(const FileName& _in) { mBitmapName = StringTable->insert(_in.c_str()); }
@ -555,7 +555,7 @@ public:
{
return mBitmap;
}
DECLARE_IMAGEASSET_SETGET(GuiControlProfile, Bitmap);
DECLARE_ASSET_SETGET(GuiControlProfile, Bitmap);
void onBitmapChanged() {}