q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-26 12:15:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unstubbed the Color Portable C functions

Browse Source
This commit is contained in:
ptitSeb 2016-04-06 13:40:02 +02:00
parent 73ea5ca7d4
commit 2406f62c4b
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Sources/Engine/Graphics/Color.cpp
View File

@ -447,8 +447,29 @@ COLOR AddColors( COLOR col1, COLOR col2)
COLOR colRet; COLOR colRet;
#if (defined USE_PORTABLE_C) #if (defined USE_PORTABLE_C)
STUBBED("AddColors"); // !!! FIXME: This...is not fast.
colRet = 0; union
{
COLOR col;
UBYTE bytes[4];
} conv1;
union
{
COLOR col;
UBYTE bytes[4];
} conv2;
#define MIN(a, b) ((a)>(b))?(b):(a)
conv1.col = col1;
conv2.col = col2;
conv1.bytes[0] = (UBYTE) MIN((((WORD) conv1.bytes[0]) + ((WORD) conv2.bytes[0])) , 255);
conv1.bytes[1] = (UBYTE) MIN((((WORD) conv1.bytes[1]) + ((WORD) conv2.bytes[1])) , 255);
conv1.bytes[2] = (UBYTE) MIN((((WORD) conv1.bytes[2]) + ((WORD) conv2.bytes[2])) , 255);
conv1.bytes[3] = (UBYTE) MIN((((WORD) conv1.bytes[3]) + ((WORD) conv2.bytes[3])) , 255);
#undef MIN
colRet = conv1.col;
#elif (defined __MSVC_INLINE__) #elif (defined __MSVC_INLINE__)
__asm { __asm {
@ -605,7 +626,10 @@ extern void abgr2argb( ULONG *pulSrc, ULONG *pulDst, INDEX ct)
{ {
#if (defined USE_PORTABLE_C) #if (defined USE_PORTABLE_C)
//#error write me. //#error write me.
STUBBED("abgr2argb"); for (int i=0; i<ct; i++) {
ULONG tmp = pulSrc[i];
pulDst[i] = (tmp&0xff00ff00) | ((tmp&0x00ff0000)>>16) | ((tmp&0x000000ff)<<16);
}
#elif (defined __MSVC_INLINE__) #elif (defined __MSVC_INLINE__)
__asm { __asm {