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

Update the internal naming convention for pixel formats.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2019-12-23 23:38:04 -04:00
parent 157d7637ed
commit f3b52f66fe
27 changed files with 436 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/font/BMFontRasterizer.cpp
+5 -5
View File
@@ -147,7 +147,7 @@ BMFontRasterizer::BMFontRasterizer(love::filesystem::FileData *fontdef, const st
// The parseConfig function will try to load any missing page images.
for (int i = 0; i < (int) imagelist.size(); i++)
{
if (imagelist[i]->getFormat() != PIXELFORMAT_RGBA8)
if (imagelist[i]->getFormat() != PIXELFORMAT_RGBA8_UNORM)
throw love::Exception("Only 32-bit RGBA images are supported in BMFonts.");
images[i] = imagelist[i];
@@ -211,7 +211,7 @@ void BMFontRasterizer::parseConfig(const std::string &configtext)
ImageData *imagedata = imagemodule->newImageData(data.get());
if (imagedata->getFormat() != PIXELFORMAT_RGBA8)
if (imagedata->getFormat() != PIXELFORMAT_RGBA8_UNORM)
{
imagedata->release();
throw love::Exception("Only 32-bit RGBA images are supported in BMFonts.");
@@ -298,16 +298,16 @@ GlyphData *BMFontRasterizer::getGlyphData(uint32 glyph) const
// Return an empty GlyphData if we don't have the glyph character.
if (it == characters.end())
return new GlyphData(glyph, GlyphMetrics(), PIXELFORMAT_RGBA8);
return new GlyphData(glyph, GlyphMetrics(), PIXELFORMAT_RGBA8_UNORM);
const BMFontCharacter &c = it->second;
const auto &imagepair = images.find(c.page);
if (imagepair == images.end())
return new GlyphData(glyph, GlyphMetrics(), PIXELFORMAT_RGBA8);
return new GlyphData(glyph, GlyphMetrics(), PIXELFORMAT_RGBA8_UNORM);
image::ImageData *imagedata = imagepair->second.get();
GlyphData *g = new GlyphData(glyph, c.metrics, PIXELFORMAT_RGBA8);
GlyphData *g = new GlyphData(glyph, c.metrics, PIXELFORMAT_RGBA8_UNORM);
size_t pixelsize = imagedata->getPixelSize();
src/modules/font/GlyphData.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ GlyphData::GlyphData(uint32 glyph, GlyphMetrics glyphMetrics, PixelFormat f)
, data(nullptr)
, format(f)
{
if (f != PIXELFORMAT_LA8 && f != PIXELFORMAT_RGBA8)
if (f != PIXELFORMAT_LA8_UNORM && f != PIXELFORMAT_RGBA8_UNORM)
throw love::Exception("Invalid GlyphData pixel format.");
if (metrics.width > 0 && metrics.height > 0)
src/modules/font/ImageRasterizer.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ ImageRasterizer::ImageRasterizer(love::image::ImageData *data, uint32 *glyphs, i
{
this->dpiScale = dpiscale;
if (data->getFormat() != PIXELFORMAT_RGBA8)
if (data->getFormat() != PIXELFORMAT_RGBA8_UNORM)
throw love::Exception("Only 32-bit RGBA images are supported in Image Fonts!");
load();
@@ -68,7 +68,7 @@ GlyphData *ImageRasterizer::getGlyphData(uint32 glyph) const
gm.height = metrics.height;
GlyphData *g = new GlyphData(glyph, gm, PIXELFORMAT_RGBA8);
GlyphData *g = new GlyphData(glyph, gm, PIXELFORMAT_RGBA8_UNORM);
if (gm.width == 0)
return g;
src/modules/font/freetype/TrueTypeRasterizer.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ GlyphData *TrueTypeRasterizer::getGlyphData(uint32 glyph) const
glyphMetrics.width = bitmap.width;
glyphMetrics.advance = (int) (ftglyph->advance.x >> 16);
GlyphData *glyphData = new GlyphData(glyph, glyphMetrics, PIXELFORMAT_LA8);
GlyphData *glyphData = new GlyphData(glyph, glyphMetrics, PIXELFORMAT_LA8_UNORM);
const uint8 *pixels = bitmap.buffer;
uint8 *dest = (uint8 *) glyphData->getData();