From 3aac9af35ef14ee39ee9712e3696e1c0f273b30a Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Sun, 7 Jun 2026 22:30:56 +0100 Subject: [PATCH] same change but for gbitmap make sure to use the namespace TSShape --- Engine/source/gfx/bitmap/gBitmap.cpp | 31 +++++++++++-------- Engine/source/gfx/bitmap/gBitmap.h | 2 +- Engine/source/gfx/gfxTextureManager.cpp | 4 +-- .../source/ts/collada/colladaShapeLoader.cpp | 4 +-- Engine/source/ts/tsShape.cpp | 18 +++++------ 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/Engine/source/gfx/bitmap/gBitmap.cpp b/Engine/source/gfx/bitmap/gBitmap.cpp index 8da452654..13dbb1fec 100644 --- a/Engine/source/gfx/bitmap/gBitmap.cpp +++ b/Engine/source/gfx/bitmap/gBitmap.cpp @@ -38,8 +38,13 @@ using namespace Torque; const U32 GBitmap::csFileVersion = 3; -Vector GBitmap::sRegistrations( __FILE__, __LINE__ ); +Vector& GBitmap::getBitmapRegistrations() +{ + static Vector * regs = + new Vector(__FILE__, __LINE__); + return *regs; +} GBitmap::GBitmap() : mInternalFormat(GFXFormatR8G8B8), @@ -198,24 +203,24 @@ U32 GBitmap::getFormatBytesPerPixel(GFXFormat fmt) void GBitmap::sRegisterFormat( const GBitmap::Registration ® ) { - U32 insert = sRegistrations.size(); - for ( U32 i = 0; i < sRegistrations.size(); i++ ) + U32 insert = GBitmap::getBitmapRegistrations().size(); + for ( U32 i = 0; i < GBitmap::getBitmapRegistrations().size(); i++ ) { - if ( sRegistrations[i].priority <= reg.priority ) + if ( GBitmap::getBitmapRegistrations()[i].priority <= reg.priority ) { insert = i; break; } } - sRegistrations.insert( insert, reg ); + GBitmap::getBitmapRegistrations().insert( insert, reg ); } const GBitmap::Registration *GBitmap::sFindRegInfo( const String &extension ) { - for ( U32 i = 0; i < GBitmap::sRegistrations.size(); i++ ) + for ( U32 i = 0; i < GBitmap::getBitmapRegistrations().size(); i++ ) { - const GBitmap::Registration ® = GBitmap::sRegistrations[i]; + const GBitmap::Registration ® = GBitmap::getBitmapRegistrations()[i]; const Vector &extensions = reg.extensions; for ( U32 j = 0; j < extensions.size(); ++j ) @@ -236,9 +241,9 @@ bool GBitmap::sFindFile( const Path &path, Path *outPath ) Path tryPath( path ); - for ( U32 i = 0; i < sRegistrations.size(); i++ ) + for ( U32 i = 0; i < GBitmap::getBitmapRegistrations().size(); i++ ) { - const Registration ® = sRegistrations[i]; + const Registration ® = GBitmap::getBitmapRegistrations()[i]; const Vector &extensions = reg.extensions; for ( U32 j = 0; j < extensions.size(); ++j ) @@ -266,9 +271,9 @@ bool GBitmap::sFindFiles( const Path &path, Vector *outFoundPaths ) Path tryPath( path ); - for ( U32 i = 0; i < GBitmap::sRegistrations.size(); i++ ) + for ( U32 i = 0; i < GBitmap::getBitmapRegistrations().size(); i++ ) { - const GBitmap::Registration ® = GBitmap::sRegistrations[i]; + const GBitmap::Registration ® = GBitmap::getBitmapRegistrations()[i]; const Vector &extensions = reg.extensions; for ( U32 j = 0; j < extensions.size(); ++j ) @@ -292,9 +297,9 @@ String GBitmap::sGetExtensionList() { String list; - for ( U32 i = 0; i < sRegistrations.size(); i++ ) + for ( U32 i = 0; i < GBitmap::getBitmapRegistrations().size(); i++ ) { - const Registration ® = sRegistrations[i]; + const Registration ® = GBitmap::getBitmapRegistrations()[i]; for ( U32 j = 0; j < reg.extensions.size(); j++ ) { list += reg.extensions[j]; diff --git a/Engine/source/gfx/bitmap/gBitmap.h b/Engine/source/gfx/bitmap/gBitmap.h index 8e99e47dd..86bb910b2 100644 --- a/Engine/source/gfx/bitmap/gBitmap.h +++ b/Engine/source/gfx/bitmap/gBitmap.h @@ -278,7 +278,7 @@ public: template void swizzle(const Swizzle *s); - static Vector sRegistrations; + static Vector& getBitmapRegistrations(); private: GFXFormat mInternalFormat; diff --git a/Engine/source/gfx/gfxTextureManager.cpp b/Engine/source/gfx/gfxTextureManager.cpp index 177978ff7..ebf509cfe 100644 --- a/Engine/source/gfx/gfxTextureManager.cpp +++ b/Engine/source/gfx/gfxTextureManager.cpp @@ -858,14 +858,14 @@ Torque::Path GFXTextureManager::validatePath(const Torque::Path &path) // Now loop through the rest of the GBitmap extensions // to see if we have any matches - for (U32 i = 0; i < GBitmap::sRegistrations.size(); i++) + for (U32 i = 0; i < GBitmap::getBitmapRegistrations().size(); i++) { // If we have gotten a match (either in this loop or before) // then we can exit if (textureExt) break; - const GBitmap::Registration ® = GBitmap::sRegistrations[i]; + const GBitmap::Registration ® = GBitmap::getBitmapRegistrations()[i]; const Vector &extensions = reg.extensions; for (U32 j = 0; j < extensions.size(); ++j) diff --git a/Engine/source/ts/collada/colladaShapeLoader.cpp b/Engine/source/ts/collada/colladaShapeLoader.cpp index b94e5aa11..584081ed9 100644 --- a/Engine/source/ts/collada/colladaShapeLoader.cpp +++ b/Engine/source/ts/collada/colladaShapeLoader.cpp @@ -407,9 +407,9 @@ void ColladaShapeLoader::computeBounds(Box3F& bounds) String findTextureExtension(const Torque::Path &texPath) { Torque::Path path(texPath); - for(S32 i = 0;i < GBitmap::sRegistrations.size();++i) + for(S32 i = 0;i < GBitmap::getBitmapRegistrations().size();++i) { - GBitmap::Registration ® = GBitmap::sRegistrations[i]; + GBitmap::Registration ® = GBitmap::getBitmapRegistrations()[i]; for(S32 j = 0;j < reg.extensions.size();++j) { path.setExtension(reg.extensions[j]); diff --git a/Engine/source/ts/tsShape.cpp b/Engine/source/ts/tsShape.cpp index 43e3b40fe..2e232a6d2 100644 --- a/Engine/source/ts/tsShape.cpp +++ b/Engine/source/ts/tsShape.cpp @@ -41,25 +41,25 @@ // Vector TSShape::sShapeRegistrations(__FILE__, __LINE__); Vector& TSShape::getShapeRegistrations() - { - static Vector* regs = - new Vector(__FILE__, __LINE__); +{ + static Vector* regs = + new Vector(__FILE__, __LINE__); - return *regs; - } + return *regs; +} void TSShape::sRegisterFormat(const ShapeRegistration& reg) { - U32 insert = getShapeRegistrations().size(); - getShapeRegistrations().insert(insert, reg); + U32 insert = TSShape::getShapeRegistrations().size(); + TSShape::getShapeRegistrations().insert(insert, reg); } const TSShape::ShapeRegistration* TSShape::sFindShapeRegInfo(const String& extension, bool exporting) { - for (U32 i = 0; i < getShapeRegistrations().size(); i++) + for (U32 i = 0; i < TSShape::getShapeRegistrations().size(); i++) { - const TSShape::ShapeRegistration& reg = getShapeRegistrations()[i]; + const TSShape::ShapeRegistration& reg = TSShape::getShapeRegistrations()[i]; const Vector& extensions = exporting ? reg.export_extensions : reg.extensions; for (U32 j = 0; j < extensions.size(); j++)