fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-11-22 15:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CHG] The GRRLIB_GetColor function was deleted, the RGBA macro should be used instead

Browse source
This commit is contained in:
Crayon2000 2009-11-25 23:25:26 +00:00
parent f314c0521f
commit 44b84e6152
3 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GRRLIB/GRRLIB/GRRLIB_bmfx.c
View file

@ -105,7 +105,7 @@ void GRRLIB_BMFX_Sepia (const GRRLIB_texImg *texsrc, GRRLIB_texImg *texdest) {
sb = R(color)*0.272 + G(color)*0.534 + B(color)*0.131; sb = R(color)*0.272 + G(color)*0.534 + B(color)*0.131;
if (sr>255) sr=255; if (sg>255) sg=255; if (sb>255) sb=255; if (sr>255) sr=255; if (sg>255) sg=255; if (sb>255) sb=255;
GRRLIB_SetPixelTotexImg(x, y, texdest, GRRLIB_SetPixelTotexImg(x, y, texdest,
GRRLIB_GetColor(sr,sg,sb,A(color))); RGBA(sr,sg,sb,A(color)));
} }
} }
GRRLIB_SetHandle(texdest, 0, 0); GRRLIB_SetHandle(texdest, 0, 0);

2
GRRLIB/GRRLIB/grrlib/GRRLIB__inline.h
View file

@ -99,8 +99,6 @@ INLINE u32 GRRLIB_GetPixelFromtexImg (const int x, const int y,
INLINE void GRRLIB_SetPixelTotexImg (const int x, const int y, INLINE void GRRLIB_SetPixelTotexImg (const int x, const int y,
GRRLIB_texImg *tex, const u32 color) ; GRRLIB_texImg *tex, const u32 color) ;
INLINE u32 GRRLIB_GetColor (const u8 r, const u8 g, const u8 b, const u8 a) ;
INLINE void GRRLIB_GetPixelFromFB (int x, int y, INLINE void GRRLIB_GetPixelFromFB (int x, int y,
u8 *R1, u8 *G1, u8 *B1, u8 *R1, u8 *G1, u8 *B1,
u8 *R2, u8 *G2, u8 *B2) ; u8 *R2, u8 *G2, u8 *B2) ;

13
GRRLIB/GRRLIB/grrlib/GRRLIB_pixel.h
View file

@ -65,19 +65,6 @@ void GRRLIB_SetPixelTotexImg (const int x, const int y,
*((u16*)(bp+offs+32)) = (u16) (color >>8); *((u16*)(bp+offs+32)) = (u16) (color >>8);
} }
/**
* Converts RGBA values to u32 color.
* @param r Amount of red (0 - 255).
* @param g Amount of green (0 - 255).
* @param b Amount of blue (0 - 255).
* @param a Amount of alpha (0 - 255).
* @return Returns the color in u32 format.
*/
INLINE
u32 GRRLIB_GetColor (const u8 r, const u8 g, const u8 b, const u8 a) {
return (r << 24) | (g << 16) | (b << 8) | a;
}
/** /**
* Reads a pixel directly from the FrontBuffer. * Reads a pixel directly from the FrontBuffer.
* Since the FB is stored in YCbCr, * Since the FB is stored in YCbCr,