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

Unify pixel format enums for ImageData, CompressedImageData, and Canvas into a single PixelFormat enum.

Browse Source 
Replace love.graphics.getRawImageFormats and love.graphics.getCompressedImageFormats with love.graphics.getImageFormats.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-11-27 22:53:23 -04:00
parent cbba8c40a6
commit 0a3adc0839
50 changed files with 1042 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/CompressedImageData.cpp
+2 -55
View File
@@ -26,7 +26,7 @@ namespace image
{
CompressedImageData::CompressedImageData()
: format(FORMAT_UNKNOWN)
: format(PIXELFORMAT_UNKNOWN)
, sRGB(false)
, data(nullptr)
, dataSize(0)
@@ -80,7 +80,7 @@ int CompressedImageData::getHeight(int miplevel) const
return dataImages[miplevel].height;
}
CompressedImageData::Format CompressedImageData::getFormat() const
PixelFormat CompressedImageData::getFormat() const
{
return format;
}
@@ -96,58 +96,5 @@ void CompressedImageData::checkMipmapLevelExists(int miplevel) const
throw love::Exception("Mipmap level %d does not exist", miplevel + 1);
}
bool CompressedImageData::getConstant(const char *in, CompressedImageData::Format &out)
{
return formats.find(in, out);
}
bool CompressedImageData::getConstant(CompressedImageData::Format in, const char *&out)
{
return formats.find(in, out);
}
StringMap<CompressedImageData::Format, CompressedImageData::FORMAT_MAX_ENUM>::Entry CompressedImageData::formatEntries[] =
{
{"unknown", FORMAT_UNKNOWN},
{"DXT1", FORMAT_DXT1},
{"DXT3", FORMAT_DXT3},
{"DXT5", FORMAT_DXT5},
{"BC4", FORMAT_BC4},
{"BC4s", FORMAT_BC4s},
{"BC5", FORMAT_BC5},
{"BC5s", FORMAT_BC5s},
{"BC6h", FORMAT_BC6H},
{"BC6hs", FORMAT_BC6Hs},
{"BC7", FORMAT_BC7},
{"PVR1rgb2", FORMAT_PVR1_RGB2},
{"PVR1rgb4", FORMAT_PVR1_RGB4},
{"PVR1rgba2", FORMAT_PVR1_RGBA2},
{"PVR1rgba4", FORMAT_PVR1_RGBA4},
{"ETC1", FORMAT_ETC1},
{"ETC2rgb", FORMAT_ETC2_RGB},
{"ETC2rgba", FORMAT_ETC2_RGBA},
{"ETC2rgba1", FORMAT_ETC2_RGBA1},
{"EACr", FORMAT_EAC_R},
{"EACrs", FORMAT_EAC_Rs},
{"EACrg", FORMAT_EAC_RG},
{"EACrgs", FORMAT_EAC_RGs},
{"ASTC4x4", FORMAT_ASTC_4x4},
{"ASTC5x4", FORMAT_ASTC_5x4},
{"ASTC5x5", FORMAT_ASTC_5x5},
{"ASTC6x5", FORMAT_ASTC_6x5},
{"ASTC6x6", FORMAT_ASTC_6x6},
{"ASTC8x5", FORMAT_ASTC_8x5},
{"ASTC8x6", FORMAT_ASTC_8x6},
{"ASTC8x8", FORMAT_ASTC_8x8},
{"ASTC10x5", FORMAT_ASTC_10x5},
{"ASTC10x6", FORMAT_ASTC_10x6},
{"ASTC10x8", FORMAT_ASTC_10x8},
{"ASTC10x10", FORMAT_ASTC_10x10},
{"ASTC12x10", FORMAT_ASTC_12x10},
{"ASTC12x12", FORMAT_ASTC_12x12},
};
StringMap<CompressedImageData::Format, CompressedImageData::FORMAT_MAX_ENUM> CompressedImageData::formats(CompressedImageData::formatEntries, sizeof(CompressedImageData::formatEntries));
} // image
} // love