amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from G-e-n-e-v-e-n-s-i-S/combine-blend-alpha

Browse Source 
make combine_blend function blend alpha channels as well
This commit is contained in:
GenevensiS
2024-09-17 10:09:22 +02:00
committed by GitHub
parent 7826a553d7 c956901a37
commit 4605372a6a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gfx/combine_image.cpp
+8 -2
View File
@@ -295,11 +295,17 @@ COMBINE_FUN(COMBINE_SMALLER_THAN_250, a < 250 ? b : a)
/// The results are stored in the image A. /// The results are stored in the image A.
template <ImageCombine combine> template <ImageCombine combine>
void combine_image_do(Image& a, Image b) { void combine_image_do(Image& a, Image b) {
UInt size = a.GetWidth() * a.GetHeight() * 3; UInt size = a.GetWidth() * a.GetHeight();
Byte *dataA = a.GetData(), *dataB = b.GetData(); Byte *dataA = a.GetData(), *dataB = b.GetData();
// for each pixel: apply function // for each pixel: apply function
for (UInt i = 0 ; i < size ; ++i) { for (UInt i = 0 ; i < (size * 3); ++i) {
dataA[i] = Combine<combine>::f(dataA[i], dataB[i]); dataA[i] = Combine<combine>::f(dataA[i], dataB[i]);
}
if (a.HasAlpha() && b.HasAlpha()) {
Byte* alphaA = a.GetAlpha(), * alphaB = b.GetAlpha();
for (UInt i = 0; i < size; ++i) {
alphaA[i] = Combine<combine>::f(alphaA[i], alphaB[i]);
}
} }
} }