color/alpha blending for 8-bit sw 2D image routines, fix to 8-bit sw characters with alpha, removed conchars hack from image loading and made conchars load into cache on init
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2019 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ
parent
3399f05c3b
commit
db0d994a70
2 changed files with 152 additions and 120 deletions
|
|
@ -238,47 +238,10 @@ mpic_t *SWDraw_SafeCachePic (char *extpath)
|
|||
return dat;
|
||||
}
|
||||
|
||||
mpic_t *SWDraw_ConcharsMalloc (void)
|
||||
{
|
||||
// stupid hack for conchars...
|
||||
qpic_t *dat;
|
||||
swcachepic_t *pic;
|
||||
int i, j;
|
||||
|
||||
for (pic=swmenu_cachepics, i=0 ; i<swmenu_numcachepics ; pic++, i++)
|
||||
if (!strcmp ("conchars", pic->name))
|
||||
break;
|
||||
|
||||
if (i == swmenu_numcachepics)
|
||||
{
|
||||
if (swmenu_numcachepics == MAX_CACHED_PICS)
|
||||
{
|
||||
Con_Printf ("menu_numcachepics == MAX_CACHED_PICS\n");
|
||||
return NULL;
|
||||
}
|
||||
swmenu_numcachepics++;
|
||||
pic->cache.fake = true;
|
||||
pic->cache.data = BZ_Malloc(sizeof(qpic_t) + 128*128);
|
||||
dat = pic->cache.data;
|
||||
// change 0 to 255 through conchars
|
||||
for (j = 0; j < 128*128; j++)
|
||||
dat->data[j] = (draw_chars[j] == 255 || !draw_chars[j]) ? draw_chars[j] ^ 255 : draw_chars[j];
|
||||
// memcpy (dat->data, draw_chars, 128*128);
|
||||
((mpic_t*)dat)->width = ((mpic_t*)dat)->height = 128;
|
||||
((mpic_t*)dat)->flags = 1;
|
||||
strcpy (pic->name, "conchars");
|
||||
}
|
||||
|
||||
return pic->cache.data;
|
||||
}
|
||||
|
||||
mpic_t *SWDraw_CachePic (char *path)
|
||||
{
|
||||
mpic_t *pic;
|
||||
|
||||
if (!strcmp(path, "conchars")) // conchars hack
|
||||
return SWDraw_ConcharsMalloc();
|
||||
|
||||
pic = SWDraw_SafeCachePic(path);
|
||||
if (!pic)
|
||||
Sys_Error ("Draw_CachePic: failed to load %s", path);
|
||||
|
|
@ -374,9 +337,6 @@ mpic_t *SWDraw_PicFromWad (char *name)
|
|||
char q2name[MAX_QPATH];
|
||||
qpic_t *qpic;
|
||||
mpic_t *mpic;
|
||||
|
||||
if (!strcmp(name, "conchars")) // conchars hack
|
||||
return SWDraw_ConcharsMalloc();
|
||||
|
||||
sprintf(q2name, "pics/%s.pcx", name);
|
||||
mpic = SWDraw_MallocPic(q2name);
|
||||
|
|
@ -508,6 +468,25 @@ void SWDraw_Init (void)
|
|||
AddOcranaLEDsIndexed (draw_chars, 128, 128);
|
||||
}
|
||||
|
||||
// add conchars into sw menu cache
|
||||
swmenu_numcachepics = 0;
|
||||
|
||||
strcpy(swmenu_cachepics[swmenu_numcachepics].name, "conchars");
|
||||
swmenu_cachepics[swmenu_numcachepics].cache.fake = true;
|
||||
swmenu_cachepics[swmenu_numcachepics].cache.data = BZ_Malloc(sizeof(qpic_t) + 128*128);
|
||||
{
|
||||
qpic_t *dat = (qpic_t *)swmenu_cachepics[swmenu_numcachepics].cache.data;
|
||||
// reformat conchars for use in cache
|
||||
int j;
|
||||
|
||||
for (j = 0; j < 128*128; j++)
|
||||
dat->data[j] = (draw_chars[j] == 255 || !draw_chars[j]) ? draw_chars[j] ^ 255 : draw_chars[j];
|
||||
|
||||
((mpic_t*)dat)->width = ((mpic_t*)dat)->height = 128;
|
||||
((mpic_t*)dat)->flags = 1;
|
||||
}
|
||||
swmenu_numcachepics++;
|
||||
|
||||
draw_disc = W_SafeGetLumpName ("disc");
|
||||
draw_backtile = W_SafeGetLumpName ("backtile");
|
||||
if (!draw_backtile)
|
||||
|
|
@ -1604,6 +1583,42 @@ void SWDraw_CharToConback (int num, qbyte *dest)
|
|||
|
||||
}
|
||||
|
||||
void SWDraw_SubImageBlend32(
|
||||
int scx, int scy, int scwidth, int scheight, //screen
|
||||
int six, int siy, int siwidth, int siheight, //sub image
|
||||
int iwidth, int iheight, qbyte *in, int red, int green, int blue, int alpha)
|
||||
{
|
||||
unsigned char *pal = (unsigned char *)d_8to32table;
|
||||
unsigned char *dest;
|
||||
qbyte *src;
|
||||
int v;
|
||||
int f, fstep;
|
||||
int x, y;
|
||||
int outstride = vid.rowbytes;
|
||||
|
||||
dest = (unsigned char *)vid.buffer + 4*(scx + scy*outstride);
|
||||
|
||||
fstep = (siwidth<<16)/scwidth;
|
||||
|
||||
for (y=0 ; y<scheight ; y++, dest += outstride*4)
|
||||
{
|
||||
v = y*siheight/scheight;
|
||||
src = in + (siy+v)*iwidth + six;
|
||||
{
|
||||
f = 0;
|
||||
for (x=0; x<scwidth<<2; x+=4) //sw 32 bit rendering is bgrx
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[x + 0] = ((255-alpha)*dest[x + 0] + (blue*alpha*pal[(src[f>>16]<<2) + 0])/255)/255;
|
||||
dest[x + 1] = ((255-alpha)*dest[x + 1] + (green*alpha*pal[(src[f>>16]<<2) + 1])/255)/255;
|
||||
dest[x + 2] = ((255-alpha)*dest[x + 2] + (red*alpha*pal[(src[f>>16]<<2) + 2])/255)/255;
|
||||
}
|
||||
f += fstep;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SWDraw_SubImage32(
|
||||
int scx, int scy, int scwidth, int scheight, //screen
|
||||
|
|
@ -1618,6 +1633,13 @@ void SWDraw_SubImage32(
|
|||
int x, y;
|
||||
int outstride = vid.rowbytes;
|
||||
|
||||
if (ib_colorblend || ib_alphablend)
|
||||
{
|
||||
SWDraw_SubImageBlend32(scx, scy, scwidth, scheight,
|
||||
six, siy, siwidth, siheight,
|
||||
iwidth, iheight, in, ib_ri, ib_gi, ib_bi, ib_ai);
|
||||
}
|
||||
|
||||
dest = (unsigned int *)vid.buffer + scx + scy*outstride;
|
||||
|
||||
fstep = (siwidth<<16)/scwidth;
|
||||
|
|
@ -1666,44 +1688,6 @@ void SWDraw_SubImage32(
|
|||
}
|
||||
}
|
||||
|
||||
//blend in colour and alpha (still 8 bit source though)
|
||||
void SWDraw_SubImageBlend32(
|
||||
int scx, int scy, int scwidth, int scheight, //screen
|
||||
int six, int siy, int siwidth, int siheight, //sub image
|
||||
int iwidth, int iheight, qbyte *in, int red, int green, int blue, int alpha)
|
||||
{
|
||||
unsigned char *pal = (unsigned char *)d_8to32table;
|
||||
unsigned char *dest;
|
||||
qbyte *src;
|
||||
int v;
|
||||
int f, fstep;
|
||||
int x, y;
|
||||
int outstride = vid.rowbytes;
|
||||
|
||||
dest = (unsigned char *)vid.buffer + 4*(scx + scy*outstride);
|
||||
|
||||
fstep = (siwidth<<16)/scwidth;
|
||||
|
||||
for (y=0 ; y<scheight ; y++, dest += outstride*4)
|
||||
{
|
||||
v = y*siheight/scheight;
|
||||
src = in + (siy+v)*iwidth + six;
|
||||
{
|
||||
f = 0;
|
||||
for (x=0; x<scwidth<<2; x+=4) //sw 32 bit rendering is bgrx
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[x + 0] = ((255-alpha)*dest[x + 0] + (blue*alpha*pal[(src[f>>16]<<2) + 0])/255)/255;
|
||||
dest[x + 1] = ((255-alpha)*dest[x + 1] + (green*alpha*pal[(src[f>>16]<<2) + 1])/255)/255;
|
||||
dest[x + 2] = ((255-alpha)*dest[x + 2] + (red*alpha*pal[(src[f>>16]<<2) + 2])/255)/255;
|
||||
}
|
||||
f += fstep;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SWDraw_SubImage16(
|
||||
int scx, int scy, int scwidth, int scheight, //screen
|
||||
int six, int siy, int siwidth, int siheight, //sub image
|
||||
|
|
@ -1780,45 +1764,104 @@ void SWDraw_SubImage8(
|
|||
|
||||
fstep = (siwidth<<16)/scwidth;
|
||||
|
||||
for (y=0 ; y<scheight ; y++, dest += outstride)
|
||||
if (ib_colorblend) // use palette remap
|
||||
{
|
||||
v = y*siheight/scheight;
|
||||
src = in + (siy+v)*iwidth + six;
|
||||
qbyte *palremap = ib_remap->pal;
|
||||
|
||||
if (ib_alphablend) // remap with alpha
|
||||
{
|
||||
f = 0;
|
||||
for (x=0; x < (scwidth&~3); x+=4) //cut down on loop stuff
|
||||
for (y=0 ; y<scheight ; y++, dest += outstride)
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
v = y*siheight/scheight;
|
||||
src = in + (siy+v)*iwidth + six;
|
||||
{
|
||||
dest[x] = src[(f>>16)];
|
||||
f = 0;
|
||||
for (x=0; x < scwidth; x++)
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
dest[x] = Trans(dest[x], palremap[src[(f>>16)]]);
|
||||
f += fstep;
|
||||
}
|
||||
}
|
||||
f += fstep;
|
||||
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[1+x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[2+x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[3+x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
}
|
||||
for (; x<scwidth; x+=1) //sw 32 bit rendering is bgrx
|
||||
}
|
||||
else // remap without alpha
|
||||
{
|
||||
for (y=0 ; y<scheight ; y++, dest += outstride)
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
v = y*siheight/scheight;
|
||||
src = in + (siy+v)*iwidth + six;
|
||||
{
|
||||
dest[x] = src[(f>>16)];
|
||||
f = 0;
|
||||
for (x=0; x < scwidth; x++)
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
dest[x] = palremap[src[(f>>16)]];
|
||||
f += fstep;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (ib_alphablend)
|
||||
{
|
||||
for (y=0 ; y<scheight ; y++, dest += outstride)
|
||||
{
|
||||
v = y*siheight/scheight;
|
||||
src = in + (siy+v)*iwidth + six;
|
||||
{
|
||||
f = 0;
|
||||
for (x=0; x < scwidth; x++)
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
dest[x] = Trans(dest[x], src[(f>>16)]);
|
||||
f += fstep;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (y=0 ; y<scheight ; y++, dest += outstride)
|
||||
{
|
||||
v = y*siheight/scheight;
|
||||
src = in + (siy+v)*iwidth + six;
|
||||
{
|
||||
f = 0;
|
||||
for (x=0; x < (scwidth&~3); x+=4) // loop for every 4 pixels (to hopefully optimize)
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[1+x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[2+x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[3+x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
}
|
||||
for (; x<scwidth; x+=1) // draw rest of the pixels needed
|
||||
{
|
||||
if (src[(f>>16)] != 255)
|
||||
{
|
||||
dest[x] = src[(f>>16)];
|
||||
}
|
||||
f += fstep;
|
||||
}
|
||||
f += fstep;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1952,17 +1995,7 @@ void SWDraw_Image (float xp, float yp, float wp, float hp, float s1, float t1, f
|
|||
}
|
||||
else
|
||||
{
|
||||
if (ib_colorblend || ib_alphablend) //blend it on
|
||||
{
|
||||
SWDraw_SubImageBlend32(xp, yp, wp, hp, s1, t1, s2, t2,
|
||||
pic->width, pic->height, pic->data,
|
||||
ib_ri, ib_gi, ib_bi, ib_ai);
|
||||
|
||||
}
|
||||
else //block colour (fast)
|
||||
{
|
||||
SWDraw_SubImage32(xp, yp, wp, hp, s1, t1, s2, t2, pic->width, pic->height, pic->data);
|
||||
}
|
||||
SWDraw_SubImage32(xp, yp, wp, hp, s1, t1, s2, t2, pic->width, pic->height, pic->data);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|||
// to touch the vid buffer
|
||||
|
||||
void SWDraw_Init (void);
|
||||
void SWDraw_ReInit (void);
|
||||
void SWDraw_Shutdown(void);
|
||||
void SWDraw_Character (int x, int y, unsigned int num);
|
||||
void SWDraw_ImageColours (float r, float g, float b, float a);
|
||||
|
|
|
|||
Loading…
Reference in a new issue