libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Oops this reverts my last commit. :/

Browse Source 
svn-id: r22742
This commit is contained in:
Johannes Schickel 2006-05-29 14:30:21 +00:00
parent c37d69df56
commit 2dd94dd247
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/ThemeNew.cpp
View File

@ -1618,31 +1618,29 @@ inline OverlayColor getColorAlphaImpl(OverlayColor col1, OverlayColor col2, int
}
// broken implementation!
/*template<class T>
template<class T>
inline OverlayColor getColorAlphaImp2(OverlayColor col1, OverlayColor col2, int alpha) {
OverlayColor output = 0;
output |= ((alpha * ((~col1 & T::kRedMask) - (col2 & T::kRedMask)) >> 8) + (col2 & T::kRedMask)) & T::kRedMask;
output |= ((alpha * ((~col1 & T::kGreenMask) - (col2 & T::kGreenMask)) >> 8) + (col2 & T::kGreenMask)) & T::kGreenMask;
output |= ((alpha * ((~col1 & T::kBlueMask) - (col2 & T::kBlueMask)) >> 8) + (col2 & T::kBlueMask)) & T::kBlueMask;
return output;
}*/
}
OverlayColor getColorAlpha(OverlayColor col1, OverlayColor col2, int alpha) {
// disbale alpha >= 0 check for now, since we are using calcDimColor in drawSurfaceMasked for negative
// alpha values at the moment until getColorAlphaImp2 is fixed
//if (alpha >= 0) {
if (alpha >= 0) {
if (gBitFormat == 565) {
return getColorAlphaImpl<ColorMasks<565> >(col1, col2, alpha);
} else {
return getColorAlphaImpl<ColorMasks<555> >(col1, col2, alpha);
}
/*} else {
} else {
if (gBitFormat == 565) {
return getColorAlphaImp2<ColorMasks<565> >(col1, col2, -alpha - 256);
} else {
return getColorAlphaImp2<ColorMasks<555> >(col1, col2, -alpha - 256);
}
}*/
}
}
template<class T>