TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-28 02:53:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore LIBPNG for png files

Browse source 
Restores the use of libpng for png files as stb does not support writing out 16bit png files.
This commit is contained in:
marauder2k7 2025-12-31 11:00:07 +00:00
parent e9296bc882
commit 7f351ef429
489 changed files with 170208 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

87
Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp
View file

@ -104,7 +104,7 @@ static struct _privateRegisterSTB
GBitmap::Registration reg;
reg.priority = 100;
reg.extensions.push_back("png");
//reg.extensions.push_back("png");
reg.extensions.push_back("bmp");
reg.extensions.push_back("jpg");
reg.extensions.push_back("jpeg");
@ -433,88 +433,3 @@ bool sWriteStreamSTB(const String& bmType, Stream& stream, GBitmap* bitmap, U32
return false;
}
struct DeferredPNGWriterData
{
S32 width = 0;
S32 height = 0;
S32 channels = 0;
dsize_t offset = 0;
U8* pPixelData = NULL;
GFXFormat format;
Stream* pStream = NULL;
};
DeferredPNGWriter::DeferredPNGWriter() :
mData(NULL),
mActive(false)
{
mData = new DeferredPNGWriterData();
}
DeferredPNGWriter::~DeferredPNGWriter()
{
if (mData)
{
SAFE_DELETE_ARRAY(mData->pPixelData);
}
SAFE_DELETE(mData);
}
bool DeferredPNGWriter::begin(GFXFormat format, S32 width, S32 height, Stream& stream)
{
// ONLY RGB bitmap writing supported at this time!
AssertFatal(format == GFXFormatR8G8B8 ||
format == GFXFormatR8G8B8A8 ||
format == GFXFormatR8G8B8X8 ||
format == GFXFormatA8 ||
format == GFXFormatR5G6B5, "DeferredPNGWriter::begin: ONLY RGB bitmap writing supported at this time.");
if (format != GFXFormatR8G8B8 &&
format != GFXFormatR8G8B8A8 &&
format != GFXFormatR8G8B8X8 &&
format != GFXFormatA8 &&
format != GFXFormatR5G6B5)
{
return false;
}
mData->pStream = &stream;
mData->width = width;
mData->height = height;
mData->format = format;
const size_t dataSize = GFXFormat_getByteSize(format) * width * height;
mData->pPixelData = new U8[dataSize];
mActive = true;
return true;
}
void DeferredPNGWriter::append(GBitmap* bitmap, U32 rows)
{
AssertFatal(mActive, "Cannot append to an inactive DeferredPNGWriter!");
if (mData->channels == 0)
{
mData->channels = bitmap->getBytesPerPixel();
}
const dsize_t dataChuckSize = bitmap->getByteSize();
const U8* pSrcData = bitmap->getBits();
U8* pDstData = mData->pPixelData + mData->offset;
dMemcpy(pDstData, pSrcData, dataChuckSize);
mData->offset += dataChuckSize;
}
void DeferredPNGWriter::end()
{
AssertFatal(mActive, "Cannot end an inactive DeferredPNGWriter!");
stbi_write_png_to_func(stbiWriteFunc, mData->pStream, mData->width, mData->height, mData->channels, mData->pPixelData, mData->width * mData->channels);
mActive = false;
}