[Scummvm-cvs-logs] SF.net SVN: scummvm:[34912] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Nov 6 16:02:50 CET 2008
Revision: 34912
http://scummvm.svn.sourceforge.net/scummvm/?rev=34912&view=rev
Author: fingolfin
Date: 2008-11-06 15:02:50 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Got rid of OSystem::colorToRGB and RGBToColor; added implementations for OSystem::getOverlayFormat to several ports (pending testing by the porters)
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h
scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h
scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp
scummvm/trunk/backends/platform/dc/dc.h
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
scummvm/trunk/backends/platform/gp2x/gp2x-common.h
scummvm/trunk/backends/platform/gp2x/graphics.cpp
scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
scummvm/trunk/backends/platform/iphone/osys_iphone.h
scummvm/trunk/backends/platform/null/null.cpp
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/ps2/systemps2.h
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/wii/osystem.h
scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/common/system.cpp
scummvm/trunk/common/system.h
scummvm/trunk/engines/sword1/animation.cpp
scummvm/trunk/engines/sword2/animation.cpp
scummvm/trunk/graphics/mpeg_player.cpp
scummvm/trunk/graphics/thumbnail.cpp
scummvm/trunk/gui/ThemeEngine.cpp
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -152,7 +152,7 @@
void OSystem_PalmBase::clearScreen() {
WinSetDrawWindow(WinGetDisplayWindow());
- WinSetBackColor(RGBToColor(0,0,0));
+ WinSetBackColor(Graphics::RGBToColor<ColorMasks<565> >(0,0,0));
WinEraseWindow();
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -230,8 +230,7 @@
void setPalette(const byte *colors, uint start, uint num);
void grabPalette(byte *colors, uint start, uint num);
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b) = 0;
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) = 0;
+ virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); }
bool pollEvent(Common::Event &event);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_os5.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -181,8 +181,6 @@
virtual void clearOverlay();
virtual void grabOverlay(OverlayColor *buf, int pitch);
virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
void setWindowCaption(const char *caption);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_zodiac.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -71,8 +71,6 @@
void clearOverlay();
void grabOverlay(OverlayColor *buf, int pitch);
void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
- OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
};
#endif
Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_gfx.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -77,8 +77,8 @@
__68K(PINSetInputTriggerState(pinInputTriggerDisabled));
}
- gVars->indicator.on = RGBToColor(0,255,0);
- gVars->indicator.off = RGBToColor(0,0,0);
+ gVars->indicator.on = Graphics::RGBToColor<ColorMasks<565> >(0,255,0);
+ gVars->indicator.off = Graphics::RGBToColor<ColorMasks<565> >(0,0,0);
_overlayH = alloc_screen(_screenWidth, _screenHeight);
_overlayP = (OverlayColor *)(BmpGetBits(WinGetBitmap(_overlayH)));
Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_overlay.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -74,13 +74,3 @@
buf += pitch;
} while (--h);
}
-
-OverlayColor OSystem_PalmOS5::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return gfxMakeDisplayRGB(r, g, b);
-}
-
-void OSystem_PalmOS5::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- r = ((color >> 8) & 0xF8);
- g = ((color >> 3) & 0xFC);
- b = ((color << 3) & 0xF8);
-}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/zodiac_gfx.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -71,8 +71,8 @@
SysSetOrientationTriggerState(sysOrientationTriggerDisabled);
PINSetInputTriggerState(pinInputTriggerDisabled);
- gVars->indicator.on = RGBToColor(0,255,0);
- gVars->indicator.off = RGBToColor(0,0,0);
+ gVars->indicator.on = Graphics::RGBToColor<ColorMasks<565> >(0,255,0);
+ gVars->indicator.off = Graphics::RGBToColor<ColorMasks<565> >(0,0,0);
_screenH = WinGetDisplayWindow();
_screenP = (byte *)BmpGetBits(WinGetBitmap(_screenH));
Modified: scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/PalmOS/Src/zodiac_overlay.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -65,13 +65,3 @@
};
e = TwGfxDrawBitmap(_overlayP, &pos, &bmp);
}
-
-OverlayColor OSystem_PalmZodiac::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return TwGfxMakeDisplayRGB(r, g, b);
-}
-
-void OSystem_PalmZodiac::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- r = ((color >> 8) & 0xF8);
- g = ((color >> 3) & 0xFC);
- b = ((color << 3) & 0xF8);
-}
Modified: scummvm/trunk/backends/platform/dc/dc.h
===================================================================
--- scummvm/trunk/backends/platform/dc/dc.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/dc/dc.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -155,12 +155,7 @@
void clearOverlay();
void grabOverlay(int16 *buf, int pitch);
void copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h);
- OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b) { return (0xf000|((r&0xf0)<<4)|(g&0xf0)|(b>>4); }
- void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- r = ((color>>4)&0xf0)|((color>>8)&0x0f);
- g = (color&0xf0)|((color>>4)&0x0f);
- b = ((color<<4)&0xf0)|(color&0x0f);
- }
+ virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<4444>(); }
// Mutex handling
MutexRef createMutex();
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -113,9 +113,7 @@
virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
virtual int16 getOverlayHeight();
virtual int16 getOverlayWidth();
-
- inline virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- inline virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
+ virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<1555>(); }
virtual bool showMouse(bool visible);
@@ -190,19 +188,4 @@
{0, 0, 0},
};
-OverlayColor OSystem_DS::RGBToColor(uint8 r, uint8 g, uint8 b)
-{
- return 0x8000 | (r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10);
- //consolePrintf("rgbtocol\n");
- //return 0;
-}
-
-void OSystem_DS::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b)
-{
- r = (color & 0x001F) << 3;
- g = ((color & 0x03E0) >> 5) << 3;
- b = ((color & 0x7C00) >> 10) << 3;
- //consolePrintf("coltorgb\n");
-}
-
#endif
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -163,11 +163,6 @@
int16 getOverlayHeight() { return _overlayHeight; }
int16 getOverlayWidth() { return _overlayWidth; }
- // Methods that convert RGB to/from colors suitable for the overlay.
- OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
-
-
const GraphicsMode *getSupportedGraphicsModes() const;
int getDefaultGraphicsMode() const;
bool setGraphicsMode(int mode);
Modified: scummvm/trunk/backends/platform/gp2x/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/graphics.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/gp2x/graphics.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -1160,15 +1160,7 @@
SDL_UnlockSurface(_overlayscreen);
}
-OverlayColor OSystem_GP2X::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return SDL_MapRGB(_overlayscreen->format, r, g, b);
-}
-void OSystem_GP2X::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- SDL_GetRGB(color, _overlayscreen->format, &r, &g, &b);
-}
-
-
#pragma mark -
#pragma mark --- Mouse ---
#pragma mark -
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -180,7 +180,7 @@
const byte *b = colors;
for (uint i = start; i < start + num; ++i) {
- _palette[i] = RGBToColor(b[0], b[1], b[2]);
+ _palette[i] = Graphics::RGBToColor<ColorMasks<565> >(b[0], b[1], b[2]);
b += 4;
}
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -143,6 +143,7 @@
virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
virtual int16 getOverlayHeight();
virtual int16 getOverlayWidth();
+ virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); }
virtual bool showMouse(bool visible);
Modified: scummvm/trunk/backends/platform/null/null.cpp
===================================================================
--- scummvm/trunk/backends/platform/null/null.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/null/null.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -91,10 +91,8 @@
virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
virtual int16 getOverlayHeight();
virtual int16 getOverlayWidth();
+ virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); }
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
-
virtual bool showMouse(bool visible);
virtual void warpMouse(int x, int y);
@@ -257,13 +255,7 @@
return getWidth();
}
-OverlayColor OSystem_NULL::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return 0;
-}
-void OSystem_NULL::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
-}
-
bool OSystem_NULL::showMouse(bool visible) {
return true;
}
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -641,16 +641,6 @@
return res;
}
-OverlayColor OSystem_PS2::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return (r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10);
-}
-
-void OSystem_PS2::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- r = (color & 0x1F) << 3;
- g = ((color >> 5) & 0x1F) << 3;
- b = ((color >> 10) & 0x1F) << 3;
-}
-
int16 OSystem_PS2::getHeight(void) {
return _screen->getHeight();
}
Modified: scummvm/trunk/backends/platform/ps2/systemps2.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/ps2/systemps2.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -110,10 +110,8 @@
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
+ virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<555>(); }
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
-
virtual Common::SaveFileManager *getSavefileManager();
virtual FilesystemFactory *getFilesystemFactory();
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -353,17 +353,7 @@
return _overlayHeight;
}
-OverlayColor OSystem_PSP::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return (((r >> 3) & 0x1F) | (((g >> 3) & 0x1F) << 5) | (((b >> 3) & 0x1F) << 10 ) ) | 0x8000;
-}
-void OSystem_PSP::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- r = ((color & 0x1F) << 3);
- g = (((color >> 5) & 0x1F) << 3);
- b = (((color >> 10) & 0x1F) << 3);
-}
-
-
void OSystem_PSP::grabPalette(byte *colors, uint start, uint num) {
uint i;
uint16 color;
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -107,8 +107,6 @@
virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
virtual int16 getOverlayHeight();
virtual int16 getOverlayWidth();
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
virtual void grabPalette(byte *colors, uint start, uint num);
virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<1555>(); }
Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -1239,15 +1239,7 @@
SDL_UnlockSurface(_overlayscreen);
}
-OverlayColor OSystem_SDL::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return SDL_MapRGB(_overlayscreen->format, r, g, b);
-}
-void OSystem_SDL::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- SDL_GetRGB(color, _overlayscreen->format, &r, &g, &b);
-}
-
-
#pragma mark -
#pragma mark --- Mouse ---
#pragma mark -
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -182,11 +182,6 @@
virtual int16 getOverlayHeight() { return _overlayHeight; }
virtual int16 getOverlayWidth() { return _overlayWidth; }
- // Methods that convert RGB to/from colors suitable for the overlay.
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
-
-
virtual const GraphicsMode *getSupportedGraphicsModes() const;
virtual int getDefaultGraphicsMode() const;
virtual bool setGraphicsMode(int mode);
Modified: scummvm/trunk/backends/platform/wii/osystem.h
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/wii/osystem.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -136,10 +136,8 @@
int x, int y, int w, int h);
virtual int16 getOverlayWidth();
virtual int16 getOverlayHeight();
+ virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); }
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
-
virtual bool showMouse(bool visible);
virtual void warpMouse(int x, int y);
Modified: scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -197,7 +197,7 @@
void OSystem_Wii::setPalette(const byte *colors, uint start, uint num) {
const byte *p = colors;
for (uint i = 0; i < num; ++i) {
- _palette[start + i] = RGBToColor(p[0], p[1], p[2]);
+ _palette[start + i] = Graphics::RGBToColor<ColorMasks<565> >(p[0], p[1], p[2]);
p += 4;
}
}
@@ -206,7 +206,7 @@
byte *p = colors;
u8 r, g, b;
for (uint i = 0; i < num; ++i) {
- colorToRGB(_palette[start + i], r, g, b);
+ Graphics::colorToRGB<ColorMasks<565> >(_palette[start + i], r, g, b);
p[0] = r;
p[1] = g;
p[2] = b;
@@ -218,7 +218,7 @@
void OSystem_Wii::setCursorPalette(const byte *colors, uint start, uint num) {
const byte *p = colors;
for (uint i = 0; i < num; ++i) {
- _cursorPalette[start + i] = RGBToColor(p[0], p[1], p[2]);
+ _cursorPalette[start + i] = Graphics::RGBToColor<ColorMasks<565> >(p[0], p[1], p[2]);
p += 4;
}
@@ -443,17 +443,6 @@
return _overlayHeight;
}
-OverlayColor OSystem_Wii::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return (((r >> 3) & 0x1f) << 11) | (((g >> 2) & 0x3f) << 5 ) |
- ((b >> 3) & 0x1f);
-}
-
-void OSystem_Wii::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- r = ((color >> 11) & 0x1f) << 3;
- g = ((color >> 5) & 0x3f) << 2;
- b = (color & 0x1f) << 3;
-}
-
bool OSystem_Wii::showMouse(bool visible) {
bool last = _mouseVisible;
_mouseVisible = visible;
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -1973,7 +1973,7 @@
*bak++ = *(uint16 *)dst;
color = *src++;
if (color != 0xFF) // 0xFF = transparent, don't draw
- *(uint16 *)dst = RGBToColor(_currentPalette[color].r, _currentPalette[color].g, _currentPalette[color].b);
+ *(uint16 *)dst = SDL_MapRGB(_overlayscreen->format, _currentPalette[color].r, _currentPalette[color].g, _currentPalette[color].b);
dst += 2;
width--;
}
Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/common/system.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -61,14 +61,6 @@
return false;
}
-OverlayColor OSystem::RGBToColor(uint8 r, uint8 g, uint8 b) {
- return Graphics::RGBToColor<Graphics::ColorMasks<565> >(r, g, b);
-}
-
-void OSystem::colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b) {
- Graphics::colorToRGB<Graphics::ColorMasks<565> >(color, r, g, b);
-}
-
void OSystem::displayMessageOnOSD(const char *msg) {
// Display the message for 1.5 seconds
GUI::TimedMessageDialog dialog(msg, 1500);
Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/common/system.h 2008-11-06 15:02:50 UTC (rev 34912)
@@ -617,24 +617,6 @@
*/
virtual int16 getOverlayWidth() { return getWidth(); }
- /**
- * Convert the given RGB triplet into an OverlayColor. A OverlayColor can
- * be 8bit, 16bit or 32bit, depending on the target system. The default
- * implementation generates a 16 bit color value, in the 565 format
- * (that is, 5 bits red, 6 bits green, 5 bits blue).
- * @see colorToRGB
- */
- virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
-
- /**
- * Convert the given OverlayColor into a RGB triplet. An OverlayColor can
- * be 8bit, 16bit or 32bit, depending on the target system. The default
- * implementation takes a 16 bit color value and assumes it to be in 565 format
- * (that is, 5 bits red, 6 bits green, 5 bits blue).
- * @see RGBToColor
- */
- virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
-
//@}
Modified: scummvm/trunk/engines/sword1/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword1/animation.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/engines/sword1/animation.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -555,9 +555,10 @@
_logoOvls[fcnt][cnt] = _logoOvls[fcnt - 1][cnt];
}
uint8 *pal = ovlFile.fetchFile(12);
- _introPal = (OverlayColor*)malloc(256 * sizeof(OverlayColor));
+ _introPal = (OverlayColor *)malloc(256 * sizeof(OverlayColor));
+ Graphics::PixelFormat format = _system->getOverlayFormat();
for (uint16 cnt = 0; cnt < 256; cnt++)
- _introPal[cnt] = _system->RGBToColor(pal[cnt * 3 + 0], pal[cnt * 3 + 1], pal[cnt * 3 + 2]);
+ _introPal[cnt] = Graphics::RGBToColor(pal[cnt * 3 + 0], pal[cnt * 3 + 1], pal[cnt * 3 + 2], format);
}
return true;
Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/engines/sword2/animation.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -654,8 +654,9 @@
OverlayColor *dst = _overlay + textY * moviePitch + textX;
- OverlayColor pen = _sys->RGBToColor(255, 255, 255);
- OverlayColor border = _sys->RGBToColor(0, 0, 0);
+ Graphics::PixelFormat format = _sys->getOverlayFormat();
+ OverlayColor pen = Graphics::RGBToColor(255, 255, 255, format);
+ OverlayColor border = Graphics::RGBToColor(0, 0, 0, format);
// TODO: Use the AdvMame scalers for the text? Pre-scale it?
@@ -702,7 +703,8 @@
#ifdef BACKEND_8BIT
memset(_vm->_screen->getScreen(), 0, _movieWidth * _movieHeight);
#else
- OverlayColor black = _sys->RGBToColor(0, 0, 0);
+ Graphics::PixelFormat format = _sys->getOverlayFormat();
+ OverlayColor black = Graphics::RGBToColor(0, 0, 0, format);
for (int i = 0; i < _movieScale * _movieWidth * _movieScale * _movieHeight; i++)
_overlay[i] = black;
Modified: scummvm/trunk/graphics/mpeg_player.cpp
===================================================================
--- scummvm/trunk/graphics/mpeg_player.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/graphics/mpeg_player.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -389,10 +389,11 @@
}
// Set up entries 0-255 in rgb-to-pixel value tables.
+ Graphics::PixelFormat format = _sys->getOverlayFormat();
for (i = 0; i < 256; i++) {
- r_2_pix_alloc[i + 256] = _sys->RGBToColor(i, 0, 0);
- g_2_pix_alloc[i + 256] = _sys->RGBToColor(0, i, 0);
- b_2_pix_alloc[i + 256] = _sys->RGBToColor(0, 0, i);
+ r_2_pix_alloc[i + 256] = Graphics::RGBToColor(i, 0, 0, format);
+ g_2_pix_alloc[i + 256] = Graphics::RGBToColor(0, i, 0, format);
+ b_2_pix_alloc[i + 256] = Graphics::RGBToColor(0, 0, i, format);
}
// Spread out the values we have to the rest of the array so that we do
Modified: scummvm/trunk/graphics/thumbnail.cpp
===================================================================
--- scummvm/trunk/graphics/thumbnail.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/graphics/thumbnail.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -42,12 +42,6 @@
#define ThumbnailHeaderSize (4+4+1+2+2+1)
-inline void colorToRGB(uint16 color, uint8 &r, uint8 &g, uint8 &b) {
- r = (((color >> 11) & 0x1F) << 3);
- g = (((color >> 5) & 0x3F) << 2);
- b = ((color&0x1F) << 3);
-}
-
bool loadHeader(Common::SeekableReadStream &in, ThumbnailHeader &header, bool outputWarnings) {
header.type = in.readUint32BE();
// We also accept the bad 'BMHT' header here, for the sake of compatibility
@@ -114,13 +108,14 @@
to.create(header.width, header.height, sizeof(OverlayColor));
OverlayColor *pixels = (OverlayColor *)to.pixels;
+ Graphics::PixelFormat format = g_system->getOverlayFormat();
for (int y = 0; y < to.h; ++y) {
for (int x = 0; x < to.w; ++x) {
uint8 r, g, b;
- colorToRGB(in.readUint16BE(), r, g, b);
+ colorToRGB<ColorMasks<565> >(in.readUint16BE(), r, g, b);
// converting to current OSystem Color
- *pixels++ = g_system->RGBToColor(r, g, b);
+ *pixels++ = Graphics::RGBToColor(r, g, b, format);
}
}
Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp 2008-11-06 14:27:13 UTC (rev 34911)
+++ scummvm/trunk/gui/ThemeEngine.cpp 2008-11-06 15:02:50 UTC (rev 34912)
@@ -290,7 +290,7 @@
return;
_system->clearOverlay();
- _system->grabOverlay((OverlayColor*)_screen->pixels, _screen->w);
+ _system->grabOverlay((OverlayColor *)_screen->pixels, _screen->w);
}
void ThemeEngine::refresh() {
@@ -941,7 +941,8 @@
Common::Rect charArea = r;
charArea.clip(_screen->w, _screen->h);
- uint32 color = _system->RGBToColor(_texts[kTextDataDefault]->_color.r, _texts[kTextDataDefault]->_color.g, _texts[kTextDataDefault]->_color.b);
+ Graphics::PixelFormat format = _system->getOverlayFormat();
+ uint32 color = Graphics::RGBToColor(_texts[kTextDataDefault]->_color.r, _texts[kTextDataDefault]->_color.g, _texts[kTextDataDefault]->_color.b, format);
restoreBackground(charArea);
font->drawChar(_screen, ch, charArea.left, charArea.top, color);
@@ -1053,10 +1054,11 @@
uint colorsFound = 0;
Common::HashMap<int, int> colorToIndex;
const OverlayColor *src = (const OverlayColor*)cursor->pixels;
+ Graphics::PixelFormat format = _system->getOverlayFormat();
for (uint y = 0; y < _cursorHeight; ++y) {
for (uint x = 0; x < _cursorWidth; ++x) {
byte r, g, b;
- _system->colorToRGB(src[x], r, g, b);
+ Graphics::colorToRGB(src[x], r, g, b, format);
const int col = (r << 16) | (g << 8) | b;
// Skip transparency (the transparent color actually is 0xFF00FF,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list