LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reduced the RAM and VRAM space taken up by TrueType font glyphs by 1/2.

Browse Source
This commit is contained in:
Alex Szpakowski
2013-12-31 20:15:55 -04:00
parent a00c006c44
commit f3bd944cf5
5 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Font.cpp
+5 -5
View File
@@ -73,7 +73,7 @@ Font::Font(love::font::Rasterizer *r, const Image::Filter &filter)
try
{
gd = r->getGlyphData(32);
type = (gd->getFormat() == love::font::GlyphData::FORMAT_LUMINANCE_ALPHA) ? FONT_TRUETYPE : FONT_IMAGE;
type = (gd->getFormat() == love::font::GlyphData::FORMAT_ALPHA) ? FONT_TRUETYPE : FONT_IMAGE;
loadVolatile();
}
@@ -96,7 +96,7 @@ Font::~Font()
bool Font::initializeTexture(GLenum format)
{
GLint internalformat = (format == GL_LUMINANCE_ALPHA) ? GL_LUMINANCE8_ALPHA8 : GL_RGBA8;
GLint internalformat = (format == GL_ALPHA) ? GL_ALPHA8 : GL_RGBA8;
// clear errors before initializing
while (glGetError() != GL_NO_ERROR);
@@ -130,7 +130,7 @@ void Font::createTexture()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
GLenum format = (type == FONT_TRUETYPE ? GL_LUMINANCE_ALPHA : GL_RGBA);
GLenum format = (type == FONT_TRUETYPE ? GL_ALPHA : GL_RGBA);
// Initialize the texture, attempting smaller sizes if initialization fails.
bool initialized = false;
@@ -158,7 +158,7 @@ void Font::createTexture()
}
// Fill the texture with transparent black.
std::vector<GLubyte> emptyData(textureWidth * textureHeight * (type == FONT_TRUETYPE ? 2 : 4), 0);
std::vector<GLubyte> emptyData(textureWidth * textureHeight * (type == FONT_TRUETYPE ? 1 : 4), 0);
glTexSubImage2D(GL_TEXTURE_2D,
0,
0, 0,
@@ -208,7 +208,7 @@ Font::Glyph *Font::addGlyph(uint32 glyph)
textureX,
textureY,
w, h,
(type == FONT_TRUETYPE ? GL_LUMINANCE_ALPHA : GL_RGBA),
(type == FONT_TRUETYPE ? GL_ALPHA : GL_RGBA),
GL_UNSIGNED_BYTE,
gd->getData());
src/modules/graphics/opengl/Graphics.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ bool Graphics::setMode(int width, int height)
glLoadIdentity();
// Set pixel row alignment
glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
// Reload all volatile objects.
if (!Volatile::loadAll())