TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 15:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert #1148 as prematurely incorporated

Browse source 
it's getting there, but there have been a few spots noted where it eroneously corrupts text, so we'll have to pull this back out for a bit barring a proper resolution
This commit is contained in:
AzaezelX 2024-01-11 13:33:03 -06:00
parent 78b56688d3
commit f946088214
22 changed files with 1813 additions and 20385 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Engine/source/gfx/gFont.cpp
View file

@ -699,8 +699,7 @@ bool GFont::read(Stream& io_rStream)
for(i = 0; i < numSheets; i++)
{
GBitmap *bmp = new GBitmap;
String path = String::ToString("%s/%s %d %d (%s).png", Con::getVariable("$GUI::fontCacheDirectory"), mFaceName.c_str(), mSize, i, getCharSetName(mCharSet));
if(!bmp->readBitmap("png", path))
if(!bmp->readBitmap("png", io_rStream))
{
delete bmp;
return false;
@ -776,11 +775,8 @@ bool GFont::write(Stream& stream)
}
stream.write(mTextureSheets.size());
for (i = 0; i < mTextureSheets.size(); i++)
{
String path = String::ToString("%s/%s %d %d (%s).png", Con::getVariable("$GUI::fontCacheDirectory"), mFaceName.c_str(), mSize, i, getCharSetName(mCharSet));
mTextureSheets[i].getBitmap()->writeBitmap("png", path);
}
for(i = 0; i < mTextureSheets.size(); i++)
mTextureSheets[i].getBitmap()->writeBitmap("png", stream);
stream.write(mCurX);
stream.write(mCurY);
@ -869,9 +865,20 @@ void GFont::exportStrip(const char *fileName, U32 padding, U32 kerning)
// Advance.
curWidth += mCharInfoList[i].width + kerning + 2*padding;
}
// Write the image!
FileStream fs;
fs.open( fileName, Torque::FS::File::Write );
if(fs.getStatus() != Stream::Ok)
{
Con::errorf("GFont::exportStrip - failed to open '%s' for writing.", fileName);
return;
}
// Done!
gb.writeBitmap("png", fileName);
gb.writeBitmap("png", fs);
}
void GFont::setPlatformFont(PlatformFont *inPlatformFont)