empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert to premultiplied alpha

Browse source
This commit is contained in:
mkwong98 2019-08-30 13:51:21 +08:00
parent 373c489b01
commit 8b42a55b19
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Core/HdNesPack.cpp
View file

@ -21,11 +21,10 @@ HdNesPack::~HdNesPack()
void HdNesPack::BlendColors(uint8_t output[4], uint8_t input[4])
{
uint8_t alpha = input[3] + 1;
uint8_t invertedAlpha = 256 - input[3];
output[0] = (uint8_t)((alpha * input[0] + invertedAlpha * output[0]) >> 8);
output[1] = (uint8_t)((alpha * input[1] + invertedAlpha * output[1]) >> 8);
output[2] = (uint8_t)((alpha * input[2] + invertedAlpha * output[2]) >> 8);
output[0] = (uint8_t)((input[0] + invertedAlpha * output[0]) >> 8);
output[1] = (uint8_t)((input[1] + invertedAlpha * output[1]) >> 8);
output[2] = (uint8_t)((input[2] + invertedAlpha * output[2]) >> 8);
output[3] = 0xFF;
}

22
Core/HdPackLoader.cpp
View file

@ -212,7 +212,17 @@ bool HdPackLoader::ProcessImgTag(string src)
if(PNGHelper::ReadPNG(fileData, pixelData, bitmapInfo.Width, bitmapInfo.Height)) {
bitmapInfo.PixelData.resize(pixelData.size() / 4);
memcpy(bitmapInfo.PixelData.data(), pixelData.data(), bitmapInfo.PixelData.size() * sizeof(bitmapInfo.PixelData[0]));
//premultiply alpha
for (int i = 0; i < bitmapInfo.PixelData.size(); ++i) {
if (bitmapInfo.PixelData[i] < 0xFF000000) {
uint8_t output[4] = (uint8_t*)&(bitmapInfo.PixelData[i]);
uint8_t alpha = output[3] + 1;
output[0] = (uint8_t)((alpha * output[0]) >> 8);
output[1] = (uint8_t)((alpha * output[1]) >> 8);
output[2] = (uint8_t)((alpha * output[2]) >> 8);
}
}
_hdNesBitmaps.push_back(bitmapInfo);
return true;
} else {
@ -541,6 +551,16 @@ void HdPackLoader::ProcessBackgroundTag(vector<string> &tokens, vector<HdPackCon
bgFileData = _data->BackgroundFileData.back().get();
bgFileData->PixelData.resize(pixelData.size() / 4);
memcpy(bgFileData->PixelData.data(), pixelData.data(), bgFileData->PixelData.size() * sizeof(bgFileData->PixelData[0]));
//premultiply alpha
for (int i = 0; i < bgFileData->PixelData.size(); ++i) {
if (bgFileData->PixelData[i] < 0xFF000000) {
uint8_t output[4] = (uint8_t*)&(bgFileData->PixelData[i]);
uint8_t alpha = output[3] + 1;
output[0] = (uint8_t)((alpha * output[0]) >> 8);
output[1] = (uint8_t)((alpha * output[1]) >> 8);
output[2] = (uint8_t)((alpha * output[2]) >> 8);
}
}
bgFileData->Width = width;
bgFileData->Height = height;
bgFileData->PngName = tokens[0];