TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-06-11 07:54:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

same change but for gbitmap

Browse source 
make sure to use the namespace TSShape
This commit is contained in:
marauder2k7 2026-06-07 22:30:56 +01:00
parent e83bab90d7
commit 3aac9af35e
5 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Engine/source/gfx/bitmap/gBitmap.cpp
View file

@ -38,8 +38,13 @@ using namespace Torque;
const U32 GBitmap::csFileVersion = 3;
Vector<GBitmap::Registration> GBitmap::sRegistrations( __FILE__, __LINE__ );
Vector<GBitmap::Registration>& GBitmap::getBitmapRegistrations()
{
static Vector<GBitmap::Registration> * regs =
new Vector<GBitmap::Registration>(__FILE__, __LINE__);
return *regs;
}
GBitmap::GBitmap()
: mInternalFormat(GFXFormatR8G8B8),
@ -198,24 +203,24 @@ U32 GBitmap::getFormatBytesPerPixel(GFXFormat fmt)
void GBitmap::sRegisterFormat( const GBitmap::Registration &reg )
{
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 &reg = GBitmap::sRegistrations[i];
const GBitmap::Registration &reg = GBitmap::getBitmapRegistrations()[i];
const Vector<String> &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 &reg = sRegistrations[i];
const Registration &reg = GBitmap::getBitmapRegistrations()[i];
const Vector<String> &extensions = reg.extensions;
for ( U32 j = 0; j < extensions.size(); ++j )
@ -266,9 +271,9 @@ bool GBitmap::sFindFiles( const Path &path, Vector<Path> *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 &reg = GBitmap::sRegistrations[i];
const GBitmap::Registration &reg = GBitmap::getBitmapRegistrations()[i];
const Vector<String> &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 &reg = sRegistrations[i];
const Registration &reg = GBitmap::getBitmapRegistrations()[i];
for ( U32 j = 0; j < reg.extensions.size(); j++ )
{
list += reg.extensions[j];

2
Engine/source/gfx/bitmap/gBitmap.h
View file

@ -278,7 +278,7 @@ public:
template<class T, dsize_t mapLength>
void swizzle(const Swizzle<T,mapLength> *s);
static Vector<Registration> sRegistrations;
static Vector<Registration>& getBitmapRegistrations();
private:
GFXFormat mInternalFormat;

4
Engine/source/gfx/gfxTextureManager.cpp
View file

@ -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 &reg = GBitmap::sRegistrations[i];
const GBitmap::Registration &reg = GBitmap::getBitmapRegistrations()[i];
const Vector<String> &extensions = reg.extensions;
for (U32 j = 0; j < extensions.size(); ++j)

4
Engine/source/ts/collada/colladaShapeLoader.cpp
View file

@ -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 &reg = GBitmap::sRegistrations[i];
GBitmap::Registration &reg = GBitmap::getBitmapRegistrations()[i];
for(S32 j = 0;j < reg.extensions.size();++j)
{
path.setExtension(reg.extensions[j]);

18
Engine/source/ts/tsShape.cpp
View file

@ -41,25 +41,25 @@
// Vector<TSShape::ShapeRegistration> TSShape::sShapeRegistrations(__FILE__, __LINE__);
Vector<TSShape::ShapeRegistration>& TSShape::getShapeRegistrations()
{
static Vector<TSShape::ShapeRegistration>* regs =
new Vector<TSShape::ShapeRegistration>(__FILE__, __LINE__);
{
static Vector<TSShape::ShapeRegistration>* regs =
new Vector<TSShape::ShapeRegistration>(__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<ShapeFormat>& extensions = exporting ? reg.export_extensions : reg.extensions;
for (U32 j = 0; j < extensions.size(); j++)