From 0dcd272b873300c858617bdf7d77cee92232de1a Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 31 Oct 2021 14:38:02 -0500 Subject: [PATCH 1/3] clean up more texture profile refs to kill spam --- Engine/source/gui/buttons/guiIconButtonCtrl.h | 2 +- Engine/source/gui/buttons/guiToolboxButtonCtrl.h | 6 +++--- Engine/source/gui/controls/guiTreeViewCtrl.cpp | 2 +- Engine/source/gui/core/guiTypes.cpp | 2 +- Engine/source/gui/core/guiTypes.h | 2 +- Engine/source/gui/worldEditor/editorIconRegistry.cpp | 6 +++--- Engine/source/gui/worldEditor/guiMissionArea.h | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.h b/Engine/source/gui/buttons/guiIconButtonCtrl.h index 8196fef49..081201ad8 100644 --- a/Engine/source/gui/buttons/guiIconButtonCtrl.h +++ b/Engine/source/gui/buttons/guiIconButtonCtrl.h @@ -42,7 +42,7 @@ private: protected: - DECLARE_IMAGEASSET(GuiIconButtonCtrl, Bitmap, onImageChanged, GFXTexturePersistentSRGBProfile); + DECLARE_IMAGEASSET(GuiIconButtonCtrl, Bitmap, onImageChanged, GFXDefaultGUIProfile); DECLARE_ASSET_SETGET(GuiIconButtonCtrl, Bitmap); S32 mIconLocation; diff --git a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h index 8741cdee9..fd3e360ad 100644 --- a/Engine/source/gui/buttons/guiToolboxButtonCtrl.h +++ b/Engine/source/gui/buttons/guiToolboxButtonCtrl.h @@ -39,11 +39,11 @@ private: protected: - DECLARE_IMAGEASSET(GuiToolboxButtonCtrl, NormalBitmap, onNormalImageChanged, GFXTexturePersistentSRGBProfile); + DECLARE_IMAGEASSET(GuiToolboxButtonCtrl, NormalBitmap, onNormalImageChanged, GFXDefaultGUIProfile); DECLARE_ASSET_SETGET(GuiToolboxButtonCtrl, NormalBitmap); - DECLARE_IMAGEASSET(GuiToolboxButtonCtrl, LoweredBitmap, onLoweredImageChanged, GFXTexturePersistentSRGBProfile); + DECLARE_IMAGEASSET(GuiToolboxButtonCtrl, LoweredBitmap, onLoweredImageChanged, GFXDefaultGUIProfile); DECLARE_ASSET_SETGET(GuiToolboxButtonCtrl, LoweredBitmap); - DECLARE_IMAGEASSET(GuiToolboxButtonCtrl, HoverBitmap, onHoverImageChanged, GFXTexturePersistentSRGBProfile); + DECLARE_IMAGEASSET(GuiToolboxButtonCtrl, HoverBitmap, onHoverImageChanged, GFXDefaultGUIProfile); DECLARE_ASSET_SETGET(GuiToolboxButtonCtrl, HoverBitmap); void renderButton(GFXTexHandle &texture, Point2I &offset, const RectI& updateRect); diff --git a/Engine/source/gui/controls/guiTreeViewCtrl.cpp b/Engine/source/gui/controls/guiTreeViewCtrl.cpp index aaed67a78..ae5517a5e 100644 --- a/Engine/source/gui/controls/guiTreeViewCtrl.cpp +++ b/Engine/source/gui/controls/guiTreeViewCtrl.cpp @@ -1880,7 +1880,7 @@ bool GuiTreeViewCtrl::buildIconTable(const char * icons) dStrncpy( buf, start, getMin( sizeof( buf ) / sizeof( buf[ 0 ] ) - 1, len ) ); buf[ len ] = '\0'; - mIconTable[ numIcons ] = GFXTexHandle( buf, &GFXTexturePersistentProfile, avar( "%s() - mIconTable[%d] (line %d)", __FUNCTION__, numIcons, __LINE__ ) ); + mIconTable[ numIcons ] = GFXTexHandle( buf, &GFXDefaultGUIProfile, avar( "%s() - mIconTable[%d] (line %d)", __FUNCTION__, numIcons, __LINE__ ) ); } else mIconTable[ numIcons ] = GFXTexHandle(); diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp index d4575d21a..85032a2ed 100644 --- a/Engine/source/gui/core/guiTypes.cpp +++ b/Engine/source/gui/core/guiTypes.cpp @@ -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); diff --git a/Engine/source/gui/core/guiTypes.h b/Engine/source/gui/core/guiTypes.h index c82c2fd50..37b77d57d 100644 --- a/Engine/source/gui/core/guiTypes.h +++ b/Engine/source/gui/core/guiTypes.h @@ -455,7 +455,7 @@ public: StringTableEntry mBitmapName; StringTableEntry mBitmapAssetId; AssetPtr 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()); } diff --git a/Engine/source/gui/worldEditor/editorIconRegistry.cpp b/Engine/source/gui/worldEditor/editorIconRegistry.cpp index b75a28335..97a75c6ba 100644 --- a/Engine/source/gui/worldEditor/editorIconRegistry.cpp +++ b/Engine/source/gui/worldEditor/editorIconRegistry.cpp @@ -25,7 +25,7 @@ #include "console/engineAPI.h" #include "console/simBase.h" - +#include "gui/core/guiTypes.h" EditorIconRegistry gEditorIcons; @@ -60,7 +60,7 @@ void EditorIconRegistry::loadFromPath( const String &path, bool overwrite ) String defaultIconFile = path + "default"; mDefaultIcon.set( defaultIconFile, - &GFXTexturePersistentSRGBProfile, + &GFXDefaultGUIProfile, avar("%s() - mIcons[] (line %d)", __FUNCTION__, __LINE__) ); } @@ -68,7 +68,7 @@ void EditorIconRegistry::loadFromPath( const String &path, bool overwrite ) void EditorIconRegistry::add( const String &className, const String &imageFile, bool overwrite ) { // First see if we can load the image. - GFXTexHandle icon( imageFile, &GFXTexturePersistentSRGBProfile, + GFXTexHandle icon( imageFile, &GFXDefaultGUIProfile, avar("%s() - mIcons[] (line %d)", __FUNCTION__, __LINE__) ); if ( icon.isNull() ) return; diff --git a/Engine/source/gui/worldEditor/guiMissionArea.h b/Engine/source/gui/worldEditor/guiMissionArea.h index 32d68ecc7..947cd5a8c 100644 --- a/Engine/source/gui/worldEditor/guiMissionArea.h +++ b/Engine/source/gui/worldEditor/guiMissionArea.h @@ -63,7 +63,7 @@ protected: GFXStateBlockRef mBlendStateBlock; GFXStateBlockRef mSolidStateBlock; - DECLARE_IMAGEASSET(GuiMissionAreaCtrl, HandleBitmap, onHandleBitmapChanged, GFXTexturePersistentSRGBProfile); + DECLARE_IMAGEASSET(GuiMissionAreaCtrl, HandleBitmap, onHandleBitmapChanged, GFXDefaultGUIProfile); DECLARE_ASSET_SETGET(GuiMissionAreaCtrl, HandleBitmap); Point2I mHandleTextureSize; From 2b53c065ce99d03c9efbaa46cf32a61a9865edca Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Tue, 2 Nov 2021 13:55:57 -0400 Subject: [PATCH 2/3] * BugFix: Correct an invalid memory access error caused by the tab autocomplete in the console when attempting to tab complete at the start of the input while there is text to the right. --- Engine/source/console/console.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Engine/source/console/console.cpp b/Engine/source/console/console.cpp index 750db2a17..14e75f0f8 100644 --- a/Engine/source/console/console.cpp +++ b/Engine/source/console/console.cpp @@ -485,6 +485,13 @@ U32 tabComplete(char* inputBuffer, U32 cursorPos, U32 maxResultLength, bool forw } completionBaseStart = p; completionBaseLen = cursorPos - p; + + // Bail if we end up at start of string + if (p == 0) + { + return cursorPos; + } + // Is this function being invoked on an object? if (inputBuffer[p - 1] == '.') { From 215a93e9af9ce0c3b100bca0561e7f9e78507578 Mon Sep 17 00:00:00 2001 From: Robert MacGregor Date: Tue, 2 Nov 2021 17:36:22 -0400 Subject: [PATCH 3/3] * BugFix: Correction for compiling on x86 Unix devices. --- Engine/source/platformX86UNIX/x86UNIXFileio.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Engine/source/platformX86UNIX/x86UNIXFileio.cpp b/Engine/source/platformX86UNIX/x86UNIXFileio.cpp index 591b28f1c..d702d6417 100644 --- a/Engine/source/platformX86UNIX/x86UNIXFileio.cpp +++ b/Engine/source/platformX86UNIX/x86UNIXFileio.cpp @@ -76,6 +76,7 @@ extern int x86UNIXClose(int fd); extern ssize_t x86UNIXRead(int fd, void *buf, size_t nbytes); extern ssize_t x86UNIXWrite(int fd, const void *buf, size_t nbytes); + extern bool ResolvePathCaseInsensitive(char* pathName, S32 pathNameSize, bool requiredAbsolute); const int MaxPath = PATH_MAX;