libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 12:44:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MADS: Refactored VGA_COLOR_REV, which wasn't correct

Browse Source
This commit is contained in:
Paul Gilbert 2014-05-24 13:32:58 -04:00
parent 55e6e2bdb4
commit 1bcd021774
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/mads/palette.cpp
View File

@ -30,7 +30,6 @@
namespace MADS {
#define VGA_COLOR_TRANS(x) ((x) * 255 / 63)
#define VGA_COLOR_REV(x) ((x) * 63 / 255)
void RGB6::load(Common::SeekableReadStream *f) {
r = VGA_COLOR_TRANS(f->readByte());
@ -342,6 +341,19 @@ Fader::Fader(MADSEngine *vm): _vm(vm) {
_colorFlags[3] = false;
_colorValues[0] = _colorValues[1] = 0;
_colorValues[2] = _colorValues[3] = 0;
// TODO: It would be better if the fader routines could be refactored
// to work directly with 8-bit RGB values rather than 6-bit RGB values
Common::fill(&_rgb64Map[0], &_rgb64Map[PALETTE_COUNT], 0);
for (int i = 0; i < 64; ++i)
_rgb64Map[VGA_COLOR_TRANS(i)] = i;
byte v = 0;
for (int i = 0; i < PALETTE_COUNT; ++i) {
if (_rgb64Map[i])
v = _rgb64Map[i];
else
_rgb64Map[i] = v;
}
}
@ -377,7 +389,7 @@ void Fader::fadeToGrey(byte palette[PALETTE_SIZE], byte *paletteMap,
intensity = _colorValues[colorCtr];
}
int diff = intensity - VGA_COLOR_REV(palette[palCtr * 3 + colorCtr]);
int diff = intensity - _rgb64Map[palette[palCtr * 3 + colorCtr]];
palIndex[palCtr][colorCtr] = (byte)ABS(diff);
signs[palCtr][colorCtr] = (diff == 0) ? 0 : (diff < 0 ? -1 : 1);
}
@ -391,7 +403,7 @@ void Fader::fadeToGrey(byte palette[PALETTE_SIZE], byte *paletteMap,
while (map[index]._accum[colorCtr] >= steps) {
map[index]._accum[colorCtr] -= steps;
byte rgb63 = VGA_COLOR_REV(palette[palCtr * 3 + colorCtr]) +
byte rgb63 = _rgb64Map[palette[palCtr * 3 + colorCtr]] +
signs[palCtr][colorCtr];
palette[palCtr * 3 + colorCtr] = VGA_COLOR_TRANS(rgb63);
}
@ -561,7 +573,7 @@ int Fader::rgbMerge(RGB6 &palEntry) {
}
int Fader::rgbMerge(byte r, byte g, byte b) {
return VGA_COLOR_REV(r) * 38 + VGA_COLOR_REV(g) * 76 + VGA_COLOR_REV(b) * 14;
return _rgb64Map[r] * 38 + _rgb64Map[g] * 76 + _rgb64Map[b] * 14;
}
/*------------------------------------------------------------------------*/

5
engines/mads/palette.h
View File

@ -187,6 +187,7 @@ private:
void insertionSort(int size, byte *id, byte *value);
protected:
MADSEngine *_vm;
byte _rgb64Map[PALETTE_COUNT];
public:
bool _colorFlags[4];
int _colorValues[4];
@ -223,12 +224,12 @@ public:
/**
* Calculates a merge/hash for a given palette entry
*/
static int rgbMerge(byte r, byte g, byte b);
int rgbMerge(byte r, byte g, byte b);
/**
* Calculates a merge/hash for a given palette entry
*/
static int rgbMerge(RGB6 &palEntry);
int rgbMerge(RGB6 &palEntry);
/**
* Fades the given palette to greyscale