zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Added colormap checking to some blending drawers that were missing it.

This commit is contained in:
Rachael Alexanderson 2016-12-19 04:01:25 -05:00
parent c7d4d7cd1d
commit 2d0960044c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/r_drawt_pal.cpp
View File

@ -582,7 +582,7 @@ namespace swrenderer
const PalEntry *palette = GPalette.BaseColors; const PalEntry *palette = GPalette.BaseColors;
do { do {
int fg = *source; int fg = colormap[*source];
int bg = *dest; int bg = *dest;
int r = MIN((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 63); int r = MIN((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 63);
int g = MIN((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 63); int g = MIN((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 63);
@ -614,7 +614,7 @@ namespace swrenderer
do { do {
for (int ks = 0; ks < 4; ks++) for (int ks = 0; ks < 4; ks++)
{ {
int fg = source[ks]; int fg = colormap[source[ks]];
int bg = dest[ks]; int bg = dest[ks];
int r = MIN((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 63); int r = MIN((palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 63);
int g = MIN((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 63); int g = MIN((palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 63);
@ -648,7 +648,7 @@ namespace swrenderer
const PalEntry *palette = GPalette.BaseColors; const PalEntry *palette = GPalette.BaseColors;
do { do {
int fg = *source; int fg = colormap[*source];
int bg = *dest; int bg = *dest;
int r = MAX((palette[fg].r * _srcalpha - palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha - palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha - palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha - palette[bg].g * _destalpha)>>18, 0);
@ -682,7 +682,7 @@ namespace swrenderer
do { do {
for (int ks = 0; ks < 4; ks++) for (int ks = 0; ks < 4; ks++)
{ {
int fg = source[ks]; int fg = colormap[source[ks]];
int bg = dest[ks]; int bg = dest[ks];
int r = MAX((palette[fg].r * _srcalpha - palette[bg].r * _destalpha)>>18, 0); int r = MAX((palette[fg].r * _srcalpha - palette[bg].r * _destalpha)>>18, 0);
int g = MAX((palette[fg].g * _srcalpha - palette[bg].g * _destalpha)>>18, 0); int g = MAX((palette[fg].g * _srcalpha - palette[bg].g * _destalpha)>>18, 0);
@ -716,7 +716,7 @@ namespace swrenderer
const PalEntry *palette = GPalette.BaseColors; const PalEntry *palette = GPalette.BaseColors;
do { do {
int fg = *source; int fg = colormap[*source];
int bg = *dest; int bg = *dest;
int r = MAX((-palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((-palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((-palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((-palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);
@ -750,7 +750,7 @@ namespace swrenderer
do { do {
for (int ks = 0; ks < 4; ks++) for (int ks = 0; ks < 4; ks++)
{ {
int fg = source[ks]; int fg = colormap[source[ks]];
int bg = dest[ks]; int bg = dest[ks];
int r = MAX((-palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0); int r = MAX((-palette[fg].r * _srcalpha + palette[bg].r * _destalpha)>>18, 0);
int g = MAX((-palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0); int g = MAX((-palette[fg].g * _srcalpha + palette[bg].g * _destalpha)>>18, 0);