Add saving functions to Cine::Palette (Now one can output the palette in other formats too).

svn-id: r39336
This commit is contained in:
Kari Salminen 2009-03-11 20:44:16 +00:00
parent 9e54b1c963
commit 4cbd3678f8
2 changed files with 39 additions and 4 deletions

View File

@ -29,6 +29,9 @@
namespace Cine {
static const Graphics::PixelFormat kLowPalFormat = {2, 5, 5, 5, 8, 8, 4, 0, 0};
static const Graphics::PixelFormat kHighPalFormat = {3, 0, 0, 0, 8, 0, 8, 16, 0};
Common::Array<PalEntry> palArray;
static byte paletteBuffer1[16];
static byte paletteBuffer2[16];
@ -196,13 +199,11 @@ void Palette::saturatedAddColor(byte index, signed r, signed g, signed b) {
}
Palette &Palette::loadCineLowPal(const byte *colors, const uint numColors) {
static const Graphics::PixelFormat format = {2, 5, 5, 5, 8, 8, 4, 0, 0};
return load(colors, format, numColors);
return load(colors, kLowPalFormat, numColors);
}
Palette &Palette::loadCineHighPal(const byte *colors, const uint numColors) {
static const Graphics::PixelFormat format = {3, 0, 0, 0, 8, 0, 8, 16, 0};
return load(colors, format, numColors);
return load(colors, kHighPalFormat, numColors);
}
Palette &Palette::load(const byte *colors, const Graphics::PixelFormat format, const uint numColors) {
@ -232,4 +233,33 @@ Palette &Palette::load(const byte *colors, const Graphics::PixelFormat format, c
return *this;
}
byte *Palette::save(byte *colors, const uint numBytes, const Graphics::PixelFormat format) const
{
assert(numBytes <= format.bytesPerPixel * colorCount()); // Make sure there's enough output space
// Clear the part of the output palette we're going to be writing to with all black
memset(colors, 0, format.bytesPerPixel * colorCount());
// Save the palette to the output in the specified format
for (uint i = 0; i < colorCount(); i++) {
// _rMax, _gMax, _bMax are also used as masks here
colors[i * format.bytesPerPixel + (format.rShift / 8)] |= ((_colors[i].r & _rMax) << (format.rShift % 8));
colors[i * format.bytesPerPixel + (format.gShift / 8)] |= ((_colors[i].g & _gMax) << (format.gShift % 8));
colors[i * format.bytesPerPixel + (format.bShift / 8)] |= ((_colors[i].b & _bMax) << (format.bShift % 8));
}
// Return the pointer to the output palette
return colors;
}
byte *Palette::saveCineLowPal(byte *colors, const uint numBytes) const
{
return save(colors, numBytes, kLowPalFormat);
}
byte *Palette::saveCineHighPal(byte *colors, const uint numBytes) const
{
return save(colors, numBytes, kHighPalFormat);
}
} // End of namespace Cine

View File

@ -60,6 +60,11 @@ public:
Palette &loadCineLowPal(const byte *colors, const uint numColors = 16);
Palette &loadCineHighPal(const byte *colors, const uint numColors = 256);
Palette &load(const byte *colors, const Graphics::PixelFormat format, const uint numColors);
byte *saveCineLowPal(byte *colors, const uint numBytes) const;
byte *saveCineHighPal(byte *colors, const uint numBytes) const;
byte *save(byte *colors, const uint numBytes, const Graphics::PixelFormat format) const;
Palette &rotateRight(byte firstIndex, byte lastIndex);
Palette &saturatedAddColor(byte firstIndex, byte lastIndex, signed r, signed g, signed b);
uint colorCount() const;