TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #679 from Azaezel/alpha40/cubeCrashCorrection

Browse source 
set cubemapsaver profile to one that preserves sizes
This commit is contained in:
Brian Roberts 2021-11-21 19:25:12 -06:00 • committed by GitHub
commit 637f54e859
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/D3D11/gfxD3D11TextureObject.cpp
View file

@ -198,8 +198,8 @@ bool GFXD3D11TextureObject::copyToBmp(GBitmap* bmp)
PROFILE_START(GFXD3D11TextureObject_copyToBmp); PROFILE_START(GFXD3D11TextureObject_copyToBmp);
AssertFatal(bmp->getWidth() == getWidth(), "GFXD3D11TextureObject::copyToBmp - source/dest width does not match"); AssertFatal(bmp->getWidth() == getWidth(), avar("GFXGLTextureObject::copyToBmp - Width mismatch: %i vs %i", bmp->getWidth(), getWidth()));
AssertFatal(bmp->getHeight() == getHeight(), "GFXD3D11TextureObject::copyToBmp - source/dest height does not match"); AssertFatal(bmp->getHeight() == getHeight(), avar("GFXGLTextureObject::copyToBmp - Height mismatch: %i vs %i", bmp->getHeight(), getHeight()));
const U32 mipLevels = getMipLevels(); const U32 mipLevels = getMipLevels();
bmp->setHasTransparency(mHasTransparency); bmp->setHasTransparency(mHasTransparency);

2
Engine/source/gfx/bitmap/cubemapSaver.cpp
View file

@ -56,7 +56,7 @@ namespace CubemapSaver
for (U32 face = 0; face < CubeFaces; face++) for (U32 face = 0; face < CubeFaces; face++)
{ {
pTextures[face].set(faceSize, faceSize, targetFmt, pTextures[face].set(faceSize, faceSize, targetFmt,
&GFXStaticTextureProfile, avar("%s() - (line %d)", __FUNCTION__, __LINE__), &GFXTexturePersistentProfile, avar("%s() - (line %d)", __FUNCTION__, __LINE__),
mipLevels, GFXTextureManager::AA_MATCH_BACKBUFFER); mipLevels, GFXTextureManager::AA_MATCH_BACKBUFFER);
// yep t3d has funky z up, need to change the face order // yep t3d has funky z up, need to change the face order

4
Engine/source/gfx/gl/gfxGLTextureObject.cpp
View file

@ -162,8 +162,8 @@ bool GFXGLTextureObject::copyToBmp(GBitmap * bmp)
if (mFormat != GFXFormatR16G16B16A16F && mFormat != GFXFormatR8G8B8A8 && mFormat != GFXFormatR8G8B8A8_LINEAR_FORCE && mFormat != GFXFormatR8G8B8A8_SRGB) if (mFormat != GFXFormatR16G16B16A16F && mFormat != GFXFormatR8G8B8A8 && mFormat != GFXFormatR8G8B8A8_LINEAR_FORCE && mFormat != GFXFormatR8G8B8A8_SRGB)
return false; return false;
AssertFatal(bmp->getWidth() == getWidth(), "GFXGLTextureObject::copyToBmp - invalid size"); AssertFatal(bmp->getWidth() == getWidth(), avar("GFXGLTextureObject::copyToBmp - Width mismatch: %i vs %i", bmp->getWidth(), getWidth()));
AssertFatal(bmp->getHeight() == getHeight(), "GFXGLTextureObject::copyToBmp - invalid size"); AssertFatal(bmp->getHeight() == getHeight(), avar("GFXGLTextureObject::copyToBmp - Height mismatch: %i vs %i", bmp->getHeight(), getHeight()));
PROFILE_SCOPE(GFXGLTextureObject_copyToBmp); PROFILE_SCOPE(GFXGLTextureObject_copyToBmp);